[Vm-dev] [commit][3644] Neaten the generated dependency files on
windows.
commits at squeakvm.org
commits at squeakvm.org
Fri Mar 11 21:35:42 UTC 2016
Revision: 3644
Author: eliot
Date: 2016-03-11 13:35:39 -0800 (Fri, 11 Mar 2016)
Log Message:
-----------
Neaten the generated dependency files on windows.
Fix a slip in the uploadvm script to pass svn revision to compileChangeHistory.
Update the image build VMs to r3643.
Modified Paths:
--------------
branches/Cog/build.win32x86/common/Makefile.rules
branches/Cog/image/getGoodCogVM.sh
branches/Cog/image/getGoodSpurNsvm.sh
branches/Cog/image/getGoodSpurVM.sh
branches/Cog/scripts/uploadvms
Modified: branches/Cog/build.win32x86/common/Makefile.rules
===================================================================
--- branches/Cog/build.win32x86/common/Makefile.rules 2016-03-11 01:42:54 UTC (rev 3643)
+++ branches/Cog/build.win32x86/common/Makefile.rules 2016-03-11 21:35:39 UTC (rev 3644)
@@ -16,7 +16,7 @@
DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td
ALLFLAGS = $(DEPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS)
-POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' | sed 's/^build[^/]*/$$(BUILD)/' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d
+POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' | sed 's/ [^ ]*:/:/' | sed 's/^build[^/]*/$$(BUILD)/' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d
$(OBJDIR)/%.o: %.c deps/%.d
$(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
Modified: branches/Cog/image/getGoodCogVM.sh
===================================================================
--- branches/Cog/image/getGoodCogVM.sh 2016-03-11 01:42:54 UTC (rev 3643)
+++ branches/Cog/image/getGoodCogVM.sh 2016-03-11 21:35:39 UTC (rev 3644)
@@ -1,32 +1,32 @@
#!/bin/sh
-# Sets the VM env var to the r3632 Cog VM for the current platform.
+# Sets the VM env var to the r3643 Cog VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=16.08.3632
-REV=3632
-LCBINDIR=4.0-3632
+TAG=16.10.3643
+REV=3643
+LCBINDIR=4.0-3643
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- Cog.app/Contents/MacOS/Squeak cc870c04f3445c1a5e5de849db58d8d8 \
- Cog.app-$TAG.tgz cee17b54ab41396f9fd82e4eb10b17c6
+ Cog.app/Contents/MacOS/Squeak 6495fcad0dfc1302a7abeb40860b228e \
+ Cog.app-$TAG.tgz c024c56458e4cb9c58002a25f93bd59a
VM=Cog.app/Contents/MacOS/Squeak;;
Linux)
if expr $OSREL \> 2.6.12; then
get_vm_from_tar \
coglinuxht/lib/squeak/$LCBINDIR/squeak \
- coglinuxht-$TAG.tgz b9096e5c8e377891ed1238a757f21ee9
+ coglinuxht-$TAG.tgz b425f59475f1357fbe0c25b445f69717
else
get_vm_from_tar \
coglinux/lib/squeak/$LCBINDIR/squeak \
- coglinux-$TAG.tgz f9a9e2bd413cc69df871d9d7f7d2dbc8
+ coglinux-$TAG.tgz df1101e6ed629198f0806b75d9c12532
fi;;
CYGWIN*) get_vm_from_zip \
- cogwin/SqueakConsole.exe 04c056a037e8492e64d7e21133fc7788 \
- cogwin-$TAG.zip 6af572be45074f11f99d8a090bc5fe1d
+ cogwin/SqueakConsole.exe 21c42946fec449edba92f5ca863e390a \
+ cogwin-$TAG.zip b38822661e97686813ac0512c825428b
VM=cogwin/SqueakConsole.exe;;
*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
esac
Modified: branches/Cog/image/getGoodSpurNsvm.sh
===================================================================
--- branches/Cog/image/getGoodSpurNsvm.sh 2016-03-11 01:42:54 UTC (rev 3643)
+++ branches/Cog/image/getGoodSpurNsvm.sh 2016-03-11 21:35:39 UTC (rev 3644)
@@ -1,26 +1,26 @@
#!/bin/sh
-# Sets the VM env var to the r3632 Newspeak Spur VM for the current platform.
+# Sets the VM env var to the r3643 Newspeak Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=16.08.3632
-REV=3632
-LSBINDIR=5.0-3632
+TAG=16.10.3643
+REV=3643
+LSBINDIR=5.0-3643
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" aaf0792cc1494e43e01349565c52772e \
- "Newspeak Spur Virtual Machine.app-$TAG.tgz" 7405599f94a2c4eb9000e5bbcbb11713
+ "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" a50b3f51714f1c012ce73a24a3c4fd1c \
+ "Newspeak Spur Virtual Machine.app-$TAG.tgz" a8c926d31ca71fac7d7f202529b7aab8
VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";;
Linux) get_vm_from_tar \
nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm \
- nsvmspurlinuxht-$TAG.tgz 2ad8a1d108801697e4d35ea48be0a459
+ nsvmspurlinuxht-$TAG.tgz 7a8810d1f87d044ad3a85866a6509e64
VM=nsvmspurlinuxht/nsvm;;
CYGWIN*) get_vm_from_zip \
- nsvmspurwin/nsvmConsole.exe c1fa61e4a5fb1991d33d630e46d5fa69 \
- nsvmspurwin-$TAG.zip b3c03d6c310ec32226352b4a56cac940
+ nsvmspurwin/nsvmConsole.exe d9bb69463c8f9ec8b1436b294593f11e \
+ nsvmspurwin-$TAG.zip ec9e07efe9eea8ff6cc4805fbde6de2a
VM=nsvmspurwin/nsvmConsole.exe;;
*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2
esac
Modified: branches/Cog/image/getGoodSpurVM.sh
===================================================================
--- branches/Cog/image/getGoodSpurVM.sh 2016-03-11 01:42:54 UTC (rev 3643)
+++ branches/Cog/image/getGoodSpurVM.sh 2016-03-11 21:35:39 UTC (rev 3644)
@@ -1,26 +1,26 @@
#!/bin/sh
-# Sets the VM env var to the r3632 Cog Spur VM for the current platform.
+# Sets the VM env var to the r3643 Cog Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=16.08.3632
-REV=3632
-LSBINDIR=5.0-3632
+TAG=16.10.3643
+REV=3643
+LSBINDIR=5.0-3643
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- CogSpur.app/Contents/MacOS/Squeak a74172e86eaab82870d5705e853d0a05 \
- CogSpur.app-$TAG.tgz 7d24f3b04df720c44aec7c17ae6e1fc2
+ CogSpur.app/Contents/MacOS/Squeak 244323eea6792e2e69bd523c9911b2f8 \
+ CogSpur.app-$TAG.tgz 7421e8188932dede31d5182238ee64c2
VM=CogSpur.app/Contents/MacOS/Squeak;;
Linux) get_vm_from_tar \
- cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 109b49166f318e099302dd9b7af66bd1 \
- cogspurlinuxht-$TAG.tgz a04d9883f1477ac4715c953f066c426e
+ cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 37bc3cec9db46498640b3d9eefeebdfd \
+ cogspurlinuxht-$TAG.tgz 02e977113ee4a059637650ab69439bff
VM=cogspurlinuxht/squeak;;
CYGWIN*) get_vm_from_zip \
- cogspurwin/SqueakConsole.exe ebe86e40295e9e437c5e4883a02e0998 \
- cogspurwin-$TAG.zip 01fa8395a2ab6f52191979de7e79f48a
+ cogspurwin/SqueakConsole.exe 2bcad50dcfe458e5737cd843546f47de \
+ cogspurwin-$TAG.zip 42112ad448e806790ad112635a596337
VM=cogspurwin/SqueakConsole.exe;;
*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
esac
Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms 2016-03-11 01:42:54 UTC (rev 3643)
+++ branches/Cog/scripts/uploadvms 2016-03-11 21:35:39 UTC (rev 3644)
@@ -245,7 +245,7 @@
svn log ../platforms/Cross/vm/sqSCCSVersion.h >>../history/README.$REV
vi ../history/README.$REV
fi
- ../scripts/compileChangeHistory
+ ../scripts/compileChangeHistory $REV
fi
if [ -z "$ARCHIVES" ]; then
echo 'No archives have been specified. Use -all?' 1>&2
More information about the Vm-dev
mailing list