--- loncom/build/Makefile 2002/06/08 15:02:08 1.120 +++ loncom/build/Makefile 2002/07/11 05:09:55 1.125 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Scott Harrison -# $Id: Makefile,v 1.120 2002/06/08 15:02:08 albertel Exp $ +# $Id: Makefile,v 1.125 2002/07/11 05:09:55 harris41 Exp $ DISTPROBE=`perl ./distprobe` DIST=$(DISTPROBE) @@ -18,7 +18,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=0.1 +VERSION=0.4 help: @echo "*** You need to specify a valid target ***" @@ -217,7 +217,19 @@ NET_rawinstall: make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \ MTARGET="rawinstall" HOSTNAME="$(HOSTNAME)" lpmladm -install: TEST_hosts_tab Makefile.install Makefile +VERSION: + install -d $(TARGET)/etc + echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release + date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release + +aboutVERSION: + cat $(SOURCE)/loncom/license/about.html | \ + perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \ + $(SOURCE)/loncom/license/about.html.new + mv -v $(SOURCE)/loncom/license/about.html.new \ + $(SOURCE)/loncom/license/about.html + +install: VERSION TEST_hosts_tab Makefile.install Makefile echo -n "" > WARNINGS make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \ directories @@ -233,7 +245,7 @@ install: TEST_hosts_tab Makefile.install 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: Makefile.install Makefile +rawinstall: VERSION Makefile.install Makefile echo -n "" > WARNINGS make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \ directories @@ -344,6 +356,8 @@ doc: cd docs/install; ln -fs ../installation_manual.pdf install.pdf perl doc_template.pl $(SOURCE)/doc/templates/template.html \ $(SOURCE)/doc/build/install.html > docs/install/index.html + cp -v $(SOURCE)/doc/install/redhat7.3/new_install_rh73.html \ + docs/install/rh73.html install -m 0755 -d docs/upgrade cd docs/upgrade; ln -fs ../installation_manual.pdf upgrade.pdf perl doc_template.pl $(SOURCE)/doc/templates/template.html \ @@ -375,7 +389,7 @@ pdfdoc: TEST_html2ps # mpage -P- -1 -H [^C]* > ../../../loncom/build/pdfdoc/confexamples.ps install -d pdfdoc/confexamples cd $(SOURCE)/doc/build/confexamples; \ - find . -type f | cut -b3- | grep -v '^C' | perl -nle \ + find . -type f | cut -b3- | grep -v '^C' | grep -v 'keyword' | perl -nle \ '`mpage -P- -1 -H $$_ > ../../../loncom/build/pdfdoc/confexamples/$$_.ps`;' echo '' > pdfdoc/contents.txt echo '' >> pdfdoc/contents.txt @@ -461,6 +475,7 @@ tardist: echo 'make updatequery' >> $(SOURCE)/UPDATE echo 'make hosts_tab' >> $(SOURCE)/UPDATE echo 'make postinstall' >> $(SOURCE)/UPDATE + echo 'make aboutVERSION' >> $(SOURCE)/UPDATE echo 'make warningnote' >> $(SOURCE)/UPDATE # ----------------------------- Point TEST to the internal make process echo '#!/bin/sh' > $(SOURCE)/TEST @@ -488,9 +503,14 @@ tardist: else \ ln -s . $(DIRTARGET); \ fi + cp -v $(SOURCE)/loncom/license/about.html \ + $(SOURCE)/loncom/license/about.html.orig + make aboutVERSION cd $(SOURCE); \ tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \ -h -czf loncapa.tar.gz 2>WARNINGS || [ "0" == "0" ] + mv -v $(SOURCE)/loncom/license/about.html.orig \ + $(SOURCE)/loncom/license/about.html cat $(SOURCE)/WARNINGS | \ xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS rm -f $(SOURCE)/WARNINGS