--- loncom/build/Makefile 2003/07/24 22:23:28 1.150.2.1 +++ loncom/build/Makefile 2003/08/14 00:54:17 1.154 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.150.2.1 2003/07/24 22:23:28 albertel Exp $ +# $Id: Makefile,v 1.154 2003/08/14 00:54:17 albertel Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -22,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=0.99.4 +VERSION=0.99.5 # The current working definition for "RELEASE" is: changes not in the software, # but in the operating system dependent packaging of the software. Thus, the # generic tarball releases do not need to have a release number specified. @@ -124,8 +124,10 @@ help_TARGETS: @echo " procedure (via the UPDATE command)" @echo "postinstall: double-check things after installation" @echo "VERSION: tag the filesystem with version information inside" - @echo " /etc/loncapa-release" + @echo " /etc/loncapa-release and" + @echo " /home/httpd/html/lon-status/version.txt" @echo "aboutVERSION: place version information inside about.html" + @echo " 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" @@ -295,11 +297,11 @@ install: buildflag VERSION TEST_hosts_ta NORESTORECONF="$(NORESTORECONF)" configinstall make postinstall make warningnote - echo "You can 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)" - echo -n "Please see http://install.lon-capa.org/ for more information" + @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)" +# @echo -n "Please see http://install.lon-capa.org/ for more information" rawinstall: VERSION Makefile.install Makefile echo -n "" > WARNINGS @@ -364,12 +366,16 @@ tardist: 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" ] 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 @@ -410,6 +416,9 @@ VERSION: install -d $(TARGET)/etc echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release + install -d $(TARGET)/home/httpd/html/lon-status + echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt + date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt aboutVERSION: cat $(SOURCE)/loncom/license/about.html | \ @@ -417,6 +426,11 @@ aboutVERSION: $(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"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \ + $(SOURCE)/loncom/loncapa_apache.conf.new + mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \ + $(SOURCE)/loncom/loncapa_apache.conf # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***