[Vm-dev] [commit][2732] Make the Production/Debug/ Assert distinction static so one can find it with

[commits at squeakvm.org]

Revision: 2732
Author:   eliot
Date:     2013-06-06 15:17:23 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
Make the Production/Debug/Assert distinction static so one can find it with
strings - vm.  Add an ident for the ITIMER_HEARTBEAT linux VMs.

Modified Paths:
--------------
    branches/Cog/platforms/Mac OS/vm/sqMacMain.c
    branches/Cog/platforms/unix/vm/sqUnixMain.c
    branches/Cog/platforms/win32/vm/sqWin32Intel.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Thu Jun  6 14:50:01 PDT 2013
   + Thu Jun  6 15:16:42 PDT 2013

Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/sqMacMain.c	2013-06-06 21:50:39 UTC (rev 2731)
+++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c	2013-06-06 22:17:23 UTC (rev 2732)
@@ -1018,7 +1018,7 @@
 						CFBundleGetMainBundle(),
 						CFSTR("CFBundleVersion"))))
     CFStringGetCString(versionString, info+strlen(info), 4095-strlen(info), gCurrentVMEncoding);
-  sprintf(info+strlen(info), " %s [%s VM]\n", vmBuildString, BuildVariant);
+  sprintf(info+strlen(info), " %s [" BuildVariant " VM]\n", vmBuildString, BuildVariant);
   if (verbose)
     sprintf(info+strlen(info), "Built from: ");
   sprintf(info+strlen(info), "%s\n", INTERP_BUILD);

Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixMain.c	2013-06-06 21:50:39 UTC (rev 2731)
+++ branches/Cog/platforms/unix/vm/sqUnixMain.c	2013-06-06 22:17:23 UTC (rev 2732)
@@ -1566,13 +1566,19 @@
 # define BuildVariant "Assert"
 #endif
 
+#if ITIMER_HEARTBEAT
+# define HBID " ITHB"
+#else
+# define HBID
+#endif
+
   if (verbose)
     sprintf(info+strlen(info), IMAGE_DIALECT_NAME " VM version: ");
   sprintf(info+strlen(info), "%s #%d", VM_VERSION, vm_serial);
 #if defined(USE_XSHM)
   sprintf(info+strlen(info), " XShm");
 #endif
-  sprintf(info+strlen(info), " %s %s [%s VM]\n", vm_date, cc_version, BuildVariant);
+  sprintf(info+strlen(info), " %s %s [" BuildVariant HBID " VM]\n", vm_date, cc_version, BuildVariant);
   if (verbose)
     sprintf(info+strlen(info), "Built from: ");
   sprintf(info+strlen(info), "%s\n", INTERP_BUILD);

Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c
===================================================================
--- branches/Cog/platforms/win32/vm/sqWin32Intel.c	2013-06-06 21:50:39 UTC (rev 2731)
+++ branches/Cog/platforms/win32/vm/sqWin32Intel.c	2013-06-06 22:17:23 UTC (rev 2732)
@@ -781,7 +781,7 @@
 # define BuildVariant "Assert"
 #endif
 
-  sprintf(info+strlen(info), "%s [%s VM]\n", vmBuildString, BuildVariant);
+  sprintf(info+strlen(info), "%s [" BuildVariant " VM]\n", vmBuildString);
   if (verbose)
     sprintf(info+strlen(info), "Built from: ");
   sprintf(info+strlen(info), "%s\n", INTERP_BUILD);