Revision: 3055 Author: eliot Date: 2014-07-24 10:11:23 -0700 (Thu, 24 Jul 2014) Log Message: ----------- Add the time zone to the version info on Mac OS X and Win32. Nuke the win32 version.h wart and simplify & update win32's version.c.
Modified Paths: -------------- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.spur/makevm branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.v3/makevm branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.spur/makevm branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.v3/makevm branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makevm branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/makevm branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/makevm branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.v3/makevm branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.spur/makevm branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.v3/makevm branches/Cog/build.win32x86/newspeak.cog.spur/Makefile branches/Cog/build.win32x86/newspeak.cog.v3/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/Makefile branches/Cog/build.win32x86/newspeak.stack.v3/Makefile branches/Cog/build.win32x86/squeak.cog.spur/Makefile branches/Cog/build.win32x86/squeak.cog.v3/Makefile branches/Cog/build.win32x86/squeak.stack.spur/Makefile branches/Cog/build.win32x86/squeak.stack.v3/Makefile branches/Cog/platforms/Mac OS/vm/version.c branches/Cog/platforms/win32/vm/version.c
Removed Paths: ------------- branches/Cog/platforms/win32/vm/version.h
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1462,6 +1462,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1503,6 +1504,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1536,6 +1538,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1590,6 +1593,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1642,6 +1646,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1683,6 +1688,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1709,6 +1715,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1739,6 +1746,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN,
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1464,6 +1464,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1504,6 +1505,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1536,6 +1538,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1589,6 +1592,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1640,6 +1644,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1680,6 +1685,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1704,6 +1710,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1732,6 +1739,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN,
Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1440,6 +1440,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1480,6 +1481,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1512,6 +1514,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1565,6 +1568,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1616,6 +1620,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1656,6 +1661,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1680,6 +1686,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1708,6 +1715,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN,
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1444,6 +1444,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1484,6 +1485,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1516,6 +1518,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1569,6 +1572,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1620,6 +1624,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1660,6 +1665,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1684,6 +1690,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1712,6 +1719,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN,
Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST"
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1613,6 +1613,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1653,6 +1654,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1683,6 +1685,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1737,6 +1740,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1788,6 +1792,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1828,6 +1833,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1851,6 +1857,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1879,6 +1886,7 @@ "NDEBUG=1", "COGMTVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1615,6 +1615,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1656,6 +1657,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1687,6 +1689,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1740,6 +1743,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1791,6 +1795,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1837,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1857,6 +1863,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1887,6 +1894,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST"
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1617,6 +1617,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1657,6 +1658,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1687,6 +1689,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1741,6 +1744,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1792,6 +1796,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1837,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1855,6 +1861,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1883,6 +1890,7 @@ "NDEBUG=1", "COGMTVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1619,6 +1619,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1659,6 +1660,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1689,6 +1691,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1743,6 +1746,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1794,6 +1798,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1834,6 +1839,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1857,6 +1863,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1885,6 +1892,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST"
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1613,6 +1613,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1653,6 +1654,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1683,6 +1685,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1737,6 +1740,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1788,6 +1792,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1828,6 +1833,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1851,6 +1857,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1879,6 +1886,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST"
Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1617,6 +1617,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1657,6 +1658,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1687,6 +1689,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1741,6 +1744,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1792,6 +1796,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1837,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1855,6 +1861,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1883,6 +1890,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.sista.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST"
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1592,6 +1592,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1632,6 +1633,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1662,6 +1664,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1716,6 +1719,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1766,6 +1770,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1805,6 +1810,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1828,6 +1834,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1855,6 +1862,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -59,6 +59,7 @@ echo rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST"
Modified: branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1596,6 +1596,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1636,6 +1637,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1666,6 +1668,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1720,6 +1723,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1770,6 +1774,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1809,6 +1814,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1838,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1859,6 +1866,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ="$TZ"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON,
Modified: branches/Cog/build.macos32x86/squeak.stack.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -59,6 +59,7 @@ echo rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST"
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -127,8 +127,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -141,11 +142,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -127,8 +127,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -141,11 +142,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -128,8 +128,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -142,11 +143,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -128,8 +128,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -142,11 +143,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -131,8 +131,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -151,8 +151,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -165,11 +166,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -132,8 +132,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -146,11 +147,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -132,8 +132,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -146,11 +147,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 23 22:20:26 HST 2014 + Thu Jul 24 07:09:12 HST 2014
Modified: branches/Cog/platforms/Mac OS/vm/version.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/version.c 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/platforms/Mac OS/vm/version.c 2014-07-24 17:11:23 UTC (rev 3055) @@ -2,4 +2,14 @@ # define __VERSION__ "Unknown" #endif
-char vmBuildString[] = "Mac OS X built on "__DATE__" "__TIME__" Compiler: "__VERSION__; +#if !defined(TZ) +# define TZ "" +# define SPACER "" +#else +# define SPACER " " +#endif + +char vmBuildString[] = \ + "Mac OS X built on " \ + __DATE__" "__TIME__ SPACER TZ \ + " Compiler: " __VERSION__;
Modified: branches/Cog/platforms/win32/vm/version.c =================================================================== --- branches/Cog/platforms/win32/vm/version.c 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/platforms/win32/vm/version.c 2014-07-24 17:11:23 UTC (rev 3055) @@ -1,3 +1,35 @@ -#include "version.h" +#if !defined(TZ) +# define TZ "" +# define SPACER "" +#else +# define SPACER " " +#endif
-char vmBuildString[] = VM_BUILD_STRING; +#ifdef _MSC_VER +# if _MSC_VER >= 1900 + define the version string here +# elif _MSC_VER >= 1800 +# define __VERSION__ "Microsoft Visual Studio 2013" +# elif _MSC_VER >= 1700 +# define __VERSION__ "Microsoft Visual Studio 2012" +# elif _MSC_VER >= 1600 +# define __VERSION__ "Microsoft Visual Studio 2010" +# elif _MSC_VER >= 1500 +# define __VERSION__ "Microsoft Visual Studio 2008" +# elif _MSC_VER >= 1400 +# define __VERSION__ "Microsoft Visual Studio 2005" +# elif _MSC_VER >= 1300 +# define __VERSION__ "Microsoft Visual Studio 2003" +# elif _MSC_VER >= 1200 +# define __VERSION__ "Microsoft Visual Studio 6" +# elif _MSC_VER >= 1100 +# define __VERSION__ "Microsoft Visual Studio 5" +# else + define the version string here +# endif //MSVC versions +#endif //MSVC versions + +char vmBuildString[] = \ + "Win32 built on " \ + __DATE__" "__TIME__ SPACER TZ \ + " Compiler: " __VERSION__;
Deleted: branches/Cog/platforms/win32/vm/version.h =================================================================== --- branches/Cog/platforms/win32/vm/version.h 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/platforms/win32/vm/version.h 2014-07-24 17:11:23 UTC (rev 3055) @@ -1,17 +0,0 @@ -#ifdef _MSC_VER -#if _MSC_VER >= 1600 -define the type string here -#elif _MSC_VER >= 1500 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 2008" -#elif _MSC_VER >= 1400 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 2005" -#elif _MSC_VER >= 1300 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 2003" -#elif _MSC_VER >= 1200 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 6" -#else -define the type string here -#endif //MSVC versions -#else -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: "__VERSION__ -#endif
vm-dev@lists.squeakfoundation.org
-
commits＠squeakvm.org