Vm-dev July 2011

vm-dev@lists.squeakfoundation.org

31 participants
164 discussions

[commit] r2483 - Dialect neutrality for error and help messages in the Unix VM.
by commits＠squeakvm.org 01 Aug '11

01 Aug '11

Author: eliot Date: 2011-07-31 15:48:45 -0700 (Sun, 31 Jul 2011) New Revision: 2483 Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/unix/vm/sqUnixExternalPrims.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/unix/vm/sqUnixMain.h Log: Dialect neutrality for error and help messages in the Unix VM. Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Jul 30 13:47:55 PDT 2011 + Sun Jul 31 15:48:22 PDT 2011 Modified: branches/Cog/platforms/unix/vm/sqUnixExternalPrims.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixExternalPrims.c 2011-07-31 17:12:40 UTC (rev 2482) +++ branches/Cog/platforms/unix/vm/sqUnixExternalPrims.c 2011-07-31 22:48:45 UTC (rev 2483) @@ -244,7 +244,7 @@ else { # if DEBUG - printf("squeak: loaded plugin `%s'\n", libName); + printf("%s: loaded plugin `%s'\n", exeName, libName); # endif return handle; } @@ -386,7 +386,7 @@ } #if DEBUG - fprintf(stderr, "squeak: could not load plugin `%s'\n", pluginName); + fprintf(stderr, "%s: could not load plugin `%s'\n", exeName, pluginName); #endif return 0; } Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-07-31 17:12:40 UTC (rev 2482) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-07-31 22:48:45 UTC (rev 2483) @@ -38,6 +38,7 @@ #include "sqaio.h" #include "sqUnixCharConv.h" #include "sqSCCSVersion.h" +#include "sqUnixMain.h" #include "debug.h" #ifdef ioMSecs @@ -84,6 +85,7 @@ char imageName[MAXPATHLEN+1]; /* full path to image */ static char vmName[MAXPATHLEN+1]; /* full path to vm */ char vmPath[MAXPATHLEN+1]; /* full path to image directory */ + char *exeName; /* short vm name, e.g. "squeak" */ int argCnt= 0; /* global copies for access from plugins */ char **argVec= 0; @@ -289,12 +291,19 @@ } -static void recordFullPathForVmName(const char *localVmName) +static void +recordPathsForVMName(const char *localVmName) { #if defined(__linux__) char name[MAXPATHLEN+1]; int len; +#endif + exeName = strrchr(localVmName,'/') + ? strrchr(localVmName,'/') + 1 + : (char *)localVmName; + +#if defined(__linux__) if ((len= readlink("/proc/self/exe", name, sizeof(name))) > 0) { struct stat st; @@ -576,7 +585,7 @@ fprintf(stderr, "\n"); printCallStack(); fprintf(stderr, "\nTo recover valuable content from this image:\n"); - fprintf(stderr, " squeak %s\n", imageName); + fprintf(stderr, " %s %s\n", exeName, imageName); fprintf(stderr, "and then evaluate\n"); fprintf(stderr, " Smalltalk processStartUpList: true\n"); fprintf(stderr, "in a workspace. DESTROY the dumped image after recovering content!"); @@ -1104,19 +1113,19 @@ if (!*md->addr) if ((*md->addr= queryModule(md->type, md->name))) # if defined(DEBUG_MODULES) - fprintf(stderr, "squeak: %s driver defaulting to vm-%s-%s\n", md->type, md->type, md->name) + fprintf(stderr, "%s: %s driver defaulting to vm-%s-%s\n", exeName, md->type, md->type, md->name) # endif ; } if (!displayModule) { - fprintf(stderr, "squeak: could not find any display driver\n"); + fprintf(stderr, "%s: could not find any display driver\n", exeName); abort(); } if (!soundModule) { - fprintf(stderr, "squeak: could not find any sound driver\n"); + fprintf(stderr, "%s: could not find any sound driver\n", exeName); abort(); } @@ -1173,10 +1182,19 @@ if (documentName) strcpy(shortImageName, documentName); - else if ((ev= getenv("SQUEAK_IMAGE"))) +#if NewspeakVM +# define IMAGE_ENV_NAME "NEWSPEAK_IMAGE" +# define IMAGE_DIALECT_NAME "Newspeak" +# define DEFAULT_IMAGE_NAME "newspeak.image" +#else +# define IMAGE_ENV_NAME "SQUEAK_IMAGE" +# define IMAGE_DIALECT_NAME "Squeak" +# define DEFAULT_IMAGE_NAME "squeak.image" +#endif + else if ((ev= getenv(IMAGE_ENV_NAME))) strcpy(shortImageName, ev); else - strcpy(shortImageName, "squeak.image"); + strcpy(shortImageName, DEFAULT_IMAGE_NAME); if ((ev= getenv("SQUEAK_MEMORY"))) extraMemory= strtobkm(ev); if ((ev= getenv("SQUEAK_MMAP"))) useMmap= strtobkm(ev); @@ -1406,8 +1424,8 @@ static void vm_printUsageNotes(void) { printf(" If `-memory' is not specified then the heap will grow dynamically.\n"); - printf(" <argument>s are ignored, but are processed by the Squeak image.\n"); - printf(" The first <argument> normally names a Squeak `script' to execute.\n"); + printf(" <argument>s are ignored, but are processed by the " IMAGE_DIALECT_NAME " image.\n"); + printf(" The first <argument> normally names a " IMAGE_DIALECT_NAME " `script' to execute.\n"); printf(" Precede <arguments> by `--' to use default image.\n"); } @@ -1448,7 +1466,7 @@ printf(" -spy enable the system spy\n"); } printf("\nNotes:\n"); - printf(" <imageName> defaults to `squeak.image'.\n"); + printf(" <imageName> defaults to `" DEFAULT_IMAGE_NAME "'.\n"); modulesDo(m) m->printUsageNotes(); printf("\nAvailable drivers:\n"); @@ -1466,7 +1484,7 @@ info[0]= '\0'; if (verbose) - sprintf(info+strlen(info), "Squeak VM version: "); + 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"); @@ -1540,21 +1558,22 @@ /*** main ***/ -static void imageNotFound(char *imageName) +static void +imageNotFound(char *imageName) { /* image file is not found */ fprintf(stderr, - "Could not open the Squeak image file `%s'.\n" + "Could not open the " IMAGE_DIALECT_NAME " image file `%s'.\n" "\n" - "There are three ways to open a Squeak image file. You can:\n" + "There are three ways to open a " IMAGE_DIALECT_NAME " image file. You can:\n" " 1. Put copies of the default image and changes files in this directory.\n" " 2. Put the name of the image file on the command line when you\n" - " run squeak (use the `-help' option for more information).\n" - " 3. Set the environment variable SQUEAK_IMAGE to the name of the image\n" + " run %s (use the `-help' option for more information).\n" + " 3. Set the environment variable " IMAGE_ENV_NAME " to the name of the image\n" " that you want to use by default.\n" "\n" - "For more information, type: `man squeak' (without the quote characters).\n", - imageName); + "For more information, type: `man %s' (without the quote characters).\n", + imageName, exeName, exeName); exit(1); } @@ -1664,7 +1683,7 @@ tzset(); /* should _not_ be necessary! */ #endif - recordFullPathForVmName(argv[0]); /* full vm path */ + recordPathsForVMName(argv[0]); /* full vm path */ squeakPlugins= vmPath; /* default plugin location is VM directory */ #if !DEBUG Modified: branches/Cog/platforms/unix/vm/sqUnixMain.h =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.h 2011-07-31 17:12:40 UTC (rev 2482) +++ branches/Cog/platforms/unix/vm/sqUnixMain.h 2011-07-31 22:48:45 UTC (rev 2483) @@ -5,6 +5,7 @@ extern char shortImageName[]; extern int inputEventSemaIndex; extern char vmPath[]; +extern char *exeName; extern char **argVec; extern int fullScreenFlag;

1 0

[Cog] Strange inliner behavior
by Igor Stasenko 31 Jul '11

31 Jul '11

Here the slang code: size := self sizeBitsOf: op1. size = (self sizeBitsOf: op2) ifFalse: [ ^ false ]. And here translated code: /* begin sizeBitsOf: */ header = longAt(op1); size = ((header & TypeMask) == HeaderTypeSizeAndClass ? (longAt(op1 - (BytesPerWord * 2))) & LongSizeMask : header & SizeMask); if (!(size == (sizeBitsOf(op2)))) { return 0; } as you can see it inlining first, but refuses to inline second one. -- Best regards, Igor Stasenko AKA sig.

4 10

[commit] r2482 - Make the primVmPath answers Resources directory behavior controlled by the
by commits＠squeakvm.org 31 Jul '11

31 Jul '11

Author: eliot Date: 2011-07-31 10:12:40 -0700 (Sun, 31 Jul 2011) New Revision: 2482 Modified: branches/Cog/nscogbuild/macbuild/CoreVM.plist branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c Log: Make the primVmPath answers Resources directory behavior controlled by the <key>SqueakVMPathAnswersResources</key> preference in the Info.plist file instead of being hard-coded bi #if NewspeakVM. Fix make clean in the installer to remove any and all .dmg files. Modified: branches/Cog/nscogbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-07-30 20:48:09 UTC (rev 2481) +++ branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-07-31 17:12:40 UTC (rev 2482) @@ -227,5 +227,7 @@ <true/> <key>SqueakWindowType</key> <integer>6</integer> + <key>SqueakVMPathAnswersResources</key> + <true/> </dict> </plist> Modified: branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2011-07-30 20:48:09 UTC (rev 2481) +++ branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2011-07-31 17:12:40 UTC (rev 2482) @@ -22,4 +22,4 @@ sed $(SED_RULES) < $< > $@ clean:: - -rm -rf $(VM_DMG) $(VM_DMG).sparseimage LayoutDiskImage.applescript *.app + -rm -rf *.dmg *.sparseimage LayoutDiskImage.applescript *.app Modified: branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c 2011-07-30 20:48:09 UTC (rev 2481) +++ branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c 2011-07-31 17:12:40 UTC (rev 2482) @@ -24,9 +24,11 @@ /* On Newspeak we want to answer the Resources directory for vmPathGetLength/ * primitiveVMPath/primVMPath since this allows us to put the sources file - * in the Resources directory. + * in the Resources directory. Controlled by the SqueakVMPathAnswersResources + * boolean in the Info.plist file. */ -#if NewspeakVM +extern Boolean gSqueakVMPathAnswersResources; + static void getVMResourcesDirectory(char *path) { @@ -35,18 +37,16 @@ ux2sqPath(argVec[0], strlen(argVec[0]), path, VMPATH_SIZE,1); strcpy(strstr(path,"MacOS/"),"Resources/"); } -#endif /* NewspeakVM */ /*** VM Home Directory Path ***/ int vmPathSize(void) { char path[VMPATH_SIZE + 1]; -#if NewspeakVM - getVMResourcesDirectory(path); -#else - getVMPathWithEncoding(path,gCurrentVMEncoding); -#endif + if (gSqueakVMPathAnswersResources) + getVMResourcesDirectory(path); + else + getVMPathWithEncoding(path,gCurrentVMEncoding); return strlen(path); } @@ -55,11 +55,10 @@ int count, i; char path[VMPATH_SIZE + 1]; -#if NewspeakVM - getVMResourcesDirectory(path); -#else - getVMPathWithEncoding(path,gCurrentVMEncoding); -#endif + if (gSqueakVMPathAnswersResources) + getVMResourcesDirectory(path); + else + getVMPathWithEncoding(path,gCurrentVMEncoding); count = strlen(path); count = (length < count) ? length : count; Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2011-07-30 20:48:09 UTC (rev 2481) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2011-07-31 17:12:40 UTC (rev 2482) @@ -113,20 +113,31 @@ extern pthread_cond_t gSleepLockCondition; OSErr gSqueakFileLastError; -Boolean gSqueakWindowIsFloating,gSqueakWindowHasTitle=true,gSqueakFloatingWindowGetsFocus=false,gSqueakUIFlushUseHighPercisionClock=false,gSqueakPluginsBuiltInOrLocalOnly=false,gSqueakHeadless=false,gSqueakQuitOnQuitAppleEvent=false,gSqueakExplicitWindowOpenNeeded=false; -Boolean gSqueakHasQuitWithoutSaving = true; +Boolean gSqueakWindowIsFloating,gSqueakWindowHasTitle=true, + gSqueakHasQuitWithoutSaving = true, + gSqueakFloatingWindowGetsFocus=false, + gSqueakUIFlushUseHighPercisionClock=false, + gSqueakPluginsBuiltInOrLocalOnly=false, + gSqueakHeadless=false, + gSqueakQuitOnQuitAppleEvent=false, + gSqueakExplicitWindowOpenNeeded=false, + gSqueakVMPathAnswersResources=false; long gSqueakMouseMappings[4][4] = {{0},{0}}; long gSqueakBrowserMouseMappings[4][4] = {{0},{0}}; usqInt gMaxHeapSize=512*1024*1024; UInt32 gSqueakWindowType=zoomDocProc,gSqueakWindowAttributes=0; -long gSqueakUIFlushPrimaryDeferNMilliseconds=20,gSqueakUIFlushSecondaryCleanupDelayMilliseconds=20,gSqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds=16,gSqueakDebug=0; +long gSqueakUIFlushPrimaryDeferNMilliseconds=20, + gSqueakUIFlushSecondaryCleanupDelayMilliseconds=20, + gSqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds=16, + gSqueakDebug=0; char gSqueakImageName[PATH_MAX] = "Squeak.image"; char gSqueakUntrustedDirectoryName[PATH_MAX] = "/foobar/tooBar/forSqueak/bogus/"; char gSqueakTrustedDirectoryName[PATH_MAX] = "/foobar/tooBar/forSqueak/bogus/"; CFStringRef gSqueakImageNameStringRef; int gSqueakBrowserPipes[]= {-1, -1}; -Boolean gSqueakBrowserSubProcess = false,gSqueakBrowserWasHeadlessButMadeFullScreen=false; -Boolean gSqueakBrowserExitRequested = false; +Boolean gSqueakBrowserSubProcess = false, + gSqueakBrowserWasHeadlessButMadeFullScreen=false, + gSqueakBrowserExitRequested = false; void cocoInterfaceForTilda(CFStringRef aStringRef, char *buffer,int max_size); /*** Main ***/ @@ -672,13 +683,26 @@ fetchPrefrences() { CFBundleRef myBundle; CFDictionaryRef myDictionary; - CFNumberRef SqueakWindowType,SqueakMaxHeapSizeType,SqueakUIFlushPrimaryDeferNMilliseconds,SqueakUIFlushSecondaryCleanupDelayMilliseconds,SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds,SqueakDebug; - CFBooleanRef SqueakWindowHasTitleType,SqueakFloatingWindowGetsFocusType,SqueakUIFlushUseHighPercisionClock,SqueakPluginsBuiltInOrLocalOnly,SqueakQuitOnQuitAppleEvent,SqueakExplicitWindowOpenNeeded; + CFNumberRef SqueakWindowType, + SqueakMaxHeapSizeType, + SqueakUIFlushPrimaryDeferNMilliseconds, + SqueakUIFlushSecondaryCleanupDelayMilliseconds, + SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds, + SqueakDebug; + CFBooleanRef SqueakWindowHasTitleType, + SqueakFloatingWindowGetsFocusType, + SqueakUIFlushUseHighPercisionClock, + SqueakPluginsBuiltInOrLocalOnly, + SqueakQuitOnQuitAppleEvent, + SqueakExplicitWindowOpenNeeded, + SqueakVMPathAnswersResources; CFBooleanRef SqueakHasQuitWithoutSaving; CFNumberRef SqueakMouseMappings[4][4] = {{0},{0}}; CFNumberRef SqueakBrowserMouseMappings[4][4] = {{0},{0}}; CFDataRef SqueakWindowAttributeType; - CFStringRef SqueakVMEncodingType, SqueakUnTrustedDirectoryTypeRef, SqueakTrustedDirectoryTypeRef; + CFStringRef SqueakVMEncodingType, + SqueakUnTrustedDirectoryTypeRef, + SqueakTrustedDirectoryTypeRef; char encoding[256]; long i,j; @@ -692,6 +716,7 @@ SqueakWindowAttributeType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowAttribute")); SqueakWindowHasTitleType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowHasTitle")); SqueakFloatingWindowGetsFocusType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakFloatingWindowGetsFocus")); + SqueakVMPathAnswersResources = CFDictionaryGetValue(myDictionary, CFSTR("SqueakVMPathAnswersResources")); SqueakMaxHeapSizeType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakMaxHeapSize")); SqueakVMEncodingType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakEncodingType")); SqueakUnTrustedDirectoryTypeRef = CFDictionaryGetValue(myDictionary, CFSTR("SqueakUnTrustedDirectory")); @@ -803,6 +828,11 @@ else gSqueakFloatingWindowGetsFocus = false; + if (SqueakVMPathAnswersResources) + gSqueakVMPathAnswersResources = CFBooleanGetValue(SqueakVMPathAnswersResources); + else + gSqueakVMPathAnswersResources = false; + if (SqueakWindowHasTitleType) gSqueakWindowHasTitle = CFBooleanGetValue(SqueakWindowHasTitleType); else

1 0

[commit] r2481 - And the VM path must be terminated with a /.
by commits＠squeakvm.org 30 Jul '11

30 Jul '11

Author: eliot Date: 2011-07-30 13:48:09 -0700 (Sat, 30 Jul 2011) New Revision: 2481 Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c Log: And the VM path must be terminated with a /. Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Jul 30 13:44:56 PDT 2011 + Sat Jul 30 13:47:55 PDT 2011 Modified: branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c 2011-07-30 20:45:12 UTC (rev 2480) +++ branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c 2011-07-30 20:48:09 UTC (rev 2481) @@ -33,7 +33,7 @@ extern char **argVec; ux2sqPath(argVec[0], strlen(argVec[0]), path, VMPATH_SIZE,1); - strcpy(strstr(path,"MacOS/"),"Resources"); + strcpy(strstr(path,"MacOS/"),"Resources/"); } #endif /* NewspeakVM */

1 0

[commit] r2480 - Modify Newspeak MacOS vm to answer Resources directory for primVMPath so that
by commits＠squeakvm.org 30 Jul '11

30 Jul '11

Author: eliot Date: 2011-07-30 13:45:12 -0700 (Sat, 30 Jul 2011) New Revision: 2480 Modified: branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in branches/Cog/nscogbuild/macbuild/installer/Makefile branches/Cog/nscogbuild/macbuild/installer/branding.gmk branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c Log: Modify Newspeak MacOS vm to answer Resources directory for primVMPath so that the sources file can be included in the Resources directory (which makes for a neater install). Modify the MacOS dmg installer a) to put the sources in the Resources directory and b) to include the YY.WW.REV version in the dmg name. Modified: branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in 2011-07-30 00:26:10 UTC (rev 2479) +++ branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in 2011-07-30 20:45:12 UTC (rev 2480) @@ -16,7 +16,6 @@ end tell set position of item "Applications" to {370, 91} set position of item "@@VM_LOCALIZED_NAME@@.app" to {130, 91} - set position of item "@@SOURCEFILENAME1@@" to {130, 266} eject end tell end tell Modified: branches/Cog/nscogbuild/macbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/Makefile 2011-07-30 00:26:10 UTC (rev 2479) +++ branches/Cog/nscogbuild/macbuild/installer/Makefile 2011-07-30 20:45:12 UTC (rev 2480) @@ -5,6 +5,7 @@ # edit and run ./links to get .app and sources, then run make SOURCES := yes +SOURCEFILENAME1 := $(shell echo ~/Squeak/SqueakV41.sources) DOCUMENTATION_DIR := doc include branding.gmk @@ -20,9 +21,9 @@ $(VM_LOCALIZED_NAME_ESC).app: rm -rf $(VM_LOCALIZED_NAME_ESC).app cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app + ln $(SOURCEFILENAME1) $(VM_LOCALIZED_NAME_ESC).app/Contents/Resources # Cab contents: VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app -SOURCEFILENAME1 := SqueakV41.sources include installer-Darwin.gmk Modified: branches/Cog/nscogbuild/macbuild/installer/branding.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/branding.gmk 2011-07-30 00:26:10 UTC (rev 2479) +++ branches/Cog/nscogbuild/macbuild/installer/branding.gmk 2011-07-30 20:45:12 UTC (rev 2480) @@ -1,7 +1,11 @@ # Version should follow the Windows convention (0-255.0-255.0-65535) # For the prototype, use YY.MM.DDNN (NN should come from the image # name, e.g., nsboot-20YY-MM-DD.NN.image) -#VERSION := 07.11.0101 +# For Cog would like to use YY.MMDD.SVN where SVN is the Subversion checkin +# id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit +# the 0-255 field. So use YY.WW.SVN where WW is the week number. +SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: $[0-9][0-9]*$.*/\1/' ) +VERSION := $(shell date +%g.%U.$(SVNREV)) # Base name of the executable (.exe is appended on Windows) ifndef VM_BASE_NAME Modified: branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2011-07-30 00:26:10 UTC (rev 2479) +++ branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2011-07-30 20:45:12 UTC (rev 2480) @@ -1,4 +1,4 @@ -VM_DMG := $(VM_LOCALIZED_NAME_ESC).dmg +VM_DMG := $(VM_LOCALIZED_NAME_ESC)-$(VERSION).dmg $(VM_DMG): $(VM_BUNDLE) $(INSTALLER_BACKGROUND).png LayoutDiskImage.applescript $(INSTALLER_ICON).icns -hdiutil eject '/Volumes/$(PRODUCT_NAME)' @@ -9,7 +9,6 @@ cp -p '$(INSTALLER_BACKGROUND).png' '/Volumes/$(PRODUCT_NAME)/.background' ln -s /Applications '/Volumes/$(PRODUCT_NAME)/.' ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app' - ditto $(SOURCEFILENAME1) '/Volumes/$(PRODUCT_NAME)/$(SOURCEFILENAME1)' bless --folder '/Volumes/$(PRODUCT_NAME)' --openfolder '/Volumes/$(PRODUCT_NAME)' cp '$(INSTALLER_ICON).icns' '/Volumes/$(PRODUCT_NAME)/.VolumeIcon.icns' /Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)' Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jul 29 12:58:01 PDT 2011 + Sat Jul 30 13:44:56 PDT 2011 Modified: branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c 2011-07-30 00:26:10 UTC (rev 2479) +++ branches/Cog/platforms/Mac OS/vm/sqMacImageIO.c 2011-07-30 20:45:12 UTC (rev 2480) @@ -22,22 +22,44 @@ #include "sqMacEncoding.h" +/* On Newspeak we want to answer the Resources directory for vmPathGetLength/ + * primitiveVMPath/primVMPath since this allows us to put the sources file + * in the Resources directory. + */ +#if NewspeakVM +static void +getVMResourcesDirectory(char *path) +{ +extern char **argVec; + ux2sqPath(argVec[0], strlen(argVec[0]), path, VMPATH_SIZE,1); + strcpy(strstr(path,"MacOS/"),"Resources"); +} +#endif /* NewspeakVM */ + /*** VM Home Directory Path ***/ int vmPathSize(void) { - char path[VMPATH_SIZE + 1]; - - getVMPathWithEncoding(path,gCurrentVMEncoding); + char path[VMPATH_SIZE + 1]; + +#if NewspeakVM + getVMResourcesDirectory(path); +#else + getVMPathWithEncoding(path,gCurrentVMEncoding); +#endif return strlen(path); } int vmPathGetLength(sqInt sqVMPathIndex, int length) { char *stVMPath = (char *) sqVMPathIndex; int count, i; - char path[VMPATH_SIZE + 1]; + char path[VMPATH_SIZE + 1]; - getVMPathWithEncoding(path,gCurrentVMEncoding); +#if NewspeakVM + getVMResourcesDirectory(path); +#else + getVMPathWithEncoding(path,gCurrentVMEncoding); +#endif count = strlen(path); count = (length < count) ? length : count;

1 0

[commit] r2479 - ditto. but edit the run scripts also
by commits＠squeakvm.org 30 Jul '11

30 Jul '11

Author: eliot Date: 2011-07-29 17:26:10 -0700 (Fri, 29 Jul 2011) New Revision: 2479 Modified: branches/Cog/scripts/mkvmarchives Log: ditto. but edit the run scripts also Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-30 00:11:58 UTC (rev 2478) +++ branches/Cog/scripts/mkvmarchives 2011-07-30 00:26:10 UTC (rev 2479) @@ -90,10 +90,18 @@ EXES="$EXES cogmtwin/Croquet.exe" fi if [ -n "$NL" ]; then - LIBDIR=nsvmlinux/lib/squeak/[0-9.-]* - test -f nsvmlinux/squeak && mv nsvmlinux/squeak nsvmlinux/nsvm - test -f nsvmlinux/bin/squeak && mv nsvmlinux/bin/squeak nsvmlinux/bin/nsvm + if [ -f nsvmlinux/squeak ]; then + mv nsvmlinux/squeak nsvmlinux/nsvm + ex "+g/squeak/s/squeak/nsvm/g" +w +q nsvmlinux/nsvm + fi + if [ -f nsvmlinux/bin/squeak ]; then + mv nsvmlinux/bin/squeak nsvmlinux/bin/nsvm + ex "+g/squeak/s/squeak/nsvm/g" +w +q nsvmlinux/bin/nsvm + fi + test -d nsvmlinux/lib/squeak && mv nsvmlinux/lib/squeak nsvmlinux/lib/nsvm + LIBDIR="`echo nsvmlinux/lib/nsvm/[0-9.-]*`" test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm + rm -rf nsvmlinux.tgz COPYFILE_DISABLE=1 tar czf nsvmlinux.tgz nsvmlinux EXES="$EXES $LIBDIR/nsvm"

1 0

[commit] r2478 - Rename the newspeak linux executables in mkvmarchives since doing it in
by commits＠squeakvm.org 30 Jul '11

30 Jul '11

Author: eliot Date: 2011-07-29 17:11:58 -0700 (Fri, 29 Jul 2011) New Revision: 2478 Modified: branches/Cog/scripts/mkvmarchives Log: Rename the newspeak linux executables in mkvmarchives since doing it in config land is soooo muuuuuch wooork. Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-29 23:48:34 UTC (rev 2477) +++ branches/Cog/scripts/mkvmarchives 2011-07-30 00:11:58 UTC (rev 2478) @@ -90,9 +90,13 @@ EXES="$EXES cogmtwin/Croquet.exe" fi if [ -n "$NL" ]; then + LIBDIR=nsvmlinux/lib/squeak/[0-9.-]* + test -f nsvmlinux/squeak && mv nsvmlinux/squeak nsvmlinux/nsvm + test -f nsvmlinux/bin/squeak && mv nsvmlinux/bin/squeak nsvmlinux/bin/nsvm + test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm rm -rf nsvmlinux.tgz COPYFILE_DISABLE=1 tar czf nsvmlinux.tgz nsvmlinux - EXES="$EXES nsvmlinux/lib/squeak/[0-9.-]*/squeak" + EXES="$EXES $LIBDIR/nsvm" fi if [ -n "$NM" ]; then test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app

1 0

[commit] r2477 - Install/build chicanery. Add a Newspeak Mac OS installer. Make the Windows
by commits＠squeakvm.org 30 Jul '11

30 Jul '11

Author: eliot Date: 2011-07-29 16:48:34 -0700 (Fri, 29 Jul 2011) New Revision: 2477 Added: branches/Cog/nscogbuild/macbuild/installer/ branches/Cog/nscogbuild/macbuild/installer/InstallerBackground.png branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in branches/Cog/nscogbuild/macbuild/installer/Makefile branches/Cog/nscogbuild/macbuild/installer/VolumeIcon.icns branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk branches/Cog/nscogbuild/macbuild/installer/branding.gmk branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk branches/Cog/nscogbuild/unixbuild/bld/mvm branches/Cog/platforms/unix/config/Makefile.in branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac branches/Cog/scripts/mkvmarchives branches/Cog/unixbuild/bld/mvm branches/Cog/unixbuild/mtbld/mvm Log: Install/build chicanery. Add a Newspeak Mac OS installer. Make the Windows installer version the resulting .msi. Change the unix build to use 4.0-SVNREV as the VM version. make the unix mvm build scripts configure if their builds have not yet been configured, and use absolutized relative paths for the prefix. Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -13,7 +13,7 @@ WIN_SDK := /cygdrive/c/Program\ Files/Microsoft\ SDKs/Windows/$(WIN_SDK_VER)/ MSIVAL2_DIR := /cygdrive/c/Program\ Files/MsiVal2/ -MSI_NAME := $(INSTALLER_BASE_NAME).msi +MSI_NAME := $(INSTALLER_BASE_NAME)-$(VERSION).msi .DEFAULT_GOAL := $(MSI_NAME) all: $(MSI_NAME) Added: branches/Cog/nscogbuild/macbuild/installer/InstallerBackground.png =================================================================== (Binary files differ) Property changes on: branches/Cog/nscogbuild/macbuild/installer/InstallerBackground.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/LayoutDiskImage.applescript.in 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,22 @@ +tell application "Finder" + tell disk "@@VM_LOCALIZED_NAME@@" + open + set backgroundImage to file ".background:@@INSTALLER_BACKGROUND@@.png" + tell container window + set current view to icon view + set toolbar visible to false + set statusbar visible to false + set position to {100, 100} + set bounds to {100, 100, 597, 485} + end tell + tell icon view options of container window + set arrangement to not arranged + set icon size to 128 + set background picture to backgroundImage + end tell + set position of item "Applications" to {370, 91} + set position of item "@@VM_LOCALIZED_NAME@@.app" to {130, 91} + set position of item "@@SOURCEFILENAME1@@" to {130, 266} + eject + end tell +end tell Added: branches/Cog/nscogbuild/macbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/Makefile (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/Makefile 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,28 @@ +# Makefile for the Mac OS installer. +# Produces a .dmg given an executable, and possibly an image file. +# +# How to build: +# edit and run ./links to get .app and sources, then run make + +SOURCES := yes +DOCUMENTATION_DIR := doc + +include branding.gmk +include branding-sed-rules.gmk + +space:= $(empty) $(empty) +define ESCAPE_VAR +$(1)_ESC := $(subst $(space),\$(space),$($(1))) +endef +BRANDING := VM_BASE_NAME PRODUCT_NAME VM_LOCALIZED_NAME MANUFACTURER IMAGE +$(foreach var,$(BRANDING),$(eval $(call ESCAPE_VAR,$(var)))) + +$(VM_LOCALIZED_NAME_ESC).app: + rm -rf $(VM_LOCALIZED_NAME_ESC).app + cp -R ../Fast.app $(VM_LOCALIZED_NAME_ESC).app + +# Cab contents: +VM_BUNDLE := $(VM_LOCALIZED_NAME_ESC).app +SOURCEFILENAME1 := SqueakV41.sources + +include installer-Darwin.gmk Added: branches/Cog/nscogbuild/macbuild/installer/VolumeIcon.icns =================================================================== (Binary files differ) Property changes on: branches/Cog/nscogbuild/macbuild/installer/VolumeIcon.icns ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/branding-sed-rules.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,11 @@ +SED_RULES += -e 's%@@VM_BASE_NAME@@%$(VM_BASE_NAME)%g;' +SED_RULES += -e 's%@@PROJECT_REVERSE_DOMAIN@@%$(PROJECT_REVERSE_DOMAIN)%g;' +SED_RULES += -e 's%@@VM_ICON@@%$(notdir $(VM_ICON))%g;' +SED_RULES += -e 's%@@VM_LOCALIZED_NAME@@%$(VM_LOCALIZED_NAME)%g;' +SED_RULES += -e 's%@@MANUFACTURER@@%$(MANUFACTURER)%g;' +SED_RULES += -e 's%@@PRODUCT_NAME@@%$(PRODUCT_NAME)%g;' +SED_RULES += -e 's%@@PRODUCT_VERSION@@%$(PRODUCT_VERSION)%g;' +SED_RULES += -e 's%@@IMAGE@@%$(IMAGE)%g;' +SED_RULES += -e 's%@@SOURCEFILENAME1@@%$(SOURCEFILENAME1)%g;' +SED_RULES += -e 's%@@INSTALLER_BACKGROUND@@%$(INSTALLER_BACKGROUND)%g;' +SED_RULES += -e 's/^\#.*//;' Added: branches/Cog/nscogbuild/macbuild/installer/branding.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/branding.gmk (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/branding.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,35 @@ +# Version should follow the Windows convention (0-255.0-255.0-65535) +# For the prototype, use YY.MM.DDNN (NN should come from the image +# name, e.g., nsboot-20YY-MM-DD.NN.image) +#VERSION := 07.11.0101 + +# Base name of the executable (.exe is appended on Windows) +ifndef VM_BASE_NAME +VM_BASE_NAME := nsvm +endif + +# Product name as compiled into the executable and installers +ifndef PRODUCT_NAME +PRODUCT_NAME := Newspeak Virtual Machine +endif + +# Used for Desktop/menubar shortcuts +ifndef VM_LOCALIZED_NAME +VM_LOCALIZED_NAME := $(PRODUCT_NAME) +endif + +ifndef MANUFACTURER +MANUFACTURER := Cadence Design Systems, Inc. +endif + +ifndef PROJECT_REVERSE_DOMAIN +PROJECT_REVERSE_DOMAIN := org.newspeakplatform +endif + +ifndef INSTALLER_BACKGROUND +INSTALLER_BACKGROUND := InstallerBackground +endif + +ifndef INSTALLER_ICON +INSTALLER_ICON := VolumeIcon +endif Added: branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk (rev 0) +++ branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2011-07-29 23:48:34 UTC (rev 2477) @@ -0,0 +1,26 @@ +VM_DMG := $(VM_LOCALIZED_NAME_ESC).dmg + +$(VM_DMG): $(VM_BUNDLE) $(INSTALLER_BACKGROUND).png LayoutDiskImage.applescript $(INSTALLER_ICON).icns + -hdiutil eject '/Volumes/$(PRODUCT_NAME)' + -rm -f "$@.sparseimage" "$@" + hdiutil create -size 100m -type SPARSE -volname $(VM_LOCALIZED_NAME_ESC) -fs 'Journaled HFS+' "$@.sparseimage" + hdiutil attach "$@.sparseimage" + mkdir -p '/Volumes/$(PRODUCT_NAME)/.background' + cp -p '$(INSTALLER_BACKGROUND).png' '/Volumes/$(PRODUCT_NAME)/.background' + ln -s /Applications '/Volumes/$(PRODUCT_NAME)/.' + ditto $(VM_BUNDLE) '/Volumes/$(PRODUCT_NAME)/$(VM_LOCALIZED_NAME).app' + ditto $(SOURCEFILENAME1) '/Volumes/$(PRODUCT_NAME)/$(SOURCEFILENAME1)' + bless --folder '/Volumes/$(PRODUCT_NAME)' --openfolder '/Volumes/$(PRODUCT_NAME)' + cp '$(INSTALLER_ICON).icns' '/Volumes/$(PRODUCT_NAME)/.VolumeIcon.icns' + /Developer/Tools/SetFile -a C '/Volumes/$(PRODUCT_NAME)' + osascript LayoutDiskImage.applescript + while test -e '/Volumes/$(PRODUCT_NAME)' ; do echo Waiting for Finder to eject '/Volumes/$(PRODUCT_NAME)'; sleep 2; done + hdiutil convert "$@.sparseimage" -format UDBZ -o $(VM_DMG) + +.DEFAULT_GOAL := $(VM_DMG) + +LayoutDiskImage.applescript: LayoutDiskImage.applescript.in branding.gmk branding-sed-rules.gmk Makefile + sed $(SED_RULES) < $< > $@ + +clean:: + -rm -rf $(VM_DMG) $(VM_DMG).sparseimage LayoutDiskImage.applescript *.app Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/mvm 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2011-07-29 23:48:34 UTC (rev 2477) @@ -1,2 +1,5 @@ #!/bin/sh -../../../scripts/nukeversion;make install prefix=~/oscogvm/nsvmlinux +test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid" +../../../scripts/nukeversion +rm -rf ../../../nsvmlinux +make install prefix=`readlink -f \`pwd\`/../../../nsvmlinux` Modified: branches/Cog/platforms/unix/config/Makefile.in =================================================================== --- branches/Cog/platforms/unix/config/Makefile.in 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/platforms/unix/config/Makefile.in 2011-07-29 23:48:34 UTC (rev 2477) @@ -63,7 +63,7 @@ # nuke everything but plugins.int & plugins.ext reallyclean: - for f in *; do case "$$f" in plugins.[ie][nx]t) ;; *) rm -rf $$f; esac; done + for f in *; do case "$$f" in plugins.[ie][nx]t|mvm) ;; *) rm -rf $$f; esac; done # npsqueak Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/platforms/unix/config/configure 2011-07-29 23:48:34 UTC (rev 2477) @@ -1510,13 +1510,15 @@ +SVNREV=`grep '\$Rev: ' ${srcdir}/../../../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/.*$Rev: $[0-9][0-9]*$.*/\1/'` - VM_MAJOR=3 - VM_MINOR=9 - VM_RELEASE=7 - SQ_MAJOR=3 - SQ_MINOR=9a - SQ_UPDATE=7024 + VM_MAJOR=4 + VM_MINOR=0 + VM_RELEASE=${SVNREV} + SQ_MAJOR=4 + SQ_MINOR=2 + SQ_UPDATE=0 topdir=`cd ${srcdir}/../../..; pwd` @@ -5874,7 +5876,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5877 "configure"' > conftest.$ac_ext + echo '#line 5879 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6891,7 +6893,7 @@ # Provide some information about the compiler. -echo "$as_me:6894:" \ +echo "$as_me:6896:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -7954,11 +7956,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7957: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7959: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7961: \$? = $ac_status" >&5 + echo "$as_me:7963: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8222,11 +8224,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8225: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8227: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8229: \$? = $ac_status" >&5 + echo "$as_me:8231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8326,11 +8328,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8329: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8331: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8333: \$? = $ac_status" >&5 + echo "$as_me:8335: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9795,7 +9797,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 9798 "configure"' > conftest.$ac_ext + echo '#line 9800 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10692,7 +10694,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10695 "configure" +#line 10697 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10792,7 +10794,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10795 "configure" +#line 10797 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13135,11 +13137,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13138: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13140: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13142: \$? = $ac_status" >&5 + echo "$as_me:13144: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13239,11 +13241,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13242: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13244: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13246: \$? = $ac_status" >&5 + echo "$as_me:13248: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13775,7 +13777,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 13778 "configure"' > conftest.$ac_ext + echo '#line 13780 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -14833,11 +14835,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14836: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14838: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14840: \$? = $ac_status" >&5 + echo "$as_me:14842: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14937,11 +14939,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14940: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14942: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14944: \$? = $ac_status" >&5 + echo "$as_me:14946: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16386,7 +16388,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 16389 "configure"' > conftest.$ac_ext + echo '#line 16391 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17164,11 +17166,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17167: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17169: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17171: \$? = $ac_status" >&5 + echo "$as_me:17173: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17432,11 +17434,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17435: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17437: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17439: \$? = $ac_status" >&5 + echo "$as_me:17441: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17536,11 +17538,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17539: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17541: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17543: \$? = $ac_status" >&5 + echo "$as_me:17545: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19005,7 +19007,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 19008 "configure"' > conftest.$ac_ext + echo '#line 19010 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/platforms/unix/config/configure.ac 2011-07-29 23:48:34 UTC (rev 2477) @@ -32,7 +32,9 @@ AC_INIT([config.h.in]) -AC_VM_VERSION(3,9,7, 3,9a,7024) +SVNREV=`grep '\$Rev: ' ${srcdir}/../../../platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/.*$Rev: $[[0-9]][[0-9]]*$.*/\1/'` +AC_VM_VERSION(4,0,${SVNREV},4,2,0) topdir=`cd ${srcdir}/../../..; pwd` cfgdir=`cd ${srcdir}; pwd` Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/scripts/mkvmarchives 2011-07-29 23:48:34 UTC (rev 2477) @@ -50,12 +50,12 @@ if [ -n "$CL" ]; then rm -rf coglinux.tgz COPYFILE_DISABLE=1 tar czf coglinux.tgz coglinux - EXES="$EXES coglinux/lib/squeak/3.9-7/squeak" + EXES="$EXES coglinux/lib/squeak/[0-9.-]*/squeak" fi if [ -n "$CTL" ]; then rm -rf cogmtlinux.tgz COPYFILE_DISABLE=1 tar czf cogmtlinux.tgz cogmtlinux - EXES="$EXES cogmtlinux/lib/squeak/3.9-7/squeak" + EXES="$EXES cogmtlinux/lib/squeak/[0-9.-]*/squeak" fi if [ -n "$CM" ]; then test -d Cog.app || mkdir Cog.app @@ -92,7 +92,7 @@ if [ -n "$NL" ]; then rm -rf nsvmlinux.tgz COPYFILE_DISABLE=1 tar czf nsvmlinux.tgz nsvmlinux - EXES="$EXES nsvmlinux/lib/squeak/3.9-7/squeak" + EXES="$EXES nsvmlinux/lib/squeak/[0-9.-]*/squeak" fi if [ -n "$NM" ]; then test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app Modified: branches/Cog/unixbuild/bld/mvm =================================================================== --- branches/Cog/unixbuild/bld/mvm 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/unixbuild/bld/mvm 2011-07-29 23:48:34 UTC (rev 2477) @@ -1,2 +1,5 @@ #!/bin/sh -../../scripts/nukeversion;make install prefix=~/oscogvm/coglinux +test -f config.h || ../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread +../../scripts/nukeversion +rm -rf ../../coglinux +make install prefix=`readlink -f \`pwd\`/../../coglinux` Modified: branches/Cog/unixbuild/mtbld/mvm =================================================================== --- branches/Cog/unixbuild/mtbld/mvm 2011-07-29 19:59:34 UTC (rev 2476) +++ branches/Cog/unixbuild/mtbld/mvm 2011-07-29 23:48:34 UTC (rev 2477) @@ -1,2 +1,5 @@ #!/bin/sh -../../scripts/nukeversion;make install prefix=~/oscogvm/cogmtlinux +test -f config.h || ../../platforms/unix/config/configure INTERP=cointerpmt --without-vm-display-fbdev --without-npsqueak CFLAGS="-g -O2 -msse2 -DNDEBUG -DCOGMTVM=1 -DDEBUGVM=0 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1" LIBS=-lpthread +../../scripts/nukeversion +rm -rf ../../cogmtlinux +make install prefix=`readlink -f \`pwd\`/../../cogmtlinux`

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.131.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 30 Jul '11

30 Jul '11

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/CMakeVMMaker-EstebanLorenzano.131.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.131 Author: EstebanLorenzano Time: 29 July 2011, 6:29:49 pm UUID: 6aff0200-ac9c-0820-b4ca-0e0078f65c1f Ancestors: CMakeVMMaker-IgorStasenko.130 Including TestOSAPlugin rules

1 0

VM Maker: VMMaker-oscog-EstebanLorenzano.109.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 30 Jul '11

30 Jul '11

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker-oscog-EstebanLorenzano.109.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.109 Author: EstebanLorenzano Time: 29 July 2011, 5:31:05 pm UUID: d5000300-0cf5-581f-1100-0000b8f4581f Ancestors: VMMaker-oscog-IgorStasenko.108 changing imports of TestOSAPlugin to make it compile in latest SDK's

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2011