From alan.schmitt at polytechnique.org Sat Jan 21 12:44:48 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 21 Jan 2012 18:44:48 +0100 Subject: [Unison-hackers] [Patch] Compilation under Lion Message-ID: <44C288EB-88E6-4BE2-87CA-CDB1CFDB1176@polytechnique.org> Unison crashes when compiled under Lion, because of problems with the toolbar. I applied the fix suggested in http://blitzbasic.com/Community/posts.php?topic=95778 to make it work. I can commit this if you want. Alan Index: uimacnew09/UnisonToolbar.m =================================================================== --- uimacnew09/UnisonToolbar.m (revision 480) +++ uimacnew09/UnisonToolbar.m (working copy) @@ -153,12 +153,13 @@ else if ([whichView isEqual: @"updatesView"]) { return [NSArray arrayWithObjects: QuitItemIdentifier, RestartItemIdentifier, - NSToolbarSeparatorItemIdentifier, + NSToolbarSpaceItemIdentifier, GoItemIdentifier, RescanItemIdentifier, - NSToolbarSeparatorItemIdentifier, + NSToolbarSpaceItemIdentifier, RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, - SkipItemIdentifier, NSToolbarSeparatorItemIdentifier, + SkipItemIdentifier, + NSToolbarSpaceItemIdentifier, DiffItemIdentifier, TableModeIdentifier, nil]; } @@ -177,14 +178,14 @@ GoItemIdentifier, RestartItemIdentifier, RescanItemIdentifier, RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, SkipItemIdentifier, DiffItemIdentifier, - NSToolbarSeparatorItemIdentifier, nil]; + NSToolbarSpaceItemIdentifier, nil]; } - (void) setView: (NSString *) whichView { if ([whichView isEqual:currentView]) return; currentView = whichView; - + int i; NSArray *identifiers; NSString *oldIdentifier; From bcpierce at cis.upenn.edu Sat Jan 21 12:47:40 2012 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sat, 21 Jan 2012 12:47:40 -0500 Subject: [Unison-hackers] [Patch] Compilation under Lion In-Reply-To: <44C288EB-88E6-4BE2-87CA-CDB1CFDB1176@polytechnique.org> References: <44C288EB-88E6-4BE2-87CA-CDB1CFDB1176@polytechnique.org> Message-ID: <5A68D70F-B8A0-42BD-ABFA-91CFDC093895@cis.upenn.edu> Please do! On Jan 21, 2012, at 12:44 PM, Alan Schmitt wrote: > Unison crashes when compiled under Lion, because of problems with the toolbar. I applied the fix suggested in http://blitzbasic.com/Community/posts.php?topic=95778 to make it work. > > I can commit this if you want. > > Alan > > Index: uimacnew09/UnisonToolbar.m > =================================================================== > --- uimacnew09/UnisonToolbar.m (revision 480) > +++ uimacnew09/UnisonToolbar.m (working copy) > @@ -153,12 +153,13 @@ > else if ([whichView isEqual: @"updatesView"]) { > return [NSArray arrayWithObjects: QuitItemIdentifier, > RestartItemIdentifier, > - NSToolbarSeparatorItemIdentifier, > + NSToolbarSpaceItemIdentifier, > GoItemIdentifier, > RescanItemIdentifier, > - NSToolbarSeparatorItemIdentifier, > + NSToolbarSpaceItemIdentifier, > RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, > - SkipItemIdentifier, NSToolbarSeparatorItemIdentifier, > + SkipItemIdentifier, > + NSToolbarSpaceItemIdentifier, > DiffItemIdentifier, > TableModeIdentifier, nil]; > } > @@ -177,14 +178,14 @@ > GoItemIdentifier, RestartItemIdentifier, RescanItemIdentifier, > RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, > SkipItemIdentifier, DiffItemIdentifier, > - NSToolbarSeparatorItemIdentifier, nil]; > + NSToolbarSpaceItemIdentifier, nil]; > } > > - (void) setView: (NSString *) whichView { > if ([whichView isEqual:currentView]) return; > > currentView = whichView; > - > + > int i; > NSArray *identifiers; > NSString *oldIdentifier; > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From alan.schmitt at polytechnique.org Sat Jan 21 12:55:09 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 21 Jan 2012 18:55:09 +0100 Subject: [Unison-hackers] [Patch] OS X Gui: Warn if no archive is found Message-ID: <8434F5C1-E98C-4BBE-850A-89E5A126BDA5@polytechnique.org> Following the feature request on unison-users, here is a patch that will show a modal warning window if there is no archive for the hosts. The user can then choose to exit or proceed (proceed is the default). The window is not shown if "batch" is true. Alan Index: uimacbridgenew.ml =================================================================== --- uimacbridgenew.ml (revision 480) +++ uimacbridgenew.ml (working copy) @@ -82,7 +82,22 @@ let fatalError message = Trace.log (message ^ "\n"); displayFatalError message + +(* Defined in MyController.m; display the warning and ask whether to + exit or proceed *) +external displayWarnPanel : string -> bool = "warnPanel";; +let setWarnPrinter() = + Util.warnPrinter := + Some(fun s -> + Trace.log ("Warning: " ^ s ^ "\n"); + if not (Prefs.read Globals.batch) then begin + if (displayWarnPanel s) then begin + Lwt_unix.run (Update.unlockArchives ()); + exit Uicommon.fatalExit + end + end) + let doInOtherThread f = Thread.create (fun () -> @@ -316,6 +331,9 @@ Printf.eprintf "\n" ); + (* Install the warning panel, hopefully it's not too late *) + setWarnPrinter(); + Lwt_unix.run (Uicommon.validateAndFixupPrefs () >>= Globals.propagatePrefs); Index: uimacnew09/MyController.h =================================================================== --- uimacnew09/MyController.h (revision 480) +++ uimacnew09/MyController.h (working copy) @@ -81,6 +81,8 @@ NSTimer *_timer; NSAlert *_timeoutAlert; NSUInteger _secondsRemaining; + + BOOL shouldExitAfterWarning; } - (id)init; Index: uimacnew09/MyController.m =================================================================== --- uimacnew09/MyController.m (revision 480) +++ uimacnew09/MyController.m (working copy) @@ -307,7 +307,7 @@ - (void)updateToolbar { - [toolbar validateVisibleItems]; + [toolbar validateVisibleItems]; [tableModeSelector setEnabled:((syncable && !duringSync) || afterSync)]; // Why? @@ -1175,6 +1175,31 @@ exit(1); } +/* Returns true if we need to exit, false if we proceed */ + +CAMLprim value warnPanel(value s) +{ + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)]; + + [me performSelectorOnMainThread:@selector(warnPanel:) withObject:str waitUntilDone:TRUE]; + [str release]; + if (me -> shouldExitAfterWarning) { + return Val_true; + } else { + return Val_false; + } +} + +- (void)warnPanel:(NSString *)msg { + int warnVal = NSRunAlertPanel(@"Warning", msg, @"Proceed", @"Exit", nil); + NSLog(@"Warning Panel Returned %d",warnVal); + if (warnVal == NSAlertAlternateReturn) { + shouldExitAfterWarning = YES; + } else { + shouldExitAfterWarning = FALSE; + } +} + @end @implementation NSString (_UnisonUtil) From bcpierce at cis.upenn.edu Sat Jan 21 13:05:18 2012 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sat, 21 Jan 2012 13:05:18 -0500 Subject: [Unison-hackers] [Patch] OS X Gui: Warn if no archive is found In-Reply-To: <8434F5C1-E98C-4BBE-850A-89E5A126BDA5@polytechnique.org> References: <8434F5C1-E98C-4BBE-850A-89E5A126BDA5@polytechnique.org> Message-ID: Nice! On Jan 21, 2012, at 12:55 PM, Alan Schmitt wrote: > Following the feature request on unison-users, here is a patch that will show a modal warning window if there is no archive for the hosts. The user can then choose to exit or proceed (proceed is the default). The window is not shown if "batch" is true. > > Alan > > Index: uimacbridgenew.ml > =================================================================== > --- uimacbridgenew.ml (revision 480) > +++ uimacbridgenew.ml (working copy) > @@ -82,7 +82,22 @@ > let fatalError message = > Trace.log (message ^ "\n"); > displayFatalError message > + > +(* Defined in MyController.m; display the warning and ask whether to > + exit or proceed *) > +external displayWarnPanel : string -> bool = "warnPanel";; > > +let setWarnPrinter() = > + Util.warnPrinter := > + Some(fun s -> > + Trace.log ("Warning: " ^ s ^ "\n"); > + if not (Prefs.read Globals.batch) then begin > + if (displayWarnPanel s) then begin > + Lwt_unix.run (Update.unlockArchives ()); > + exit Uicommon.fatalExit > + end > + end) > + > let doInOtherThread f = > Thread.create > (fun () -> > @@ -316,6 +331,9 @@ > Printf.eprintf "\n" > ); > > + (* Install the warning panel, hopefully it's not too late *) > + setWarnPrinter(); > + > Lwt_unix.run > (Uicommon.validateAndFixupPrefs () >>= > Globals.propagatePrefs); > Index: uimacnew09/MyController.h > =================================================================== > --- uimacnew09/MyController.h (revision 480) > +++ uimacnew09/MyController.h (working copy) > @@ -81,6 +81,8 @@ > NSTimer *_timer; > NSAlert *_timeoutAlert; > NSUInteger _secondsRemaining; > + > + BOOL shouldExitAfterWarning; > } > > - (id)init; > Index: uimacnew09/MyController.m > =================================================================== > --- uimacnew09/MyController.m (revision 480) > +++ uimacnew09/MyController.m (working copy) > @@ -307,7 +307,7 @@ > > - (void)updateToolbar > { > - [toolbar validateVisibleItems]; > + [toolbar validateVisibleItems]; > [tableModeSelector setEnabled:((syncable && !duringSync) || afterSync)]; > > // Why? > @@ -1175,6 +1175,31 @@ > exit(1); > } > > +/* Returns true if we need to exit, false if we proceed */ > + > +CAMLprim value warnPanel(value s) > +{ > + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)]; > + > + [me performSelectorOnMainThread:@selector(warnPanel:) withObject:str waitUntilDone:TRUE]; > + [str release]; > + if (me -> shouldExitAfterWarning) { > + return Val_true; > + } else { > + return Val_false; > + } > +} > + > +- (void)warnPanel:(NSString *)msg { > + int warnVal = NSRunAlertPanel(@"Warning", msg, @"Proceed", @"Exit", nil); > + NSLog(@"Warning Panel Returned %d",warnVal); > + if (warnVal == NSAlertAlternateReturn) { > + shouldExitAfterWarning = YES; > + } else { > + shouldExitAfterWarning = FALSE; > + } > +} > + > @end > > @implementation NSString (_UnisonUtil) > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From alan.schmitt at polytechnique.org Sat Jan 21 13:05:21 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 21 Jan 2012 19:05:21 +0100 Subject: [Unison-hackers] [Patch] Compilation under Lion In-Reply-To: <5A68D70F-B8A0-42BD-ABFA-91CFDC093895@cis.upenn.edu> References: <44C288EB-88E6-4BE2-87CA-CDB1CFDB1176@polytechnique.org> <5A68D70F-B8A0-42BD-ABFA-91CFDC093895@cis.upenn.edu> Message-ID: <6F41DFB1-5F5D-47EF-B739-0805F9BE1476@polytechnique.org> On 21 Jan 2012, at 18:47, Benjamin C. Pierce wrote: > Please do! Is there a way to restrict "make checkin" to a subset of files? I have other changes (in a second message I sent to this list, which I haven't seen yet) and we may not want to have both in a single commit. (But then this toolbar stuff is fairly simple, so it may not matter.) Alan From bcpierce at cis.upenn.edu Sat Jan 21 13:06:22 2012 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sat, 21 Jan 2012 13:06:22 -0500 Subject: [Unison-hackers] [Patch] Compilation under Lion In-Reply-To: <6F41DFB1-5F5D-47EF-B739-0805F9BE1476@polytechnique.org> References: <44C288EB-88E6-4BE2-87CA-CDB1CFDB1176@polytechnique.org> <5A68D70F-B8A0-42BD-ABFA-91CFDC093895@cis.upenn.edu> <6F41DFB1-5F5D-47EF-B739-0805F9BE1476@polytechnique.org> Message-ID: <9C505C97-6803-4D7B-8B04-760B4CB0E15A@cis.upenn.edu> Not an easy way. But both changes in one commit seems fine. - B On Jan 21, 2012, at 1:05 PM, Alan Schmitt wrote: > On 21 Jan 2012, at 18:47, Benjamin C. Pierce wrote: > >> Please do! > > Is there a way to restrict "make checkin" to a subset of files? I have other changes (in a second message I sent to this list, which I haven't seen yet) and we may not want to have both in a single commit. (But then this toolbar stuff is fairly simple, so it may not matter.) > > Alan > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From alan.schmitt at polytechnique.org Sat Jan 21 13:10:18 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 21 Jan 2012 19:10:18 +0100 Subject: [Unison-hackers] Something funny with the list ... Message-ID: <834D3EB1-4E17-46E8-9E19-3E0E4462FB69@polytechnique.org> I just noticed something strange with the list (but it may be with my mailer or my mail servers as well): a message I send is delivered only when another message is sent (as if there was a 1 message buffer between). According to the headers the delays occur at Penn. I'll wait 5 minutes and if I don't see this message, I'll send a new one to "flush" it, and we all can look at the headers. Alan From alan.schmitt at polytechnique.org Sat Jan 21 13:12:12 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 21 Jan 2012 19:12:12 +0100 Subject: [Unison-hackers] Something funny with the list ... In-Reply-To: <834D3EB1-4E17-46E8-9E19-3E0E4462FB69@polytechnique.org> References: <834D3EB1-4E17-46E8-9E19-3E0E4462FB69@polytechnique.org> Message-ID: <0BCC50BD-36CA-4CB9-B0C4-C9C1C0C8C6F2@polytechnique.org> On 21 Jan 2012, at 19:10, Alan Schmitt wrote: > I just noticed something strange with the list (but it may be with my > mailer or my mail servers as well): a message I send is delivered only > when another message is sent (as if there was a 1 message buffer > between). According to the headers the delays occur at Penn. > > I'll wait 5 minutes and if I don't see this message, I'll send a new > one to "flush" it, and we all can look at the headers. Never mind this, it seems to be a 10 minutes delay and not a buffer. Probably some grey-listing server acting up somewhere. Sorry for the noise. Alan From schmitta at seas.upenn.edu Sat Jan 21 14:13:42 2012 From: schmitta at seas.upenn.edu (schmitta at seas.upenn.edu) Date: Sat, 21 Jan 2012 14:13:42 -0500 Subject: [Unison-hackers] [unison-svn] r481 - in trunk/src: . uimacnew09 uimacnew09/uimacnew.xcodeproj Message-ID: <201201211913.q0LJDg81007994@yaws.seas.upenn.edu> Author: schmitta Date: 2012-01-21 14:13:41 -0500 (Sat, 21 Jan 2012) New Revision: 481 Modified: trunk/src/RECENTNEWS trunk/src/mkProjectInfo.ml trunk/src/uimacbridgenew.ml trunk/src/uimacnew09/MyController.h trunk/src/uimacnew09/MyController.m trunk/src/uimacnew09/UnisonToolbar.m trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj Log: - OS X GUI: fix crash under Lion, because of problems with the toolbar, using the fix suggested in http://blitzbasic.com/Community/posts.php?topic=95778. - OS X GUI: show a modal warning window if there is no archive for the hosts. The user can then choose to exit or proceed (proceed is the default). The window is not shown if "batch" is true. Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/RECENTNEWS 2012-01-21 19:13:41 UTC (rev 481) @@ -1,3 +1,13 @@ +CHANGES FROM VERSION 2.44.9 + +- OS X GUI: fix crash under Lion, because of problems with the toolbar, using + the fix suggested in http://blitzbasic.com/Community/posts.php?topic=95778. + +- OS X GUI: show a modal warning window if there is no archive for the hosts. + The user can then choose to exit or proceed (proceed is the default). The + window is not shown if "batch" is true. + +------------------------------- CHANGES FROM VERSION 2.44.8 * Change uimacnew09 icon to classic "U with arrows" Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/mkProjectInfo.ml 2012-01-21 19:13:41 UTC (rev 481) @@ -61,3 +61,4 @@ + Modified: trunk/src/uimacbridgenew.ml =================================================================== --- trunk/src/uimacbridgenew.ml 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/uimacbridgenew.ml 2012-01-21 19:13:41 UTC (rev 481) @@ -82,7 +82,22 @@ let fatalError message = Trace.log (message ^ "\n"); displayFatalError message + +(* Defined in MyController.m; display the warning and ask whether to + exit or proceed *) +external displayWarnPanel : string -> bool = "warnPanel";; +let setWarnPrinter() = + Util.warnPrinter := + Some(fun s -> + Trace.log ("Warning: " ^ s ^ "\n"); + if not (Prefs.read Globals.batch) then begin + if (displayWarnPanel s) then begin + Lwt_unix.run (Update.unlockArchives ()); + exit Uicommon.fatalExit + end + end) + let doInOtherThread f = Thread.create (fun () -> @@ -316,6 +331,9 @@ Printf.eprintf "\n" ); + (* Install the warning panel, hopefully it's not too late *) + setWarnPrinter(); + Lwt_unix.run (Uicommon.validateAndFixupPrefs () >>= Globals.propagatePrefs); Modified: trunk/src/uimacnew09/MyController.h =================================================================== --- trunk/src/uimacnew09/MyController.h 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/uimacnew09/MyController.h 2012-01-21 19:13:41 UTC (rev 481) @@ -81,6 +81,8 @@ NSTimer *_timer; NSAlert *_timeoutAlert; NSUInteger _secondsRemaining; + + BOOL shouldExitAfterWarning; } - (id)init; Modified: trunk/src/uimacnew09/MyController.m =================================================================== --- trunk/src/uimacnew09/MyController.m 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/uimacnew09/MyController.m 2012-01-21 19:13:41 UTC (rev 481) @@ -307,7 +307,7 @@ - (void)updateToolbar { - [toolbar validateVisibleItems]; + [toolbar validateVisibleItems]; [tableModeSelector setEnabled:((syncable && !duringSync) || afterSync)]; // Why? @@ -1175,6 +1175,31 @@ exit(1); } +/* Returns true if we need to exit, false if we proceed */ + +CAMLprim value warnPanel(value s) +{ + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)]; + + [me performSelectorOnMainThread:@selector(warnPanel:) withObject:str waitUntilDone:TRUE]; + [str release]; + if (me -> shouldExitAfterWarning) { + return Val_true; + } else { + return Val_false; + } +} + +- (void)warnPanel:(NSString *)msg { + int warnVal = NSRunAlertPanel(@"Warning", msg, @"Proceed", @"Exit", nil); + NSLog(@"Warning Panel Returned %d",warnVal); + if (warnVal == NSAlertAlternateReturn) { + shouldExitAfterWarning = YES; + } else { + shouldExitAfterWarning = FALSE; + } +} + @end @implementation NSString (_UnisonUtil) Modified: trunk/src/uimacnew09/UnisonToolbar.m =================================================================== --- trunk/src/uimacnew09/UnisonToolbar.m 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/uimacnew09/UnisonToolbar.m 2012-01-21 19:13:41 UTC (rev 481) @@ -153,12 +153,13 @@ else if ([whichView isEqual: @"updatesView"]) { return [NSArray arrayWithObjects: QuitItemIdentifier, RestartItemIdentifier, - NSToolbarSeparatorItemIdentifier, + NSToolbarSpaceItemIdentifier, GoItemIdentifier, RescanItemIdentifier, - NSToolbarSeparatorItemIdentifier, + NSToolbarSpaceItemIdentifier, RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, - SkipItemIdentifier, NSToolbarSeparatorItemIdentifier, + SkipItemIdentifier, + NSToolbarSpaceItemIdentifier, DiffItemIdentifier, TableModeIdentifier, nil]; } @@ -177,14 +178,14 @@ GoItemIdentifier, RestartItemIdentifier, RescanItemIdentifier, RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, SkipItemIdentifier, DiffItemIdentifier, - NSToolbarSeparatorItemIdentifier, nil]; + NSToolbarSpaceItemIdentifier, nil]; } - (void) setView: (NSString *) whichView { if ([whichView isEqual:currentView]) return; currentView = whichView; - + int i; NSArray *identifiers; NSString *oldIdentifier; Modified: trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj =================================================================== --- trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj 2011-11-28 00:35:54 UTC (rev 480) +++ trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj 2012-01-21 19:13:41 UTC (rev 481) @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -398,8 +398,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + }; buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -567,7 +570,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = "Create ExternalSettings"; ZERO_LINK = NO; }; @@ -593,7 +595,6 @@ ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\""; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -611,7 +612,6 @@ "-lbigarray", "-lasmrun", ); - PREBINDING = NO; PRODUCT_NAME = Unison; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( @@ -636,7 +636,6 @@ "\"$(SRCROOT)/Frameworks\"", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\""; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; @@ -652,7 +651,6 @@ "-lbigarray", "-lasmrun", ); - PREBINDING = NO; PRODUCT_NAME = Unison; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( @@ -690,7 +688,6 @@ "-lbigarray", "-lasmrun", ); - PREBINDING = NO; PRODUCT_NAME = Unison; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( @@ -709,7 +706,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; LIBRARY_SEARCH_PATHS = ""; - SDKROOT = macosx10.5; + SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; }; name = Development; @@ -720,7 +717,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; LIBRARY_SEARCH_PATHS = ""; - SDKROOT = macosx10.5; + SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; }; name = Deployment; @@ -731,7 +728,7 @@ buildSettings = { FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; LIBRARY_SEARCH_PATHS = ""; - SDKROOT = macosx10.5; + SDKROOT = macosx; USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; }; name = Default; From crestani at informatik.uni-tuebingen.de Thu Jan 26 13:58:42 2012 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Thu, 26 Jan 2012 19:58:42 +0100 Subject: [Unison-hackers] Building on Lion Message-ID: Is there a way to build a native version of Unison on Mac OS X Lion with Xcode 4? I've seen some recent patches to uimacnew09 that address Lion compatibility but my build fails with Xcode 4.2.1: CompileXIB English.lproj/MainMenu.xib cd /Users/crestani/tmp/unison/src/uimacnew09 setenv XCODE_DEVELOPER_USR_PATH /Developer/usr/bin/.. /Developer/usr/bin/ibtool --errors --warnings --notices --output-format human-readable-text --compile /Users/crestani/tmp/unison/src/uimacnew09/build/Default/Unison.app/Contents/Resources/English.lproj/MainMenu.nib /Users/crestani/tmp/unison/src/uimacnew09/English.lproj/MainMenu.xib --sdk /Developer/SDKs/MacOSX10.7.sdk 2012-01-26 19:45:30.136 ibtoold[5036:107] Exception raised while decoding document objects - Could not instantiate class named BWSplitView /* com.apple.ibtool.errors */ /Users/crestani/tmp/unison/src/uimacnew09/English.lproj/MainMenu.xib: error: Unable to resolve plug-in dependency for "MainMenu.xib". Recovery Suggestion: Locate the com.brandonwalkin.BWToolkit Interface Builder plug-in to continue opening this document. Consider using the --plugin option or Interface Builder's plug-in preferences to resolve this dependency. Underlying Errors: Description: Could not load plug-in. Failure Reason: Could not determine the location of the plug-in with the identifier com.brandonwalkin.BWToolkit ** BUILD FAILED ** Xcode's 4 Interface Builder no longer supports plug-ins. How do you manage to build on Lion? -- Marcus From alan.schmitt at polytechnique.org Fri Jan 27 03:26:17 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Fri, 27 Jan 2012 09:26:17 +0100 Subject: [Unison-hackers] Building on Lion In-Reply-To: References: Message-ID: On 26 Jan 2012, at 19:58, Marcus Crestani wrote: > Xcode's 4 Interface Builder no longer supports plug-ins. How do you > manage to build on Lion? This is indeed a problem. I have a machine where I installed the plugin before upgrading to Xcode 4, and it works. But on a new machine when I have started with Xcode 4, I am not able to build Unison either. This means we need to get rid of this dependency. Alan From crestani at informatik.uni-tuebingen.de Fri Jan 27 11:05:01 2012 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Fri, 27 Jan 2012 17:05:01 +0100 Subject: [Unison-hackers] Building on Lion In-Reply-To: (Alan Schmitt's message of "Fri, 27 Jan 2012 09:26:17 +0100") References: Message-ID: >>>>>"AS" == Alan Schmitt writes: AS> But on a new machine when I have started with Xcode 4, I am not able AS> to build Unison either. Alright, that's what I thought, thanks for the confirmation. AS> This means we need to get rid of this dependency. Until then, I'll see if I can get a machine running Snow Leopard to build Unison. -- Marcus From alan.schmitt at polytechnique.org Fri Jan 27 11:25:27 2012 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Fri, 27 Jan 2012 17:25:27 +0100 Subject: [Unison-hackers] Building on Lion In-Reply-To: References: Message-ID: <9F935BA3-449E-48DE-8DBF-9F3C194F35DA@polytechnique.org> On 27 Jan 2012, at 17:05, Marcus Crestani wrote: > Until then, I'll see if I can get a machine running Snow Leopard to > build Unison. I guess installing an older version of Xcode is not an option? Alan From steve at kalkwarf.com Fri Jan 27 11:29:44 2012 From: steve at kalkwarf.com (Steve Kalkwarf) Date: Fri, 27 Jan 2012 11:29:44 -0500 Subject: [Unison-hackers] Building on Lion In-Reply-To: <9F935BA3-449E-48DE-8DBF-9F3C194F35DA@polytechnique.org> References: <9F935BA3-449E-48DE-8DBF-9F3C194F35DA@polytechnique.org> Message-ID: >> Until then, I'll see if I can get a machine running Snow Leopard to >> build Unison. > > I guess installing an older version of Xcode is not an option? No, Lion requires Xcode 4. I use VMware and a Snow Leopard virtual machine to build stuff that won't build on Lion. It's a pain, but it works. Steve -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 4356 bytes Desc: not available URL: