Vm-dev May 2016

vm-dev@lists.squeakfoundation.org

36 participants
150 discussions

[commit][3697] Turn ARC On for 64bit compiles, don't make MIDI, fix various issues with bridge and windowIndex for ARC, fix parseArgument data type warning
by commits＠squeakvm.org 07 May '16

07 May '16

Revision: 3697 Author: johnmci Date: 2016-05-05 10:57:28 -0700 (Thu, 05 May 2016) Log Message: ----------- Turn ARC On for 64bit compiles, don't make MIDI, fix various issues with bridge and windowIndex for ARC, fix parseArgument data type warning Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 17:57:28 UTC (rev 3697) @@ -9,7 +9,7 @@ SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs)))) TARGET_ARCH:=i386 -TARGET_VERSION_MIN:=10.6 +TARGET_VERSION_MIN:=10.7 CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ @@ -17,6 +17,7 @@ -fvisibility=default -fwrapv \ -fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \ -fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \ + -fobjc-weak \ -isysroot $(SDK) \ -include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-05 17:57:28 UTC (rev 3697) @@ -54,7 +54,7 @@ CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) #XEX:= ... %/sqMacV2Browser.m ... XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \ - %/SqViewBitmapConversion.m %/SqViewClut.m + %/SqViewBitmapConversion.m OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 17:57:28 UTC (rev 3697) @@ -9,7 +9,7 @@ SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs)))) TARGET_ARCH:=x86_64 -TARGET_VERSION_MIN:=10.6 +TARGET_VERSION_MIN:=10.7 CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ @@ -17,6 +17,7 @@ -fvisibility=default -fwrapv \ -fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \ -fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \ + -fobjc-arc \ -isysroot $(SDK) \ -include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-05 17:57:28 UTC (rev 3697) @@ -54,7 +54,7 @@ CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) #XEX:= ... %/sqMacV2Browser.m ... XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \ - %/SqViewBitmapConversion.m %/SqViewClut.m + %/SqViewBitmapConversion.m OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-05 17:57:28 UTC (rev 3697) @@ -5,7 +5,6 @@ BochsX64Plugin \ GdbARMPlugin \ CroquetPlugin \ -MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ Modified: branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m =================================================================== --- branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m 2016-05-05 17:57:28 UTC (rev 3697) @@ -57,7 +57,7 @@ sqInt closeWindow(sqInt windowIndex) { NSWindow *windowHandle; - windowHandle = windowHandleFromIndex(windowIndex); + windowHandle = (__bridge NSWindow*) windowHandleFromIndex(windowIndex); if(windowHandle == NULL) return 0; windowBlockFromIndex(windowIndex)->context = NULL; @@ -104,7 +104,7 @@ sqInt ioSetTitleOfWindow(sqInt windowIndex, char * newTitle, sqInt sizeOfTitle) { NSString *title = [[NSString alloc] initWithBytes:newTitle length:sizeOfTitle encoding:NSUTF8StringEncoding]; [[[NSApplication sharedApplication] mainWindow] setTitle:title]; - [title release]; + RELEASEOBJ(title); return 1; } Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2016-05-05 17:57:28 UTC (rev 3697) @@ -56,7 +56,7 @@ sqInt width,height; windowDescriptorBlock *windowBlock; - id createdWindow = [self createPossibleWindow]; + NSObject * createdWindow = [self createPossibleWindow]; extern sqInt getSavedWindowSize(void); //This is VM Callback extern sqInt setSavedWindowSize(sqInt value); //This is VM Callback @@ -65,7 +65,7 @@ width = ((unsigned) getSavedWindowSize()) >> 16; height = getSavedWindowSize() & 0xFFFF; windowBlock = AddWindowBlock(); - windowBlock->handle = createdWindow; + windowBlock->handle = (__bridge void*) createdWindow; windowBlock->context = nil; windowBlock->updateArea = CGRectZero; width = (usqInt) ioScreenSize() >> 16; Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m 2016-05-05 17:57:28 UTC (rev 3697) @@ -53,7 +53,7 @@ sqSqueakScreenAndWindow *getMainWindowDelegate() { #ifdef BUILD_FOR_OSX - return ((NSWindow *) windowHandleFromIndex(1)).delegate; + return ((__bridge NSWindow *) windowHandleFromIndex(1)).delegate; #else return [gDelegateApp screenAndWindow]; #endif Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-05-05 17:57:28 UTC (rev 3697) @@ -425,7 +425,7 @@ evt.value2 = 0; evt.value3 = 0; evt.value4 = 0; - evt.windowIndex = windowIndexFromHandle((wHandleType)window); + evt.windowIndex = windowIndexFromHandle((__bridge wHandleType)window); [self pushEventToQueue: (sqInputEvent *) &evt]; interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2016-05-05 17:57:28 UTC (rev 3697) @@ -45,7 +45,7 @@ } @property (nonatomic,strong) NSCursor *squeakCursor; -- (NSInteger) parseArgument: (NSString *) argData peek: (char *) peek; +- (int) parseArgument: (NSString *) argData peek: (char *) peek; - (void) parseArgs: (NSArray *) args; - (void) parseEnv: (NSDictionary *) env; - (long long) strtobkm: (const char *) chr; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m 2016-05-05 17:18:10 UTC (rev 3696) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m 2016-05-05 17:57:28 UTC (rev 3697) @@ -53,7 +53,7 @@ char* dropRequestFileName(sqInt dropIndex) { /* return name of file or NULL if error */ - sqSqueakOSXOpenGLView *view = ((sqSqueakOSXScreenAndWindow*)((NSWindow *)windowHandleFromIndex(1)).delegate).mainViewOnWindow; + sqSqueakOSXOpenGLView *view = ((sqSqueakOSXScreenAndWindow*)((__bridge NSWindow *)windowHandleFromIndex(1)).delegate).mainViewOnWindow; NSString *fileNameString = [view dragFileNameStringAtIndex: dropIndex]; return (char *) [fileNameString UTF8String]; }

4 12

[commit][3706] JMM work on full screen mode SK-44.
by commits＠squeakvm.org 07 May '16

07 May '16

Revision: 3706 Author: johnmci Date: 2016-05-06 19:54:05 -0700 (Fri, 06 May 2016) Log Message: ----------- JMM work on full screen mode SK-44. Issue was on a screen size change we have to wait for TheDisplay form to change before we can draw again, otherwise we show garbage, or cause a memory violation by running off the end of the squeak bitmap. There are three ways to resize, by resize the window, use of window max/min green dot, and fullscreen primitive. All have different execution paths Modified Paths: -------------- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h 2016-05-07 01:29:48 UTC (rev 3705) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h 2016-05-07 02:54:05 UTC (rev 3706) @@ -59,9 +59,7 @@ CGColorSpaceRef colorspace; unsigned int* colorMap32; BOOL clippyIsEmpty; - BOOL fullScreenInProgress; CGRect clippy; - void* fullScreendispBitsIndex; } @property (nonatomic,assign) NSTrackingRectTag squeakTrackingRectForCursor; @property (nonatomic,strong) keyBoardStrokeDetails* lastSeenKeyBoardStrokeDetails; @@ -70,9 +68,8 @@ @property (nonatomic,assign) int dragCount; @property (nonatomic,strong) NSMutableArray* dragItems; @property (nonatomic,weak) sqSqueakOSXScreenAndWindow *windowLogic; -@property (nonatomic,assign) BOOL fullScreenInProgress; -@property (nonatomic,assign) void* fullScreendispBitsIndex; + - (void) initializeVariables; - (void) fakeKeyDownUp: (NSEvent*) theEvent; - (NSString*) dragFileNameStringAtIndex:(sqInt) index; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-07 01:29:48 UTC (rev 3705) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-07 02:54:05 UTC (rev 3706) @@ -62,6 +62,12 @@ return [NSString stringWithCharacters: &character length: 1]; } +@interface sqSqueakOSXOpenGLView () +@property (nonatomic, assign) NSRect lastFrameSize; +@property (nonatomic,assign) BOOL fullScreenInProgress; +@property (nonatomic,assign) void* fullScreendispBitsIndex; +@end + @implementation sqSqueakOSXOpenGLView @synthesize squeakTrackingRectForCursor,lastSeenKeyBoardStrokeDetails, lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,fullScreenInProgress,fullScreendispBitsIndex; @@ -79,12 +85,10 @@ - (id)initWithFrame:(NSRect)frameRect { self = [self initWithFrame:frameRect pixelFormat:[[self class] defaultPixelFormat]]; - [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [self setAutoresizesSubviews:YES]; [self initialize]; - return self; } @@ -100,14 +104,23 @@ fullScreenInProgress = NO; colorspace = CGColorSpaceCreateDeviceRGB(); [self initializeSqueakColorMap]; + [[NSNotificationCenter defaultCenter] addObserver:self selector: @selector(didEnterFullScreen:) name:@"NSWindowDidEnterFullScreenNotification" object:nil]; + } +- (void) didEnterFullScreen: (NSNotification*) aNotification { + //NSLog(@"Notification didEnterFullScreen"); + [self setupFullScreendispBitsIndex]; + self.fullScreenInProgress = NO; +} + - (void) initializeVariables { } - (void) dealloc { free(colorMap32); CGColorSpaceRelease(colorspace); + [[NSNotificationCenter defaultCenter] removeObserver:self]; SUPERDEALLOC } @@ -137,15 +150,16 @@ } - (void) viewWillStartLiveResize { -// [self.window setShowsResizeIndicator: YES]; + //NSLog(@"viewWillStartLiveResize"); + self.fullScreenInProgress = YES; [[NSCursor arrowCursor] set]; } - (void) viewDidEndLiveResize { -// [self.window setShowsResizeIndicator: NO]; + //NSLog(@"viewDidEndLiveResize"); dispatch_async(dispatch_get_main_queue(), ^{ [((sqSqueakOSXApplication*) gDelegateApp.squeakApplication).squeakCursor set]; - }); + }); } @@ -166,18 +180,8 @@ firstDrawCompleted = YES; return; } - - if (self.fullScreenInProgress) { - sqInt formObj = interpreterProxy->displayObject(); - sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); - void* dispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); - if (self.fullScreendispBitsIndex == dispBitsIndex) { - return; - } - self.fullScreenInProgress = NO; - } - - if (syncNeeded) { + + if (syncNeeded) { [self drawRect: NSRectFromCGRect(clippy)]; syncNeeded = NO; clippyIsEmpty = YES; @@ -187,6 +191,7 @@ } if (!firstDrawCompleted) { firstDrawCompleted = YES; + extern sqInt getFullScreenFlag(void); if (getFullScreenFlag() == 0) { [self.window makeKeyAndOrderFront: self]; } @@ -196,6 +201,7 @@ -(void)setupOpenGL { // CGL_MACRO_DECLARE_VARIABLES(); // Enable the multithreading + //NSLog(@"setupOpenGL runs"); CGLContextObj ctx = [[self openGLContext] CGLContextObj]; CGLEnable( ctx, kCGLCEMPEngine); @@ -237,8 +243,22 @@ // CGL_MACRO_DECLARE_VARIABLES(); static void *previousLastBitsIndex=null; - NSRect r=[self frame]; - if (!(previousLastBitsIndex == lastBitsIndex)) { + NSRect r = self.frame; + + if (!NSEqualRects(_lastFrameSize,r)) { + //NSLog(@"old %f %f %f %f new %f %f %f %f",_lastFrameSize.origin.x,_lastFrameSize.origin.y,_lastFrameSize.size.width,_lastFrameSize.size.height,self.frame.origin.x,r.origin.y,r.size.width,r.size.height); + _lastFrameSize = r; + glPixelStorei( GL_UNPACK_ROW_LENGTH, r.size.width ); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + [[self openGLContext] update]; + } + + if (!(previousLastBitsIndex == lastBitsIndex)) { + //NSLog(@"previousLastBitsIndex %#010x changed to %#010x",previousLastBitsIndex,lastBitsIndex); previousLastBitsIndex = lastBitsIndex; glTextureRangeAPPLE(GL_TEXTURE_RECTANGLE_ARB, r.size.width*r.size.height*4,lastBitsIndex); } @@ -246,7 +266,7 @@ glViewport( subRect.origin.x,subRect.origin.y, subRect.size.width,subRect.size.height ); char *subimg = ((char*)lastBitsIndex) + (unsigned int)(subRect.origin.x + (r.size.height-subRect.origin.y-subRect.size.height)*r.size.width)*4; glTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, subRect.size.width, subRect.size.height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, subimg ); - // NSLog(@" draw %f %f %f %f",subRect.origin.x,subRect.origin.y,subRect.size.width,subRect.size.height); + //NSLog(@" glTexImage2D %f %f %f %f",subRect.origin.x,subRect.origin.y,subRect.size.width,subRect.size.height); } -(void)defineQuad:(NSRect)r @@ -261,78 +281,37 @@ glEnd(); } -- (void)update // moved or resized -{ - NSRect rect; - NSOpenGLContext *oldContext = [NSOpenGLContext currentContext]; - - [super update]; - - [[self openGLContext] makeCurrentContext]; -// CGL_MACRO_DECLARE_VARIABLES(); - [[self openGLContext] update]; - - rect = [self bounds]; - - glViewport(0, 0, rect.size.width, rect.size.height); - glPixelStorei( GL_UNPACK_ROW_LENGTH, rect.size.width ); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - [self setNeedsDisplay:true]; - - if (oldContext != nil) { - [oldContext makeCurrentContext]; - } +- (void) setupFullScreendispBitsIndex { + sqInt formObj = interpreterProxy->displayObject(); + sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); + self.fullScreendispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); } -- (void)reshape // scrolled, moved or resized +-(void)drawRect:(NSRect)rect { + if (self.fullScreenInProgress) { + sqInt formObj = interpreterProxy->displayObject(); + sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); + void* dispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); + if (self.fullScreendispBitsIndex == dispBitsIndex) { + [self clearScreen]; + //NSLog(@"drawRect but fullScreenInProgress %f %f %f %f",rect.origin.x,rect.origin.y,rect.size.width,rect.size.height); + return; + } + self.fullScreenInProgress = NO; + } + + //NSLog(@" draw %f %f %f %f",rect.origin.x,rect.origin.y,rect.size.width,rect.size.height); NSOpenGLContext *oldContext = [NSOpenGLContext currentContext]; - NSRect rect; - [super reshape]; - - [[self openGLContext] makeCurrentContext]; -// CGL_MACRO_DECLARE_VARIABLES(); - [[self openGLContext] update]; - - rect = [self bounds]; - - glViewport(0, 0, rect.size.width, rect.size.height); - glPixelStorei( GL_UNPACK_ROW_LENGTH, rect.size.width ); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - [self setNeedsDisplay:true]; + [self setupFullScreendispBitsIndex]; - if (oldContext != nil) { - [oldContext makeCurrentContext]; - } -} - --(void)drawRect:(NSRect)rect -{ -// NSLog(@" draw %f %f %f %f",rect.origin.x,rect.origin.y,rect.size.width,rect.size.height); - NSOpenGLContext *oldContext = [NSOpenGLContext currentContext]; - sqInt formObj = interpreterProxy->displayObject(); - sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); - self.fullScreendispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); - - static int inited=NO; if ( fullScreendispBitsIndex ) { [[self openGLContext] makeCurrentContext]; - if (!inited) { - [self setupOpenGL]; - inited=YES; - } + static dispatch_once_t once; + dispatch_once(&once, ^{ + [self setupOpenGL]; + }); [self loadTexturesFrom:fullScreendispBitsIndex subRectangle: rect]; [self defineQuad:rect]; } @@ -727,6 +706,17 @@ return YES; } +- (void) clearScreen { + NSOpenGLContext *oldContext = [NSOpenGLContext currentContext]; + [self.openGLContext makeCurrentContext]; + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + glFlush(); + if (oldContext != nil) { + [oldContext makeCurrentContext]; + } + +} + - (void) ioSetFullScreen: (sqInt) fullScreen { if ([self isInFullScreenMode] == YES && (fullScreen == 1))

1 0

[commit][3705] Reflect a change in the mac os compiled fileset from the 32 to the 64-bit build .
by commits＠squeakvm.org 07 May '16

07 May '16

Revision: 3705 Author: eliot Date: 2016-05-06 18:29:48 -0700 (Fri, 06 May 2016) Log Message: ----------- Reflect a change in the mac os compiled fileset from the 32 to the 64-bit build. Update the generated readme to mention the absence of sources file and potential remedies. Modified Paths: -------------- branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/scripts/uploadvms Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-06 20:37:49 UTC (rev 3704) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-07 01:29:48 UTC (rev 3705) @@ -54,7 +54,7 @@ CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) #XEX:= ... %/sqMacV2Browser.m ... XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \ - %/SqViewBitmapConversion.m + %/SqViewBitmapConversion.m %/sqSqueakOSXCGView.m OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2016-05-06 20:37:49 UTC (rev 3704) +++ branches/Cog/scripts/uploadvms 2016-05-07 01:29:48 UTC (rev 3705) @@ -197,6 +197,13 @@ should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images. Squeak V5, Newspeak and the upcoming Pharo release have moved to Spur. +N.B. Only the Newspeak installers on this site include a sources file. This + saves space. To ensure access to the sources file using the other VMs + - on linux add the sources file to the same directory as the vm, e.g. add + cogspurlinux/lib/squeak/4.5-3692/SqueakV50.sources + - on Mac OS add the sources into the Resources directory of the app bundle + - on Windows add the sources file to the same directory as the vm + Archives whose names include "64" are 64-bit Spur VMs. They should be used with 64-bit Spur images. Sample 64-bit images can be found at http://www.mirandabanda.org/files/Cog/SpurImages

1 0

[commit][3701] JMM work on full screen mode, Crash on Change, or Garbage on Change SQK-44
by commits＠squeakvm.org 07 May '16

07 May '16

Revision: 3701 Author: johnmci Date: 2016-05-05 17:18:27 -0700 (Thu, 05 May 2016) Log Message: ----------- JMM work on full screen mode, Crash on Change, or Garbage on Change SQK-44 Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-06 00:00:29 UTC (rev 3700) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-06 00:18:27 UTC (rev 3701) @@ -54,7 +54,7 @@ CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) #XEX:= ... %/sqMacV2Browser.m ... XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \ - %/SqViewBitmapConversion.m + %/SqViewBitmapConversion.m %/sqSqueakOSXCGView.m OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h 2016-05-06 00:00:29 UTC (rev 3700) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.h 2016-05-06 00:18:27 UTC (rev 3701) @@ -80,8 +80,6 @@ //Accessing -(NSString*)dragFileNameStringAtIndex:(sqInt) index; -(void) ioSetFullScreen: (sqInt) fullScreen; --(void)fadeOut; --(void)fadeIn; -(void) drawImageUsingClip: (CGRect) clip; -(NSUInteger)countNumberOfNoneSqueakImageFilesInDraggedFiles: (id<NSDraggingInfo>)info; -(NSMutableArray *)filterOutSqueakImageFilesFromDraggedFiles: (id<NSDraggingInfo>)info; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h 2016-05-06 00:00:29 UTC (rev 3700) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h 2016-05-06 00:18:27 UTC (rev 3701) @@ -56,11 +56,12 @@ BOOL syncNeeded; NSMutableArray* dragItems; CGDisplayFadeReservationToken fadeToken; - NSRect savedScreenBoundsAtTimeOfFullScreen; - CGColorSpaceRef colorspace; + CGColorSpaceRef colorspace; unsigned int* colorMap32; - BOOL clippyIsEmpty; + BOOL clippyIsEmpty; + BOOL fullScreenInProgress; CGRect clippy; + void* fullScreendispBitsIndex; } @property (nonatomic,assign) NSTrackingRectTag squeakTrackingRectForCursor; @property (nonatomic,strong) keyBoardStrokeDetails* lastSeenKeyBoardStrokeDetails; @@ -69,14 +70,13 @@ @property (nonatomic,assign) int dragCount; @property (nonatomic,strong) NSMutableArray* dragItems; @property (nonatomic,weak) sqSqueakOSXScreenAndWindow *windowLogic; -@property (nonatomic,assign) NSRect savedScreenBoundsAtTimeOfFullScreen; +@property (nonatomic,assign) BOOL fullScreenInProgress; +@property (nonatomic,assign) void* fullScreendispBitsIndex; - (void) initializeVariables; - (void) fakeKeyDownUp: (NSEvent*) theEvent; - (NSString*) dragFileNameStringAtIndex:(sqInt) index; - (void) ioSetFullScreen: (sqInt) fullScreen; -- (void)fadeOut; -- (void)fadeIn; - (void) drawImageUsingClip: (CGRect) clip; - (NSUInteger) countNumberOfNoneSqueakImageFilesInDraggedFiles: (id<NSDraggingInfo>)info; - (NSMutableArray *) filterOutSqueakImageFilesFromDraggedFiles: (id<NSDraggingInfo>)info; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-06 00:00:29 UTC (rev 3700) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-06 00:18:27 UTC (rev 3701) @@ -64,7 +64,7 @@ @implementation sqSqueakOSXOpenGLView @synthesize squeakTrackingRectForCursor,lastSeenKeyBoardStrokeDetails, -lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,savedScreenBoundsAtTimeOfFullScreen; +lastSeenKeyBoardModifierDetails,dragInProgress,dragCount,dragItems,windowLogic,fullScreenInProgress,fullScreendispBitsIndex; + (NSOpenGLPixelFormat *)defaultPixelFormat { NSOpenGLPixelFormatAttribute attrs[] = @@ -97,6 +97,7 @@ dragCount = 0; dragItems = NULL; clippyIsEmpty = YES; + fullScreenInProgress = NO; colorspace = CGColorSpaceCreateDeviceRGB(); [self initializeSqueakColorMap]; } @@ -165,7 +166,18 @@ firstDrawCompleted = YES; return; } - if (syncNeeded) { + + if (self.fullScreenInProgress) { + sqInt formObj = interpreterProxy->displayObject(); + sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); + void* dispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); + if (self.fullScreendispBitsIndex == dispBitsIndex) { + return; + } + self.fullScreenInProgress = NO; + } + + if (syncNeeded) { [self drawRect: NSRectFromCGRect(clippy)]; syncNeeded = NO; clippyIsEmpty = YES; @@ -224,6 +236,7 @@ - (void)loadTexturesFrom: (void*) lastBitsIndex subRectangle: (NSRect) subRect { // CGL_MACRO_DECLARE_VARIABLES(); static void *previousLastBitsIndex=null; + NSRect r=[self frame]; if (!(previousLastBitsIndex == lastBitsIndex)) { previousLastBitsIndex = lastBitsIndex; @@ -310,16 +323,17 @@ // NSLog(@" draw %f %f %f %f",rect.origin.x,rect.origin.y,rect.size.width,rect.size.height); NSOpenGLContext *oldContext = [NSOpenGLContext currentContext]; sqInt formObj = interpreterProxy->displayObject(); - sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); - void* dispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); + sqInt formPtrOop = interpreterProxy->fetchPointerofObject(0, formObj); + self.fullScreendispBitsIndex = interpreterProxy->firstIndexableField(formPtrOop); + static int inited=NO; - if ( dispBitsIndex ) { + if ( fullScreendispBitsIndex ) { [[self openGLContext] makeCurrentContext]; if (!inited) { [self setupOpenGL]; inited=YES; } - [self loadTexturesFrom:dispBitsIndex subRectangle: rect]; + [self loadTexturesFrom:fullScreendispBitsIndex subRectangle: rect]; [self defineQuad:rect]; } @@ -721,22 +735,20 @@ return; if ([self isInFullScreenMode] == NO && (fullScreen == 1)) { - self.savedScreenBoundsAtTimeOfFullScreen = (NSRect) [self bounds]; + self.fullScreenInProgress = YES; NSDictionary* options = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar ], NSFullScreenModeApplicationPresentationOptions, nil]; [self enterFullScreenMode:[NSScreen mainScreen] withOptions:options]; - extern struct VirtualMachine* interpreterProxy; - interpreterProxy->fullDisplayUpdate(); } if ([self isInFullScreenMode] == YES && (fullScreen == 0)) { + self.fullScreenInProgress = YES; [self exitFullScreenModeWithOptions: NULL]; if ([self.window isKeyWindow] == NO) { [self.window makeKeyAndOrderFront: self]; - // NOT SURE IF THIS IS NEEDED, MORE TESTING [self.window setContentSize: self.savedScreenBoundsAtTimeOfFullScreen.size]; } } }

3 2

[commit][3703] Suppress a warning relative to const-ness
by commits＠squeakvm.org 06 May '16

06 May '16

Revision: 3703 Author: nice Date: 2016-05-06 13:22:49 -0700 (Fri, 06 May 2016) Log Message: ----------- Suppress a warning relative to const-ness Modified Paths: -------------- branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c 2016-05-06 19:06:49 UTC (rev 3702) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixExternalPrims.c 2016-05-06 20:22:49 UTC (rev 3703) @@ -131,7 +131,7 @@ handle= dlopen(libName, RTLD_NOW | RTLD_GLOBAL); if (handle == 0) { - char* why; + const char* why; if (dlerror == NULL) why = dlerrorSqueak(); else @@ -225,7 +225,7 @@ else handle= dlopen(0, RTLD_NOW | RTLD_GLOBAL); if (handle == 0) { - char *why; + const char *why; if (dlerror == NULL) why = dlerrorSqueak(); else @@ -421,7 +421,7 @@ && strcmp(lookupName, "shutdownModule") && strcmp(lookupName, "setInterpreter") && strcmp(lookupName, "getModuleName")) { - char *why; + const char *why; if (dlerror == NULL) why = dlerrorSqueak(); else @@ -468,7 +468,7 @@ if (results) { - char* why; + const char* why; if (dlerror == NULL) why = dlerrorSqueak(); else

1 0

[commit][3702] Rescue the Mac OS X build pre clang 7.3
by commits＠squeakvm.org 06 May '16

06 May '16

Revision: 3702 Author: eliot Date: 2016-05-06 12:06:49 -0700 (Fri, 06 May 2016) Log Message: ----------- Rescue the Mac OS X build pre clang 7.3 Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos32x86/common/Makefile.rules Added Paths: ----------- branches/Cog/build.macos32x86/common/Makefile.clangversion Added: branches/Cog/build.macos32x86/common/Makefile.clangversion =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.clangversion (rev 0) +++ branches/Cog/build.macos32x86/common/Makefile.clangversion 2016-05-06 19:06:49 UTC (rev 3702) @@ -0,0 +1,26 @@ +############################################################################# +# Determine clang version and set CLANG_7_3_OR_ABOVE & CLANG_7_2_OR_BELOW as so +# + +XCODETOOLCHAINS := /Applications/Xcode.app/Contents/Developer/Toolchains +XCODETOOLCHAIN := $(XCODETOOLCHAINS)/XcodeDefault.xctoolchain + +# /usr/bin/clang, a.k.a. $(XCODETOOLCHAIN)/usr/bin/clang +CC := clang +# convoluted, but clang -version writes to /dev/tty, /not/ stdout :-( +CLVERSION:= $(shell ls $(XCODETOOLCHAIN)/usr/lib/clang) +CLVERMAJ := $(shell echo $(CLVERSION) | cut -f1 -d.) +CLVERMIN := $(shell echo $(CLVERSION) | cut -f2 -d.) + +# One glaring deficiency of GNU Make is the absence of arithmetic support +ifneq ($(filter 0 1 2 3 4 5 6,$(CLVERMAJ)),) + CLANG_7_2_OR_BELOW:=true +else ifeq ($(CLVERMAJ), 7) + ifneq ($(filter 0 1 2,$(CLVERMIN)),) + CLANG_7_2_OR_BELOW:=true + else + CLANG_7_3_OR_ABOVE:=true + endif +else + CLANG_7_3_OR_ABOVE:=true +endif Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-06 00:18:27 UTC (rev 3701) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-06 19:06:49 UTC (rev 3702) @@ -13,10 +13,11 @@ # N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel. # ARC is supported only on 64-bits, and then only for the 10.7 SDK and later. -ifeq ($(CCVERSION),6.0) +include ../common/Makefile.clangversion +ifdef CLANG_7_3_OR_ABOVE + OBJC_CODE_MODEL := -fobjc-weak +else OBJC_CODE_MODEL := -fno-objc-arc -else - OBJC_CODE_MODEL := -fobjc-weak endif CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ Modified: branches/Cog/build.macos32x86/common/Makefile.rules =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.rules 2016-05-06 00:18:27 UTC (rev 3701) +++ branches/Cog/build.macos32x86/common/Makefile.rules 2016-05-06 19:06:49 UTC (rev 3702) @@ -4,13 +4,7 @@ # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation # for an explanation of the dependency management scheme. -XCODETOOLCHAINS := /Applications/Xcode.app/Contents/Developer/Toolchains -XCODETOOLCHAIN := $(XCODETOOLCHAINS)/XcodeDefault.xctoolchain - -# /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang CC := clang -# convoluted, but clang -version writes to /dev/tty, /not/ stdout :-( -CCVERSION = $(shell ls $(XCODETOOLCHAIN)/usr/lib/clang) LD := clang LDCXX := clang++ # For linking c++ bundles

1 0

[commit][3700] Add determining of the Clang version to the Mac OS X makefiles and use it to
by commits＠squeakvm.org 06 May '16

06 May '16

Revision: 3700 Author: eliot Date: 2016-05-05 17:00:29 -0700 (Thu, 05 May 2016) Log Message: ----------- Add determining of the Clang version to the Mac OS X makefiles and use it to use the right name for the code model depending on clang version 6.0 or 7.0.0. Annoyingly clang writes its version info to /dev/tty instead of stdout so ver determined by ls of directory in Xcode. Sigh. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos32x86/common/Makefile.rules branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/common/Makefile.rules Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 22:28:56 UTC (rev 3699) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-06 00:00:29 UTC (rev 3700) @@ -13,13 +13,18 @@ # N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel. # ARC is supported only on 64-bits, and then only for the 10.7 SDK and later. +ifeq ($(CCVERSION),6.0) + OBJC_CODE_MODEL := -fno-objc-arc +else + OBJC_CODE_MODEL := -fobjc-weak +endif CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ -fvisibility=default -fwrapv \ -fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \ -fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \ - -fobjc-weak \ + $(OBJC_CODE_MODEL) \ -isysroot $(SDK) \ -include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch Modified: branches/Cog/build.macos32x86/common/Makefile.rules =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.rules 2016-05-05 22:28:56 UTC (rev 3699) +++ branches/Cog/build.macos32x86/common/Makefile.rules 2016-05-06 00:00:29 UTC (rev 3700) @@ -4,8 +4,13 @@ # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation # for an explanation of the dependency management scheme. +XCODETOOLCHAINS := /Applications/Xcode.app/Contents/Developer/Toolchains +XCODETOOLCHAIN := $(XCODETOOLCHAINS)/XcodeDefault.xctoolchain + # /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang CC := clang +# convoluted, but clang -version writes to /dev/tty, /not/ stdout :-( +CCVERSION = $(shell ls $(XCODETOOLCHAIN)/usr/lib/clang) LD := clang LDCXX := clang++ # For linking c++ bundles Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 22:28:56 UTC (rev 3699) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-06 00:00:29 UTC (rev 3700) @@ -13,13 +13,14 @@ # N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel. # ARC is supported only on 64-bits, and then only for the 10.7 SDK and later. +OBJC_CODE_MODEL := -fobjc-arc CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ -fvisibility=default -fwrapv \ -fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \ -fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \ - -fobjc-arc \ + $(OBJC_CODE_MODEL) \ -isysroot $(SDK) \ -include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch Modified: branches/Cog/build.macos64x64/common/Makefile.rules =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.rules 2016-05-05 22:28:56 UTC (rev 3699) +++ branches/Cog/build.macos64x64/common/Makefile.rules 2016-05-06 00:00:29 UTC (rev 3700) @@ -4,8 +4,13 @@ # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation # for an explanation of the dependency management scheme. +XCODETOOLCHAINS := /Applications/Xcode.app/Contents/Developer/Toolchains +XCODETOOLCHAIN := $(XCODETOOLCHAINS)/XcodeDefault.xctoolchain + # /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang CC := clang +# convoluted, but clang -version writes to /dev/tty, /not/ stdout :-( +CCVERSION = $(shell ls $(XCODETOOLCHAIN)/usr/lib/clang) LD := clang LDCXX := clang++ # For linking c++ bundles

2 1

[commit][3699] Get the image building scripts to use the updated trunk image from squeak. org,
by commits＠squeakvm.org 06 May '16

06 May '16

Revision: 3699 Author: eliot Date: 2016-05-05 15:28:56 -0700 (Thu, 05 May 2016) Log Message: ----------- Get the image building scripts to use the updated trunk image from squeak.org, update the VMs used to 3692, and comment the ARC vs weak difference for the 64-bit vs 32-bit Mac OS X Cocoa VMs. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurNsvm.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/updatespurimage.sh Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 19:29:09 UTC (rev 3698) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 22:28:56 UTC (rev 3699) @@ -11,6 +11,8 @@ TARGET_ARCH:=i386 TARGET_VERSION_MIN:=10.7 +# N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel. +# ARC is supported only on 64-bits, and then only for the 10.7 SDK and later. CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 19:29:09 UTC (rev 3698) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 22:28:56 UTC (rev 3699) @@ -11,6 +11,8 @@ TARGET_ARCH:=x86_64 TARGET_VERSION_MIN:=10.7 +# N.B. ARC isn't supported by the os-x 32-bit legacy Objective-C runtime kernel. +# ARC is supported only on 64-bits, and then only for the 10.7 SDK and later. CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2016-05-05 19:29:09 UTC (rev 3698) +++ branches/Cog/image/getGoodCogVM.sh 2016-05-05 22:28:56 UTC (rev 3699) @@ -1,32 +1,32 @@ #!/bin/sh -# Sets the VM env var to the r3643 Cog VM for the current platform. +# Sets the VM env var to the r3692 Cog VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=16.10.3643 -REV=3643 -LCBINDIR=4.0-3643 +TAG=16.18.3692 +REV=3692 +LCBINDIR=4.0-3692 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak 6495fcad0dfc1302a7abeb40860b228e \ - Cog.app-$TAG.tgz c024c56458e4cb9c58002a25f93bd59a + Cog.app/Contents/MacOS/Squeak 738b30c9c50e489fe4068e4998e53d44 \ + Cog.app-$TAG.tgz 17f05311cf1e2f8042c8781e14a3e985 VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ coglinuxht/lib/squeak/$LCBINDIR/squeak \ - coglinuxht-$TAG.tgz b425f59475f1357fbe0c25b445f69717 + coglinuxht-$TAG.tgz 3f2022dfb4d804a265c77aa770e34606 else get_vm_from_tar \ coglinux/lib/squeak/$LCBINDIR/squeak \ - coglinux-$TAG.tgz df1101e6ed629198f0806b75d9c12532 + coglinux-$TAG.tgz 4ef3daa36509f8e6d0644ac954d9c70f fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe 21c42946fec449edba92f5ca863e390a \ - cogwin-$TAG.zip b38822661e97686813ac0512c825428b + cogwin/SqueakConsole.exe 41ca7c10b9f08d97739477439ebfaaf2 \ + cogwin-$TAG.zip 7667b6c84c53376699aa80a183dc33f7 VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurNsvm.sh =================================================================== --- branches/Cog/image/getGoodSpurNsvm.sh 2016-05-05 19:29:09 UTC (rev 3698) +++ branches/Cog/image/getGoodSpurNsvm.sh 2016-05-05 22:28:56 UTC (rev 3699) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3643 Newspeak Spur VM for the current platform. +# Sets the VM env var to the r3692 Newspeak Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=16.10.3643 -REV=3643 -LSBINDIR=5.0-3643 +TAG=16.18.3692 +REV=3692 +LSBINDIR=5.0-3692 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" a50b3f51714f1c012ce73a24a3c4fd1c \ - "Newspeak Spur Virtual Machine.app-$TAG.tgz" a8c926d31ca71fac7d7f202529b7aab8 + "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" 45319b241d7b0a2c00d2dd770a495abf \ + "Newspeak Spur Virtual Machine.app-$TAG.tgz" 7504c3a462103df69fc64fa82351c6ee VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";; Linux) get_vm_from_tar \ nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm \ - nsvmspurlinuxht-$TAG.tgz 7a8810d1f87d044ad3a85866a6509e64 + nsvmspurlinuxht-$TAG.tgz d47de73d6c8ef8a8338a6932ebf4c842 VM=nsvmspurlinuxht/nsvm;; CYGWIN*) get_vm_from_zip \ - nsvmspurwin/nsvmConsole.exe d9bb69463c8f9ec8b1436b294593f11e \ - nsvmspurwin-$TAG.zip ec9e07efe9eea8ff6cc4805fbde6de2a + nsvmspurwin/nsvmConsole.exe bb82d0fc34ee0ea3a63f0f49ccb93e9b \ + nsvmspurwin-$TAG.zip fb9665b61770bc54cf41b2e52c62b47f VM=nsvmspurwin/nsvmConsole.exe;; *) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2016-05-05 19:29:09 UTC (rev 3698) +++ branches/Cog/image/getGoodSpurVM.sh 2016-05-05 22:28:56 UTC (rev 3699) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3643 Cog Spur VM for the current platform. +# Sets the VM env var to the r3692 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=16.10.3643 -REV=3643 -LSBINDIR=5.0-3643 +TAG=16.18.3692 +REV=3692 +LSBINDIR=5.0-3692 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak 244323eea6792e2e69bd523c9911b2f8 \ - CogSpur.app-$TAG.tgz 7421e8188932dede31d5182238ee64c2 + CogSpur.app/Contents/MacOS/Squeak 97460b152803235de4b0c11333f0cf74 \ + CogSpur.app-$TAG.tgz 38c190e78fff34760292d6a9da3a61b8 VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 37bc3cec9db46498640b3d9eefeebdfd \ - cogspurlinuxht-$TAG.tgz 02e977113ee4a059637650ab69439bff + cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 64cda56486bf7351de7a40f0389edfba \ + cogspurlinuxht-$TAG.tgz 02948787583829d450d807afa910b178 VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe 2bcad50dcfe458e5737cd843546f47de \ - cogspurwin-$TAG.zip 42112ad448e806790ad112635a596337 + cogspurwin/SqueakConsole.exe 247e1e7a6acbb71f350f838ddc88b361 \ + cogspurwin-$TAG.zip 6a58964e6f69a6a379a5dcd73796207b VM=cogspurwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/updatespurimage.sh =================================================================== --- branches/Cog/image/updatespurimage.sh 2016-05-05 19:29:09 UTC (rev 3698) +++ branches/Cog/image/updatespurimage.sh 2016-05-05 22:28:56 UTC (rev 3699) @@ -1,11 +1,31 @@ #!/bin/sh # Update the latest Spur image. . ./envvars.sh + +if false; then + # old way; get Squeak 5.0 and update . ./getsqueak50.sh -if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then - cp -p "$SQUEAK50".changes trunk50.changes - cp -p "$SQUEAK50".image trunk50.image + if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then + cp -p "$SQUEAK50".changes trunk50.changes + cp -p "$SQUEAK50".image trunk50.image + fi +else + # New way; download the latest trunk from squeak.org/downloads + geturl http://build.squeak.org/job/Trunk/default/lastSuccessfulBuild/artifact/targ… + unzip -ou TrunkImage.zip + mv SpurTrunkImage.changes trunk50.changes + mv SpurTrunkImage.image trunk50.image + if test \! -f SqueakV50.sources ; then + if test -f ../sources/SqueakV50.sources; then + ln ../sources/SqueakV50.sources . + else + if test \! -f SqueakV50.sources.zip; then + geturl http://ftp.squeak.org/5.0/SqueakV50.sources.zip + fi + unzip SqueakV50.sources.zip + fi + fi fi . ./getGoodSpurVM.sh

1 0

[commit][3698] JMM cleanup to squeak thrunk branch
by commits＠squeakvm.org 05 May '16

05 May '16

Revision: 3698 Author: johnmci Date: 2016-05-05 12:29:09 -0700 (Thu, 05 May 2016) Log Message: ----------- JMM cleanup to squeak thrunk branch Modified Paths: -------------- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m 2016-05-05 17:57:28 UTC (rev 3697) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m 2016-05-05 19:29:09 UTC (rev 3698) @@ -120,9 +120,7 @@ // At this point we did not find a file name in the resources or in the vm directory or via a set image name if (!fileIsReadable) { - // dispatch_sync(dispatch_get_main_queue(), ^{ [self attempToOpenImageFromOpenPanel]; - // }); } return;

1 0

[commit][3696] JMM add missing super call SQK-11
by commits＠squeakvm.org 05 May '16

05 May '16

Revision: 3696 Author: johnmci Date: 2016-05-05 10:18:10 -0700 (Thu, 05 May 2016) Log Message: ----------- JMM add missing super call SQK-11 Modified Paths: -------------- branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIController.m Modified: branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIController.m =================================================================== --- branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIController.m 2016-05-05 16:24:39 UTC (rev 3695) +++ branches/Cog/platforms/iOS/vm/iPhone/Classes/SqueakUIController.m 2016-05-05 17:18:10 UTC (rev 3696) @@ -48,6 +48,7 @@ @implementation SqueakUIController - (void)viewDidLoad { + [super viewDidLoad] // jdr - extra bluetooth keyboard support for (SInt32 k=97; k<=123; k++) { char ch[] = {k, 0};

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 May 2016