--- loncom/build/Makefile 2011/10/10 00:59:51 1.190.8.6 +++ loncom/build/Makefile 2010/11/17 19:35:25 1.192 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.190.8.6 2011/10/10 00:59:51 raeburn Exp $ +# $Id: Makefile,v 1.192 2010/11/17 19:35:25 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -13,10 +13,6 @@ DIST=$(DISTPROBE) CATEGORY="development" SOURCE=../.. TARGET="" -CURRSHELL=`echo $(SHELL)` -ifneq ('/bin/bash',${CURRSHELL}) -CURRSHELL=/bin/bash -endif NORESTORECONF="0" HOSTNAME="" LAUNCH=| perl @@ -26,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=2.10.1 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) NEXTVERSION=2.11 ifeq (CVS_HEAD,${VERSION}) @@ -158,8 +154,6 @@ help_TARGETS: @echo " /home/httpd/html/lon-status/version.txt" @echo "aboutVERSION: place version information inside about.html" @echo " and loncapa_apache.conf" - @echo "postaboutVERSION: restore default version to" - @echo " about.html and loncapa_apache.conf" @echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***" @echo "Makefile.configinstall: generate a Makefile for configuration" @echo " files; built dynamically from" @@ -321,7 +315,6 @@ configinstall: Makefile.configinstall install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile echo -n "" > WARNINGS - make aboutVERSION make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \ directories make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files @@ -330,7 +323,7 @@ install: buildflag VERSION TEST_hosts_ta NORESTORECONF="$(NORESTORECONF)" configinstall make postinstall make warningnote -# @echo "You can now run 'make test' to see if your system is ready to go!" + @echo "You can now run 'make test' to see if your system is ready to go!" # @echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND" # @echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost" # @echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)" @@ -388,11 +381,18 @@ tardist: else \ ln -s . $(DIRTARGET); \ fi + cp -v $(SOURCE)/loncom/license/about.html \ + $(SOURCE)/loncom/license/about.html.orig + cp -v $(SOURCE)/loncom/loncapa_apache.conf \ + $(SOURCE)/loncom/loncapa_apache.conf.orig make aboutVERSION cd $(SOURCE); \ tar --no-recursion --numeric-owner --files-from MANIFEST \ -h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ] - make postaboutVERSION + mv -v $(SOURCE)/loncom/license/about.html.orig \ + $(SOURCE)/loncom/license/about.html + mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \ + $(SOURCE)/loncom/loncapa_apache.conf cat $(SOURCE)/tar_WARNINGS | \ xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS rm -f $(SOURCE)/tar_WARNINGS @@ -517,7 +517,6 @@ latex_fmtutil: tee -a WARNINGS postinstall: - make postaboutVERSION make webserverconf make reseval_fixup make clean_file_permissions @@ -539,7 +538,7 @@ postinstall: make picins_check make mimetex_version_check make verify_domconfiguser - make latex_fmtutil + make latex_fmtutil VERSION: install -d $(TARGET)/etc echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release @@ -549,43 +548,17 @@ VERSION: date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt aboutVERSION: - cp -p -v $(SOURCE)/loncom/license/about.html \ - $(SOURCE)/loncom/license/about.html.orig - cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \ - $(SOURCE)/loncom/loncapa_apache.conf.orig cat $(SOURCE)/loncom/license/about.html | \ - perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \ + perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \ $(SOURCE)/loncom/license/about.html.new mv -v $(SOURCE)/loncom/license/about.html.new \ $(SOURCE)/loncom/license/about.html cat $(SOURCE)/loncom/loncapa_apache.conf | \ - perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \ + perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \ $(SOURCE)/loncom/loncapa_apache.conf.new mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \ $(SOURCE)/loncom/loncapa_apache.conf -postaboutVERSION: - if (test -e $(SOURCE)/loncom/license/about.html.orig) && \ - (diff $(SOURCE)/loncom/license/about.html \ - $(SOURCE)/loncom/license/about.html > /dev/null); then \ - mv -v $(SOURCE)/loncom/license/about.html.orig \ - $(SOURCE)/loncom/license/about.html; \ - elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \ - !(diff $(SOURCE)/loncom/license/about.html \ - $(SOURCE)/loncom/license/about.html > /dev/null); then \ - rm -f $(SOURCE)/loncom/license/about.html.orig; \ - fi - if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \ - (diff $(SOURCE)/loncom/license/about.html \ - $(SOURCE)/loncom/license/about.html > /dev/null); then \ - mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \ - $(SOURCE)/loncom/loncapa_apache.conf; \ - elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \ - !(diff $(SOURCE)/loncom/license/about.html \ - $(SOURCE)/loncom/license/about.html > /dev/null); then \ - rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \ - fi - # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml *** Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \ @@ -597,7 +570,7 @@ Makefile.configinstall: $(SOURCE)/doc/lo Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \ - "$(CURRSHELL)" > Makefile.build + > Makefile.build Makefile.install: alwaysrun cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \