Revision: 3203
Author: eliot
Date: 2014-12-31 16:32:58 -0800 (Wed, 31 Dec 2014)
Log Message:
-----------
Fix the date tag to use %y, not %g, otherwise the year is wrong in the last week
of the year (as I have just discovered).
Modified Paths:
--------------
branches/Cog/build.macos32x86/makeallinstall
branches/Cog/build.macos32x86/makeproductinstall
branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk
branches/Cog/build.macos32x86/newspeak.cog.v3/installer/branding.gmk
branches/Cog/build.macos64x64/makeallinstall
branches/Cog/build.macos64x64/makeproductinstall
branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk
branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk
branches/Cog/build.win32x86/newspeak.cog.v3/installer/branding.gmk
branches/Cog/scripts/mkARMstackvmarchives
branches/Cog/scripts/mkcogvmarchives
branches/Cog/scripts/mksistaarchives
branches/Cog/scripts/mkspurvmarchives
branches/Cog/scripts/uploadARMvms
branches/Cog/scripts/uploadvms
Modified: branches/Cog/build.macos32x86/makeallinstall
===================================================================
--- branches/Cog/build.macos32x86/makeallinstall 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos32x86/makeallinstall 2015-01-01 00:32:58 UTC (rev 3203)
@@ -4,7 +4,7 @@
trap 'exit 2' HUP INT PIPE TERM
REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-TAG=`date +%g.%U.`$REV
+TAG=`date +%y.%U.`$REV
set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine \
Cog Cog\ Spur
for td in newspeak.cog.v3 newspeak.cog.spur squeak.cog.v3 squeak.cog.spur; do
Modified: branches/Cog/build.macos32x86/makeproductinstall
===================================================================
--- branches/Cog/build.macos32x86/makeproductinstall 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos32x86/makeproductinstall 2015-01-01 00:32:58 UTC (rev 3203)
@@ -4,7 +4,7 @@
trap 'exit 2' HUP INT PIPE TERM
REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-TAG=`date +%g.%U.`$REV
+TAG=`date +%y.%U.`$REV
set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine
for td in newspeak.cog.v3 newspeak.cog.spur; do
d=$td/installer
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/installer/branding.gmk 2015-01-01 00:32:58 UTC (rev 3203)
@@ -5,7 +5,7 @@
# id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit
# the 0-255 field. So use YY.WW.SVN where WW is the week number.
SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: \([0-9][0-9]*\).*/\1/' )
-VERSION := $(shell date +%g.%U.$(SVNREV))
+VERSION := $(shell date +%y.%U.$(SVNREV))
# Base name of the executable (.exe is appended on Windows)
ifndef VM_BASE_NAME
Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/installer/branding.gmk
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.v3/installer/branding.gmk 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos32x86/newspeak.cog.v3/installer/branding.gmk 2015-01-01 00:32:58 UTC (rev 3203)
@@ -5,7 +5,7 @@
# id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit
# the 0-255 field. So use YY.WW.SVN where WW is the week number.
SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: \([0-9][0-9]*\).*/\1/' )
-VERSION := $(shell date +%g.%U.$(SVNREV))
+VERSION := $(shell date +%y.%U.$(SVNREV))
# Base name of the executable (.exe is appended on Windows)
ifndef VM_BASE_NAME
Modified: branches/Cog/build.macos64x64/makeallinstall
===================================================================
--- branches/Cog/build.macos64x64/makeallinstall 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos64x64/makeallinstall 2015-01-01 00:32:58 UTC (rev 3203)
@@ -4,7 +4,7 @@
trap 'exit 2' HUP INT PIPE TERM
REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-TAG=`date +%g.%U.`$REV
+TAG=`date +%y.%U.`$REV
set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine \
Cog Cog\ Spur
for td in newspeak.cog.v3 newspeak.cog.spur squeak.cog.v3 squeak.cog.spur; do
Modified: branches/Cog/build.macos64x64/makeproductinstall
===================================================================
--- branches/Cog/build.macos64x64/makeproductinstall 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos64x64/makeproductinstall 2015-01-01 00:32:58 UTC (rev 3203)
@@ -4,7 +4,7 @@
trap 'exit 2' HUP INT PIPE TERM
REV=`grep 'SvnRawRevisionString.*Rev:' "\`dirname $0\`/../platforms/Cross/vm/sqSCCSVersion.h" \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-TAG=`date +%g.%U.`$REV
+TAG=`date +%y.%U.`$REV
set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine
for td in newspeak.cog.spur; do
d=$td/installer
Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk
===================================================================
--- branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.macos64x64/newspeak.cog.spur/installer/branding.gmk 2015-01-01 00:32:58 UTC (rev 3203)
@@ -5,7 +5,7 @@
# id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit
# the 0-255 field. So use YY.WW.SVN where WW is the week number.
SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: \([0-9][0-9]*\).*/\1/' )
-VERSION := $(shell date +%g.%U.$(SVNREV))
+VERSION := $(shell date +%y.%U.$(SVNREV))
# Base name of the executable (.exe is appended on Windows)
ifndef VM_BASE_NAME
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk 2015-01-01 00:32:58 UTC (rev 3203)
@@ -6,8 +6,8 @@
# the 0-255 field. So use YY.WW.SVN where WW is the week number.
#VERSION:= 07.11.0101
SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: \([0-9][0-9]*\).*/\1/' )
-#VERSION:= $(shell date +%g.%m%d.$(SVNREV))
-VERSION := $(shell date +%g.%U.$(SVNREV))
+#VERSION:= $(shell date +%y.%m%d.$(SVNREV))
+VERSION := $(shell date +%y.%U.$(SVNREV))
# Base name of the executable (.exe is appended on Windows)
ifndef VM_BASE_NAME
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/installer/branding.gmk
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/installer/branding.gmk 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/installer/branding.gmk 2015-01-01 00:32:58 UTC (rev 3203)
@@ -6,8 +6,8 @@
# the 0-255 field. So use YY.WW.SVN where WW is the week number.
#VERSION:= 07.11.0101
SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: \([0-9][0-9]*\).*/\1/' )
-#VERSION:= $(shell date +%g.%m%d.$(SVNREV))
-VERSION := $(shell date +%g.%U.$(SVNREV))
+#VERSION:= $(shell date +%y.%m%d.$(SVNREV))
+VERSION := $(shell date +%y.%U.$(SVNREV))
# Base name of the executable (.exe is appended on Windows)
ifndef VM_BASE_NAME
Modified: branches/Cog/scripts/mkARMstackvmarchives
===================================================================
--- branches/Cog/scripts/mkARMstackvmarchives 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/scripts/mkARMstackvmarchives 2015-01-01 00:32:58 UTC (rev 3203)
@@ -29,7 +29,7 @@
test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-test -n "$TAG" || TAG=`date +%g.%U.`$REV
+test -n "$TAG" || TAG=`date +%y.%U.`$REV
echo REV=$REV TAG=$TAG
for archive in stklinuxhtARM stkspurlinuxhtARM; do
Modified: branches/Cog/scripts/mkcogvmarchives
===================================================================
--- branches/Cog/scripts/mkcogvmarchives 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/scripts/mkcogvmarchives 2015-01-01 00:32:58 UTC (rev 3203)
@@ -47,7 +47,7 @@
fi
test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-test -n "$TAG" || TAG=`date +%g.%U.`$REV
+test -n "$TAG" || TAG=`date +%y.%U.`$REV
echo REV=$REV TAG=$TAG
if [ -n "$CL" ]; then
Modified: branches/Cog/scripts/mksistaarchives
===================================================================
--- branches/Cog/scripts/mksistaarchives 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/scripts/mksistaarchives 2015-01-01 00:32:58 UTC (rev 3203)
@@ -47,7 +47,7 @@
fi
test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-test -n "$TAG" || TAG=`date +%g.%U.`$REV
+test -n "$TAG" || TAG=`date +%y.%U.`$REV
echo REV=$REV TAG=$TAG
if [ -n "$CL" ]; then
Modified: branches/Cog/scripts/mkspurvmarchives
===================================================================
--- branches/Cog/scripts/mkspurvmarchives 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/scripts/mkspurvmarchives 2015-01-01 00:32:58 UTC (rev 3203)
@@ -46,7 +46,7 @@
fi
test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
| sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-test -n "$TAG" || TAG=`date +%g.%U.`$REV
+test -n "$TAG" || TAG=`date +%y.%U.`$REV
echo REV=$REV TAG=$TAG
if [ -n "$CL" ]; then
Modified: branches/Cog/scripts/uploadARMvms
===================================================================
--- branches/Cog/scripts/uploadARMvms 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/scripts/uploadARMvms 2015-01-01 00:32:58 UTC (rev 3203)
@@ -41,7 +41,7 @@
fi
if [ -z "$TAG" ]; then
- TAG=`date +%g.%U.`$REV
+ TAG=`date +%y.%U.`$REV
fi
echo REV=$REV TAG=$TAG
Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms 2014-12-31 22:38:14 UTC (rev 3202)
+++ branches/Cog/scripts/uploadvms 2015-01-01 00:32:58 UTC (rev 3203)
@@ -105,7 +105,7 @@
fi
if [ -z "$TAG" ]; then
- TAG=`date +%g.%U.`$REV
+ TAG=`date +%y.%U.`$REV
fi
echo REV=$REV TAG=$TAG
