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

[raeburn]

raeburn		Wed Nov 17 19:35:25 2010 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  - Bug 6356. If VERSION is CVS_HEAD, lonVersion is set to NEXTVERSION.VERSION,
     where NEXTVERSION is release number after current one. 
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.191 loncom/build/Makefile:1.192
--- loncom/build/Makefile:1.191	Sat Apr  3 01:13:47 2010
+++ loncom/build/Makefile	Wed Nov 17 19:35:25 2010
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.191 2010/04/03 01:13:47 raeburn Exp $
+# $Id: Makefile,v 1.192 2010/11/17 19:35:25 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -23,6 +23,12 @@
 METAMTARGET=""
 MTARGET=""
 VERSION=CVS_HEAD
+SHOWVERSION=$(VERSION)
+NEXTVERSION=2.11
+ifeq (CVS_HEAD,${VERSION})
+SHOWVERSION=$(NEXTVERSION).$(VERSION)
+endif
+#
 # 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.
@@ -543,12 +549,12 @@
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
-	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(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 \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \
 	$(SOURCE)/loncom/loncapa_apache.conf.new
 	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
 	$(SOURCE)/loncom/loncapa_apache.conf