Author: eliot Date: 2010-12-31 11:27:35 -0800 (Fri, 31 Dec 2010) New Revision: 2336

Modified: branches/Cog/platforms/Mac OS/vm/config.h branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c branches/Cog/platforms/win32/vm/sqWin32.h Log: Nuke VM_LIBDIR, a Unix fossil in the Mac OS tar sands. Make VM_VERSION on Win32 correspond to Mac and cal a Cog a Cog.

Modified: branches/Cog/platforms/Mac OS/vm/config.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/config.h 2010-12-31 01:48:33 UTC (rev 2335) +++ branches/Cog/platforms/Mac OS/vm/config.h 2010-12-31 19:27:35 UTC (rev 2336) @@ -172,9 +172,8 @@

/* other configured variables */

-#define SQ_VERSION "3.8g-6548" -#define VM_VERSION "3.8a-2" -#define VM_LIBDIR "/usr/local/lib/squeak/3.8a-2" +#define SQ_VERSION "4.0-2334" +#define VM_VERSION "4.0" #define VM_MODULE_PREFIX "" /* #undef VM_DLSYM_PREFIX */ #define VM_X11DIR "/usr/X11R6/lib"

Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c 2010-12-31 01:48:33 UTC (rev 2335) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c 2010-12-31 19:27:35 UTC (rev 2336) @@ -275,8 +275,7 @@ || (handle= tryLoading( "./", pluginName)) || (handle= tryLoading( vmDirPath, pluginName)) || (handle= tryLoadingPath("SQUEAK_PLUGIN_PATH", pluginName)) - || (handle= tryLoading( VM_LIBDIR"/", pluginName)) - //JMM || (handle= tryLoadingPath("LD_LIBRARY_PATH", pluginName)) + //JMM || (handle= tryLoadingPath("LD_LIBRARY_PATH", pluginName)) || (handle= tryLoading( "", pluginName)) # if defined(VM_X11DIR) || (handle= tryLoading(VM_X11DIR"/", pluginName))

Modified: branches/Cog/platforms/win32/vm/sqWin32.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32.h 2010-12-31 01:48:33 UTC (rev 2335) +++ branches/Cog/platforms/win32/vm/sqWin32.h 2010-12-31 19:27:35 UTC (rev 2336) @@ -236,7 +236,7 @@ #define VERSION "" #endif

-#define VM_VERSION TEXT("Teleplace VM 1.0.15 (release) from ") TEXT(__DATE__) \ +#define VM_VERSION TEXT("Cog VM 4.0.0 (release) from ") TEXT(__DATE__) \ TEXT("\n") TEXT("Compiler: ") TEXT(COMPILER) TEXT(VERSION)

/********************************************************/