--- loncom/build/Makefile 2012/02/08 01:59:58 1.190.8.7.2.1 +++ loncom/build/Makefile 2012/05/12 15:14:13 1.201.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.190.8.7.2.1 2012/02/08 01:59:58 raeburn Exp $ +# $Id: Makefile,v 1.201.2.1 2012/05/12 15:14:13 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -26,9 +26,9 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=2.10.1-MITr.1 +VERSION=2.11.0.RC1 SHOWVERSION=$(VERSION) -NEXTVERSION=2.11 +NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) SHOWVERSION=$(NEXTVERSION).$(VERSION) endif @@ -531,7 +531,7 @@ postinstall: make update_queue_slots make modify_config_files make clearoutoldspreadsheetcache - make langcheck + make langcheck make chkconfig make rpmcheck make ntpcheck @@ -547,6 +547,7 @@ postinstall: make mimetex_version_check make verify_domconfiguser make latex_fmtutil + sed -i "s/\x08\x08*/.../g" WARNINGS VERSION: install -d $(TARGET)/etc echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release @@ -558,40 +559,52 @@ VERSION: 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;}' > \ $(SOURCE)/loncom/license/about.html.new mv -v $(SOURCE)/loncom/license/about.html.new \ $(SOURCE)/loncom/license/about.html + touch --date="$(shell echo `perl getcvsdate.pl \ + $(SOURCE)/loncom/license/CVS/Entries about.html`)" \ + $(SOURCE)/loncom/license/about.html + cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \ + $(SOURCE)/loncom/loncapa_apache.conf.orig 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;}' > \ $(SOURCE)/loncom/loncapa_apache.conf.new mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \ $(SOURCE)/loncom/loncapa_apache.conf + touch --date="$(shell echo `perl getcvsdate.pl \ + $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \ + $(SOURCE)/loncom/loncapa_apache.conf postaboutVERSION: if (test -e $(SOURCE)/loncom/license/about.html.orig) && \ - (diff $(SOURCE)/loncom/license/about.html \ + (diff $(SOURCE)/loncom/license/about.html.orig \ $(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 \ + !(diff $(SOURCE)/loncom/license/about.html.orig \ $(SOURCE)/loncom/license/about.html > /dev/null); then \ rm -f $(SOURCE)/loncom/license/about.html.orig; \ fi + touch --date="$(shell echo `perl getcvsdate.pl \ + $(SOURCE)/loncom/license/CVS/Entries about.html`)" \ + $(SOURCE)/loncom/license/about.html if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \ - (diff $(SOURCE)/loncom/license/about.html \ - $(SOURCE)/loncom/license/about.html > /dev/null); then \ + (diff $(SOURCE)/loncom/loncapa_apache.conf.orig \ + $(SOURCE)/loncom/loncapa_apache.conf > /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 \ + !(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \ + $(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \ rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \ fi + touch --date="$(shell echo `perl getcvsdate.pl \ + $(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \ + $(SOURCE)/loncom/loncapa_apache.conf # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***