[LON-CAPA-cvs] cvs: loncom(version_2_3_X) /build Makefile

albertel lon-capa-cvs@mail.lon-capa.org
Sat, 13 Jan 2007 06:38:24 -0000


albertel		Sat Jan 13 01:38:24 2007 EDT

  Modified files:              (Branch: version_2_3_X)
    /loncom/build	Makefile 
  Log:
  - bump version
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.182.4.3 loncom/build/Makefile:1.182.4.4
--- loncom/build/Makefile:1.182.4.3	Wed Dec 27 22:18:31 2006
+++ loncom/build/Makefile	Sat Jan 13 01:38:24 2007
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.182.4.3 2006/12/28 03:18:31 albertel Exp $
+# $Id: Makefile,v 1.182.4.4 2007/01/13 06:38:24 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -22,7 +22,7 @@
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=2.3.0
+VERSION=2.3.1
 # 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.
@@ -495,19 +495,19 @@
 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%H" >> $(TARGET)/etc/loncapa-release
 	install -d $(TARGET)/home/httpd/html/lon-status
 	echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt
-	date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
+	date +"%Y%m%d%H" >> $(TARGET)/home/httpd/html/lon-status/version.txt
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
-	perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;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
 	cat $(SOURCE)/loncom/loncapa_apache.conf | \
-	perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
 	$(SOURCE)/loncom/loncapa_apache.conf.new
 	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
 	$(SOURCE)/loncom/loncapa_apache.conf