--- loncom/build/Makefile 2002/06/12 15:53:46 1.121 +++ loncom/build/Makefile 2002/07/18 21:28:35 1.127 @@ -1,14 +1,13 @@ # The LearningOnline Network with CAPA # Scott Harrison -# $Id: Makefile,v 1.121 2002/06/12 15:53:46 harris41 Exp $ +# $Id: Makefile,v 1.127 2002/07/18 21:28:35 harris41 Exp $ DISTPROBE=`perl ./distprobe` DIST=$(DISTPROBE) CATEGORY="development" SOURCE=../.. TARGET="" -DIRTARGET=loncapa NORESTORECONF="0" HOSTNAME="" LAUNCH=| perl @@ -18,7 +17,8 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=0.1 +VERSION=0.4 +DIRTARGET=loncapa-$(VERSION) help: @echo "*** You need to specify a valid target ***" @@ -220,7 +220,14 @@ NET_rawinstall: VERSION: install -d $(TARGET)/etc echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release - `date +"%Y%m%d"` >> $(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 @@ -349,6 +356,10 @@ 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 + cp -v $(SOURCE)/doc/install/redhat7.3/new_install_rh73.html \ + docs/download/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 \ @@ -380,7 +391,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 @@ -466,6 +477,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 @@ -493,9 +505,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" ] + -h -czf $(DIRTARGET).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