[commit] r2213 - Mac Carbon VM 4.2.5b1 Update FFI plugin to latest code base. Bring other code base up to VMMaker-jcg.182

 
Author: johnmci
Date: 2010-06-15 17:42:35 -0700 (Tue, 15 Jun 2010)
New Revision: 2213

Modified:
   trunk/platforms/Mac OS/plugins/SqueakFFIPrims/Info-SqueakFFIPlugin__Upgraded_.plist
   trunk/platforms/Mac OS/plugins/SqueakFFIPrims/SqueakFFI.xcodeproj.zip
   trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist
   trunk/platforms/Mac OS/vm/Developer/SqueakVMUNIXPATHS.xcodeproj.zip
   trunk/platforms/Mac OS/vm/sqMacMain.c
   trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c
   trunk/platforms/Mac OS/vm/sqPlatformSpecific.h
Log:
Mac Carbon VM 4.2.5b1 Update FFI plugin to latest code base. Bring other code base up to VMMaker-jcg.182

Modified: trunk/platforms/Mac OS/plugins/SqueakFFIPrims/Info-SqueakFFIPlugin__Upgraded_.plist
===================================================================
--- trunk/platforms/Mac OS/plugins/SqueakFFIPrims/Info-SqueakFFIPlugin__Upgraded_.plist 2010-06-16 00:21:27 UTC (rev 2212)
+++ trunk/platforms/Mac OS/plugins/SqueakFFIPrims/Info-SqueakFFIPlugin__Upgraded_.plist 2010-06-16 00:42:35 UTC (rev 2213)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
  <key>CFBundleDevelopmentRegion</key>
@@ -19,10 +19,10 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.6.0b5</string>
+ <string>1.7.0b1</string>
  <key>CFBundleSignature</key>
  <string>FAST</string>
  <key>CFBundleVersion</key>
- <string>1.6.0b5</string>
+ <string>1.7.0b1</string>
 </dict>
 </plist>

Modified: trunk/platforms/Mac OS/plugins/SqueakFFIPrims/SqueakFFI.xcodeproj.zip
===================================================================
(Binary files differ)

Modified: trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist
===================================================================
--- trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist 2010-06-16 00:21:27 UTC (rev 2212)
+++ trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist 2010-06-16 00:42:35 UTC (rev 2213)
@@ -458,7 +458,7 @@
  <key>CFBundleExecutable</key>
  <string>Squeak VM Opt</string>
  <key>CFBundleGetInfoString</key>
- <string>Squeak VM 4.2.3b1 http://www.squeak.org</string>
+ <string>Squeak VM 4.2.5b1 http://www.squeak.org</string>
  <key>CFBundleIconFile</key>
  <string>Squeak.icns</string>
  <key>CFBundleIdentifier</key>
@@ -470,11 +470,11 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>Squeak VM 4.2.3b1</string>
+ <string>Squeak VM 4.2.5b1</string>
  <key>CFBundleSignature</key>
  <string>FAST</string>
  <key>CFBundleVersion</key>
- <string>4.2.3b1</string>
+ <string>4.2.5b1</string>
  <key>CGDisableCoalescedUpdates</key>
  <true/>
  <key>LSBackgroundOnly</key>

Modified: trunk/platforms/Mac OS/vm/Developer/SqueakVMUNIXPATHS.xcodeproj.zip
===================================================================
(Binary files differ)

Modified: trunk/platforms/Mac OS/vm/sqMacMain.c
===================================================================
--- trunk/platforms/Mac OS/vm/sqMacMain.c 2010-06-16 00:21:27 UTC (rev 2212)
+++ trunk/platforms/Mac OS/vm/sqMacMain.c 2010-06-16 00:42:35 UTC (rev 2213)
@@ -404,7 +404,8 @@
  /* vm build string */
 
     if (id == 1006) {
- return "Mac Carbon 4.2.4b1 28-Mar-10 >45CAAEAC-5A1E-4327-9702-7973E3473FDE<";
+ return "Mac Carbon 4.2.5b1 15-Jun-10 >85D9C693-2A2A-4C33-B05C-C20B2A63B166<";
+// return "Mac Carbon 4.2.4b1 28-Mar-10 >45CAAEAC-5A1E-4327-9702-7973E3473FDE<";
 // return "Mac Carbon 4.2.3b1 13-Mar-10 >551DCCD5-0515-4A91-9316-73DCCB7E7C66<";
 // return "Mac Carbon 4.2.2b1 17-Sep-09 >6F0202CF-180C-420A-9CE8-411B696D3467<";
 // return "Mac Carbon 4.2.1b1 19-Aug-09 >4897EDBA-66BA-413A-9117-AC98701639F8<";

Modified: trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c
===================================================================
--- trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c 2010-06-16 00:21:27 UTC (rev 2212)
+++ trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c 2010-06-16 00:42:35 UTC (rev 2213)
@@ -644,7 +644,8 @@
  for (g = 0; g < 6; g++) {
  for (b = 0; b < 6; b++) {
  i = 40 + ((36 * r) + (6 * b) + g);
- if (i > 255) error("index out of range in color table compuation");
+
+ if (i > 255)exit (-832);
  SetColorEntry(i, (r * 65535) / 5, (g * 65535) / 5, (b * 65535) / 5);
  }
  }

Modified: trunk/platforms/Mac OS/vm/sqPlatformSpecific.h
===================================================================
--- trunk/platforms/Mac OS/vm/sqPlatformSpecific.h 2010-06-16 00:21:27 UTC (rev 2212)
+++ trunk/platforms/Mac OS/vm/sqPlatformSpecific.h 2010-06-16 00:42:35 UTC (rev 2213)
@@ -99,7 +99,6 @@
 #define ioMSecs ioMicroMSecs
 #undef ioMicroSecondClock
 #define ioMicroSecondClock ioMicroSeconds
-#define ioUtcWithOffset(clock, offset) setMicroSecondsandOffset(clock, offset)
 
 /* macro to return from interpret() loop in browser plugin VM */
 #define ReturnFromInterpret() return