[LON-CAPA-cvs] cvs: loncom /build Makefile

[raeburn]

raeburn		Sun Feb 27 03:09:22 2011 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  - make aboutVERSION will update version for development servers where
    version is already of form M.N.CVS_HEAD-YYYYMMDDHH. 
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.192 loncom/build/Makefile:1.193
--- loncom/build/Makefile:1.192	Wed Nov 17 19:35:25 2010
+++ loncom/build/Makefile	Sun Feb 27 03:09:22 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.192 2010/11/17 19:35:25 raeburn Exp $
+# $Id: Makefile,v 1.193 2011/02/27 03:09:22 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -549,12 +549,12 @@
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
-	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \
+	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
 	cat $(SOURCE)/loncom/loncapa_apache.conf | \
-	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \
+	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