[Unison-hackers] Fwd: [unison-svn] r276 - in branches/2.27/src: . uimacnew uimacnew/uimacnew.xcodeproj
Alan Schmitt
alan.schmitt at polytechnique.org
Mon May 19 09:49:14 EDT 2008
My commit message got rejected. Could someone please add me (schmitta at seas.upenn.edu
) to the list?
And here is the message, if you're curious as to what changed ;-)
Alan
Begin forwarded message:
> From: unison-hackers-owner at lists.seas.upenn.edu
> Date: 19 mai 2008 15:42:43 HAEC
> To: schmitta at seas.upenn.edu
> Subject: [unison-svn] r276 - in branches/2.27/src: . uimacnew
> uimacnew/uimacnew.xcodeproj
>
> You are not allowed to post to this mailing list, and your message has
> been automatically rejected. If you think that your messages are
> being rejected in error, contact the mailing list owner at
> unison-hackers-owner at lists.seas.upenn.edu.
>
>
> From: ALAN SCHMITT <schmitta at seas.upenn.edu>
> Date: 19 mai 2008 15:42:31 HAEC
> To: unison-hackers at lists.seas.upenn.edu
> Subject: [unison-svn] r276 - in branches/2.27/src: . uimacnew
> uimacnew/uimacnew.xcodeproj
>
>
> Author: schmitta
> Date: 2008-05-19 09:42:13 -0400 (Mon, 19 May 2008)
> New Revision: 276
>
> Added:
> branches/2.27/src/uimacnew/Info.plist
> branches/2.27/src/uimacnew/uimacnew.xcodeproj/
> branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj
> Removed:
> branches/2.27/src/uimacnew/uimac.pbproj/
> branches/2.27/src/uimacnew/uimac.xcodeproj/
> Modified:
> branches/2.27/src/Makefile
> branches/2.27/src/Makefile.OCaml
> branches/2.27/src/uimacbridgenew.ml
> branches/2.27/src/uimacnew/Bridge.m
> branches/2.27/src/uimacnew/MyController.m
> branches/2.27/src/uimacnew/ReconItem.m
> Log:
> src/Makefile: call clean in correct uimac directory
> src/uimacbridgenew.ml: correct a comment
> src/Makefile.Ocaml: don't use sed anymore to create the Info.plist,
> it's done by the XCode project (thus adding the Info.plist file
> needed)
> src/uimacnew/uimacnew.xcodeproj: the new XCode project, cleaned up
> src/uimacnew/*.m: patches by Gregory Entin
> unison-2.27.57-root-prop.diff:
>
> Fixes the crash with objectAtIndex: 0 out of bounds error, that seems
> to be recently reported to this list. I can reproduce it by modifying
> permissions of two otherwise identical *root* folders (e.g. I use g+w
> for one folder and g-w for another). The thing is "pathArray" is empty
> in that case (see the patch).
>
> unison-2.27.57-uimacnew-utf8.diff:
>
> Enforces UTF8 instead of "default" C-string encoding for some strings
> in Mac UI (seems to be crucial to deal with non-ASCII file names under
> Mac OS X).
>
> unison-2.27.57-symroot.diff:
>
> Fixes xcodebuild invocation in case when Xcode is configured with
> non-default location for build directories.
>
> Thanks to Steve Kalkwarf for the help with XCode
>
>
>
> Modified: branches/2.27/src/Makefile
> ===================================================================
> --- branches/2.27/src/Makefile 2008-04-29 14:08:53 UTC (rev 275)
> +++ branches/2.27/src/Makefile 2008-05-19 13:42:13 UTC (rev 276)
> @@ -352,8 +352,8 @@
>
> ifeq (${OSARCH},osx)
> clean::
> - -(cd uimac; xcodebuild clean)
> - -(cd uimac; $(RM) -r build *.plist)
> + -(cd $(UIMACDIR); xcodebuild clean)
> +# -(cd $(UIMACDIR); $(RM) -r build *.plist)
> endif
>
> checkin:
>
> Modified: branches/2.27/src/Makefile.OCaml
> ===================================================================
> --- branches/2.27/src/Makefile.OCaml 2008-04-29 14:08:53 UTC (rev 275)
> +++ branches/2.27/src/Makefile.OCaml 2008-05-19 13:42:13 UTC (rev 276)
> @@ -148,8 +148,8 @@
> # The two cases for cltool are needed because Xcode 2.1+
> # builds in build/Default/, and earlier versions use build/
> macexecutable: $(NAME)-blob.o
> - sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template
> > $(UIMACDIR)/Info.plist
> - (cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)")
> +# sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template
> > $(UIMACDIR)/Info.plist
> + (cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)"
> SYMROOT=build)
> if [ -e $(UIMACDIR)/build/Default ]; then \
> gcc $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/
> Contents/MacOS/cltool -framework Carbon; \
> else \
>
> Modified: branches/2.27/src/uimacbridgenew.ml
> ===================================================================
> --- branches/2.27/src/uimacbridgenew.ml 2008-04-29 14:08:53 UTC (rev
> 275)
> +++ branches/2.27/src/uimacbridgenew.ml 2008-05-19 13:42:13 UTC (rev
> 276)
> @@ -44,7 +44,7 @@
> totalBytesTransferred := Uutil.Filesize.zero;
> showGlobalProgress Uutil.Filesize.zero;;
>
> -(* Defined in MyController.m, used to redisplay the table
> +(* Defined in Bridge.m, used to redisplay the table
> when the status for a row changes *)
> external bridgeThreadWait : int -> unit = "bridgeThreadWait";;
>
>
> Modified: branches/2.27/src/uimacnew/Bridge.m
> ===================================================================
> --- branches/2.27/src/uimacnew/Bridge.m 2008-04-29 14:08:53 UTC (rev
> 275)
> +++ branches/2.27/src/uimacnew/Bridge.m 2008-05-19 13:42:13 UTC (rev
> 276)
> @@ -182,7 +182,7 @@
> args[argCount] = caml_copy_string(str);
> break;
> case 'S':
> - str = [va_arg(cs->args, NSString *) fileSystemRepresentation];
> + str = [va_arg(cs->args, NSString *) UTF8String];
> args[argCount] = caml_copy_string(str);
> break;
> case 'n':
> @@ -227,7 +227,7 @@
> *((char **)&cs->retV) = (e == Val_unit) ? NULL : String_val(e);
> break;
> case 'S':
> - *((NSString **)&cs->retV) = (e == Val_unit) ? NULL :
> [[NSString alloc] initWithCString:String_val(e)];
> + *((NSString **)&cs->retV) = (e == Val_unit) ? NULL :
> [[NSString alloc] initWithUTF8String:String_val(e)];
> cs->_autorelease = TRUE;
> break;
> case '@':
> @@ -283,7 +283,7 @@
> // NSLog(@"*** doCallback -- back with result");
> if (cs->exception) {
> @throw [NSException exceptionWithName:@"OCamlException"
> - reason:[NSString stringWithCString:cs->exception]
> + reason:[NSString stringWithUTF8String:cs->exception]
> userInfo:nil];
> }
> if (cs->_autorelease) [((id)cs->retV) autorelease];
>
> Added: branches/2.27/src/uimacnew/Info.plist
> ===================================================================
> --- branches/2.27/src/uimacnew/Info.plist
> (rev 0)
> +++ branches/2.27/src/uimacnew/Info.plist 2008-05-19 13:42:13 UTC
> (rev 276)
> @@ -0,0 +1,32 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd
> ">
> +<plist version="1.0">
> +<dict>
> + <key>CFBundleName</key>
> + <string>Unison</string>
> + <key>CFBundleDevelopmentRegion</key>
> + <string>English</string>
> + <key>CFBundleExecutable</key>
> + <string>Unison</string>
> + <key>CFBundleIconFile</key>
> + <string>Unison.icns</string>
> + <key>CFBundleIdentifier</key>
> + <string>edu.upenn.cis.Unison</string>
> + <key>CFBundleInfoDictionaryVersion</key>
> + <string>6.0</string>
> + <key>CFBundlePackageType</key>
> + <string>APPL</string>
> + <key>CFBundleSignature</key>
> + <string>????</string>
> + <key>CFBundleShortVersionString</key>
> + <string>$(MARKETING_VERSION)</string>
> + <key>CFBundleGetInfoString</key>
> + <string>${MARKETING_VERSION}, ©1999-2007, licensed under GNU GPL.</
> string>
> + <key>NSHumanReadableCopyright</key>
> + <string>©1999-2006, licensed under GNU GPL.</string>
> + <key>NSMainNibFile</key>
> + <string>MainMenu</string>
> + <key>NSPrincipalClass</key>
> + <string>NSApplication</string>
> +</dict>
> +</plist>
>
> Modified: branches/2.27/src/uimacnew/MyController.m
> ===================================================================
> --- branches/2.27/src/uimacnew/MyController.m 2008-04-29 14:08:53
> UTC (rev 275)
> +++ branches/2.27/src/uimacnew/MyController.m 2008-05-19 13:42:13
> UTC (rev 276)
> @@ -338,7 +338,7 @@
> }
> else {
> [self raisePasswordWindow:[NSString
> - stringWithCString:String_val(Field(prompt,0))]];
> + stringWithUTF8String:String_val(Field(prompt,
> 0))]];
> return;
> }
> }
> @@ -717,7 +717,7 @@
> // A function called from ocaml
> CAMLprim value displayStatus(value s)
> {
> - NSString *str = [[NSString alloc] initWithCString:String_val(s)];
> + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)];
> // NSLog(@"displayStatus: %@", str);
> [me performSelectorOnMainThread:@selector(statusTextSet:)
> withObject:str waitUntilDone:FALSE];
> [str release];
> @@ -745,8 +745,8 @@
> CAMLprim value displayDiff(value s, value s2)
> {
> [me performSelectorOnMainThread:@selector(diffViewTextSet:)
> - withObject:[NSArray arrayWithObjects:[NSString
> stringWithCString:String_val(s)],
> - [NSString stringWithCString:String_val(s2)], nil]
> + withObject:[NSArray arrayWithObjects:[NSString
> stringWithUTF8String:String_val(s)],
> + [NSString stringWithUTF8String:String_val(s2)], nil]
> waitUntilDone:FALSE];
> return Val_unit;
> }
> @@ -754,7 +754,7 @@
> // Called from ocaml to display diff error messages
> CAMLprim value displayDiffErr(value s)
> {
> - NSString * str = [NSString stringWithCString:String_val(s)];
> + NSString * str = [NSString stringWithUTF8String:String_val(s)];
> str = [[str componentsSeparatedByString:@"\n"]
> componentsJoinedByString:@" "];
> [me->statusText
> performSelectorOnMainThread:@selector(setStringValue:)
> @@ -920,7 +920,7 @@
> // [bundle pathForResource:@"cltool" ofType:nil];
>
> if (exec_path == nil) return;
> - char *args[] = { "-f", (char *)[exec_path
> fileSystemRepresentation],
> + char *args[] = { "-f", (char *)[exec_path UTF8String],
> "/usr/bin/unison", NULL };
>
> myFlags = kAuthorizationFlagDefaults;
>
> Modified: branches/2.27/src/uimacnew/ReconItem.m
> ===================================================================
> --- branches/2.27/src/uimacnew/ReconItem.m 2008-04-29 14:08:53 UTC
> (rev 275)
> +++ branches/2.27/src/uimacnew/ReconItem.m 2008-05-19 13:42:13 UTC
> (rev 276)
> @@ -638,10 +638,10 @@
>
> - (void)addChild:(ReconItem *)item pathArray:(NSArray *)pathArray
> level:(int)level
> {
> - NSString *element = [pathArray objectAtIndex:level];
> + NSString *element = [pathArray count] ? [pathArray
> objectAtIndex:level] : @"";
>
> // if we're at the leaf of the path, then add the item
> - if (level == [pathArray count]-1) {
> + if (((0 == [pathArray count]) && (0 == level)) || (level ==
> [pathArray count]-1)) {
> [item setParent:self];
> [item setPath:element];
> [_children addObject:item];
>
>
> Property changes on: branches/2.27/src/uimacnew/uimacnew.xcodeproj
> ___________________________________________________________________
> Name: svn:ignore
> + *.pbxuser
> *.mode1v3
>
>
> Added: branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj
> ===================================================================
> --- branches/2.27/src/uimacnew/uimacnew.xcodeproj/
> project.pbxproj (rev 0)
> +++ branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj
> 2008-05-19 13:42:13 UTC (rev 276)
> @@ -0,0 +1,663 @@
> +// !$*UTF8*$!
> +{
> + archiveVersion = 1;
> + classes = {
> + };
> + objectVersion = 42;
> + objects = {
> +
> +/* Begin PBXBuildFile section */
> + 2A3C3F3309922A8000E404E9 /* Growl.framework in CopyFiles */ =
> {isa = PBXBuildFile; fileRef = 2A3C3F3209922A8000E404E9 /*
> Growl.framework */; };
> + 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources
> */ = {isa = PBXBuildFile; fileRef = 2A3C3F7B09922D4900E404E9 /*
> NotificationController.m */; };
> + 2A3C3FAE0992323F00E404E9 /* Growl.framework in Frameworks */ =
> {isa = PBXBuildFile; fileRef = 2A3C3F3209922A8000E404E9 /*
> Growl.framework */; };
> + 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */ = {isa
> = PBXBuildFile; fileRef = 2E282CC70D9AE2B000439D01 /* unison-blob.o
> */; };
> + 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */ = {isa =
> PBXBuildFile; fileRef = 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m
> */; };
> + 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources
> */ = {isa = PBXBuildFile; fileRef = 44042D100BE52AED00A6BBB2 /*
> ProgressBarAdvanced.png */; };
> + 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 44042D110BE52AED00A6BBB2 /*
> ProgressBarBlue.png */; };
> + 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in
> Resources */ = {isa = PBXBuildFile; fileRef =
> 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */; };
> + 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources
> */ = {isa = PBXBuildFile; fileRef = 44042D130BE52AED00A6BBB2 /*
> ProgressBarEndBlue.png */; };
> + 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources
> */ = {isa = PBXBuildFile; fileRef = 44042D140BE52AED00A6BBB2 /*
> ProgressBarEndGray.png */; };
> + 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources
> */ = {isa = PBXBuildFile; fileRef = 44042D150BE52AED00A6BBB2 /*
> ProgressBarEndGreen.png */; };
> + 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources
> */ = {isa = PBXBuildFile; fileRef = 44042D160BE52AED00A6BBB2 /*
> ProgressBarEndWhite.png */; };
> + 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 44042D170BE52AED00A6BBB2 /*
> ProgressBarGray.png */; };
> + 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */
> = {isa = PBXBuildFile; fileRef = 44042D180BE52AED00A6BBB2 /*
> ProgressBarGreen.png */; };
> + 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in
> Resources */ = {isa = PBXBuildFile; fileRef =
> 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */; };
> + 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */
> = {isa = PBXBuildFile; fileRef = 44042D1A0BE52AED00A6BBB2 /*
> ProgressBarWhite.png */; };
> + 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 440EEAF20C03EC3D00ACAAB0 /*
> Change_Created.png */; };
> + 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 440EEAF60C03F0B800ACAAB0 /*
> Change_Deleted.png */; };
> + 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 440EEAF70C03F0B800ACAAB0 /*
> Change_Modified.png */; };
> + 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources
> */ = {isa = PBXBuildFile; fileRef = 440EEAF80C03F0B800ACAAB0 /*
> Change_PropsChanged.png */; };
> + 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 445A291A0BFA5B3300E4E641 /* Outline-
> Deep.png */; };
> + 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 445A29260BFA5C1200E4E641 /* Outline-
> Flat.png */; };
> + 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */
> = {isa = PBXBuildFile; fileRef = 445A29280BFA5C1B00E4E641 /* Outline-
> Flattened.png */; };
> + 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */ =
> {isa = PBXBuildFile; fileRef = 445A2A5D0BFAB6C300E4E641 /*
> ImageAndTextCell.m */; };
> + 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */ = {isa =
> PBXBuildFile; fileRef = 449F03DF0BE00DE9003F15C8 /* Bridge.m */; };
> + 44A794A10BE16C380069680C /* ExceptionHandling.framework in
> Frameworks */ = {isa = PBXBuildFile; fileRef =
> 44A794A00BE16C380069680C /* ExceptionHandling.framework */; };
> + 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */ =
> {isa = PBXBuildFile; fileRef = 44A797F10BE3F9B70069680C /* table-
> mixed.tif */; };
> + 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */ =
> {isa = PBXBuildFile; fileRef = 44F472AF0C0DB735006428EF /*
> Change_Absent.png */; };
> + 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */
> = {isa = PBXBuildFile; fileRef = 44F472B00C0DB735006428EF /*
> Change_Unmodified.png */; };
> + 69C625E60664EC3300B3C46A /* MainMenu.nib in Resources */ = {isa =
> PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib
> */; };
> + 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */ =
> {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /*
> InfoPlist.strings */; };
> + 69C625E80664EC3300B3C46A /* Unison.icns in Resources */ = {isa =
> PBXBuildFile; fileRef = 69C625CA0664E94E00B3C46A /* Unison.icns */; };
> + 69C625EA0664EC3300B3C46A /* main.m in Sources */ = {isa =
> PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */;
> settings = {ATTRIBUTES = (); }; };
> + 69C625EB0664EC3300B3C46A /* MyController.m in Sources */ = {isa =
> PBXBuildFile; fileRef = 69660DC704F08CC100CF23A4 /* MyController.m
> */; };
> + 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */ =
> {isa = PBXBuildFile; fileRef = 690F564504F11EC300CF23A4 /*
> ProfileController.m */; };
> + 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */ = {isa =
> PBXBuildFile; fileRef = 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */; };
> + 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */ = {isa
> = PBXBuildFile; fileRef = 69BA7DA904FD695200CF23A4 /*
> ReconTableView.m */; };
> + 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */
> = {isa = PBXBuildFile; fileRef = 697985CE050CFA2D00CF23A4 /*
> PreferencesController.m */; };
> + 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */ =
> {isa = PBXBuildFile; fileRef = 691CE181051BB44A00CF23A4 /*
> ProfileTableView.m */; };
> + 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */ =
> {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /*
> Cocoa.framework */; };
> + 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */ =
> {isa = PBXBuildFile; fileRef = 69E407B907EB95AA00D37AA1 /*
> Security.framework */; };
> + B518071C09D6652100B1B21F /* add.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071209D6652100B1B21F /* add.tif */; };
> + B518071D09D6652100B1B21F /* diff.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071309D6652100B1B21F /* diff.tif */; };
> + B518071E09D6652100B1B21F /* go.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071409D6652100B1B21F /* go.tif */; };
> + B518071F09D6652100B1B21F /* left.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071509D6652100B1B21F /* left.tif */; };
> + B518072009D6652100B1B21F /* merge.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071609D6652100B1B21F /* merge.tif */; };
> + B518072109D6652100B1B21F /* quit.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071709D6652100B1B21F /* quit.tif */; };
> + B518072209D6652100B1B21F /* restart.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071809D6652100B1B21F /* restart.tif */; };
> + B518072309D6652100B1B21F /* right.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071909D6652100B1B21F /* right.tif */; };
> + B518072409D6652100B1B21F /* save.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071A09D6652100B1B21F /* save.tif */; };
> + B518072509D6652100B1B21F /* skip.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B518071B09D6652100B1B21F /* skip.tif */; };
> + B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */ = {isa
> = PBXBuildFile; fileRef = B554004009C4E5AA0089E1C3 /*
> UnisonToolbar.m */; };
> + B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */ =
> {isa = PBXBuildFile; fileRef = B5B44C1109DF61A4000DC7AF /* table-
> conflict.tif */; };
> + B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */ =
> {isa = PBXBuildFile; fileRef = B5B44C1209DF61A4000DC7AF /* table-
> error.tif */; };
> + B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */ =
> {isa = PBXBuildFile; fileRef = B5B44C1309DF61A4000DC7AF /* table-
> left-blue.tif */; };
> + B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */
> = {isa = PBXBuildFile; fileRef = B5B44C1409DF61A4000DC7AF /* table-
> left-green.tif */; };
> + B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */ =
> {isa = PBXBuildFile; fileRef = B5B44C1509DF61A4000DC7AF /* table-
> merge.tif */; };
> + B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */
> = {isa = PBXBuildFile; fileRef = B5B44C1609DF61A4000DC7AF /* table-
> right-blue.tif */; };
> + B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */
> = {isa = PBXBuildFile; fileRef = B5B44C1709DF61A4000DC7AF /* table-
> right-green.tif */; };
> + B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */ = {isa
> = PBXBuildFile; fileRef = B5B44C1809DF61A4000DC7AF /* table-skip.tif
> */; };
> + B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */ = {isa =
> PBXBuildFile; fileRef = B5E03B3809E38B9E0058C7B9 /* rescan.tif */; };
> +/* End PBXBuildFile section */
> +
> +/* Begin PBXCopyFilesBuildPhase section */
> + 2A3C3F3709922AA600E404E9 /* CopyFiles */ = {
> + isa = PBXCopyFilesBuildPhase;
> + buildActionMask = 2147483647;
> + dstPath = "";
> + dstSubfolderSpec = 10;
> + files = (
> + 2A3C3F3309922A8000E404E9 /* Growl.framework in CopyFiles */,
> + );
> + runOnlyForDeploymentPostprocessing = 0;
> + };
> +/* End PBXCopyFilesBuildPhase section */
> +
> +/* Begin PBXFileReference section */
> + 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference;
> fileEncoding = 10; lastKnownFileType = text.plist.strings; name =
> English; path = English.lproj/InfoPlist.strings; sourceTree =
> "<group>"; };
> + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa =
> PBXFileReference; lastKnownFileType = wrapper.framework; name =
> Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework;
> sourceTree = "<absolute>"; };
> + 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference;
> fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path =
> main.m; sourceTree = "<group>"; };
> + 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference;
> lastKnownFileType = wrapper.nib; name = English; path =
> English.lproj/MainMenu.nib; sourceTree = "<group>"; };
> + 2A3C3F3209922A8000E404E9 /* Growl.framework */ = {isa =
> PBXFileReference; lastKnownFileType = wrapper.framework; path =
> Growl.framework; sourceTree = "<group>"; };
> + 2A3C3F7A09922D4900E404E9 /* NotificationController.h */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> sourcecode.c.h; path = NotificationController.h; sourceTree =
> "<group>"; };
> + 2A3C3F7B09922D4900E404E9 /* NotificationController.m */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> sourcecode.c.objc; path = NotificationController.m; sourceTree =
> "<group>"; };
> + 2E282CC70D9AE2B000439D01 /* unison-blob.o */ = {isa =
> PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile";
> name = "unison-blob.o"; path = "../unison-blob.o"; sourceTree =
> SOURCE_ROOT; };
> + 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> text.xcconfig; path = ExternalSettings.xcconfig; sourceTree =
> "<group>"; };
> + 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = ProgressCell.h; sourceTree = "<group>"; };
> + 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = ProgressCell.m; sourceTree = "<group>"; };
> + 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarAdvanced.png; path = progressicons/
> ProgressBarAdvanced.png; sourceTree = "<group>"; };
> + 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarBlue.png; path = progressicons/ProgressBarBlue.png;
> sourceTree = "<group>"; };
> + 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */ = {isa
> = PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarEndAdvanced.png; path = progressicons/
> ProgressBarEndAdvanced.png; sourceTree = "<group>"; };
> + 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarEndBlue.png; path = progressicons/ProgressBarEndBlue.png;
> sourceTree = "<group>"; };
> + 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarEndGray.png; path = progressicons/ProgressBarEndGray.png;
> sourceTree = "<group>"; };
> + 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarEndGreen.png; path = progressicons/
> ProgressBarEndGreen.png; sourceTree = "<group>"; };
> + 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarEndWhite.png; path = progressicons/
> ProgressBarEndWhite.png; sourceTree = "<group>"; };
> + 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarGray.png; path = progressicons/ProgressBarGray.png;
> sourceTree = "<group>"; };
> + 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarGreen.png; path = progressicons/ProgressBarGreen.png;
> sourceTree = "<group>"; };
> + 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarLightGreen.png; path = progressicons/
> ProgressBarLightGreen.png; sourceTree = "<group>"; };
> + 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; name =
> ProgressBarWhite.png; path = progressicons/ProgressBarWhite.png;
> sourceTree = "<group>"; };
> + 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path =
> Change_Created.png; sourceTree = "<group>"; };
> + 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path =
> Change_Deleted.png; sourceTree = "<group>"; };
> + 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path =
> Change_Modified.png; sourceTree = "<group>"; };
> + 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path =
> Change_PropsChanged.png; sourceTree = "<group>"; };
> + 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path = "Outline-
> Deep.png"; sourceTree = "<group>"; };
> + 445A29260BFA5C1200E4E641 /* Outline-Flat.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path = "Outline-
> Flat.png"; sourceTree = "<group>"; };
> + 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path = "Outline-
> Flattened.png"; sourceTree = "<group>"; };
> + 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = ImageAndTextCell.h; sourceTree = "<group>"; };
> + 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = ImageAndTextCell.m; sourceTree =
> "<group>"; };
> + 449F03DE0BE00DE9003F15C8 /* Bridge.h */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> sourcecode.c.h; path = Bridge.h; sourceTree = "<group>"; };
> + 449F03DF0BE00DE9003F15C8 /* Bridge.m */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> sourcecode.c.objc; path = Bridge.m; sourceTree = "<group>"; };
> + 44A794A00BE16C380069680C /* ExceptionHandling.framework */ = {isa
> = PBXFileReference; lastKnownFileType = wrapper.framework; name =
> ExceptionHandling.framework; path = /System/Library/Frameworks/
> ExceptionHandling.framework; sourceTree = "<absolute>"; };
> + 44A797F10BE3F9B70069680C /* table-mixed.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> mixed.tif"; sourceTree = "<group>"; };
> + 44F472AF0C0DB735006428EF /* Change_Absent.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path =
> Change_Absent.png; sourceTree = "<group>"; };
> + 44F472B00C0DB735006428EF /* Change_Unmodified.png */ = {isa =
> PBXFileReference; lastKnownFileType = image.png; path =
> Change_Unmodified.png; sourceTree = "<group>"; };
> + 690F564404F11EC300CF23A4 /* ProfileController.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = ProfileController.h; sourceTree = "<group>"; };
> + 690F564504F11EC300CF23A4 /* ProfileController.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = ProfileController.m; sourceTree =
> "<group>"; };
> + 691CE180051BB44A00CF23A4 /* ProfileTableView.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = ProfileTableView.h; sourceTree = "<group>"; };
> + 691CE181051BB44A00CF23A4 /* ProfileTableView.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = ProfileTableView.m; sourceTree =
> "<group>"; };
> + 69660DC604F08CC100CF23A4 /* MyController.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = MyController.h; sourceTree = "<group>"; };
> + 69660DC704F08CC100CF23A4 /* MyController.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = MyController.m; sourceTree = "<group>"; };
> + 697985CD050CFA2D00CF23A4 /* PreferencesController.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = PreferencesController.h; sourceTree =
> "<group>"; };
> + 697985CE050CFA2D00CF23A4 /* PreferencesController.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = PreferencesController.m; sourceTree =
> "<group>"; };
> + 69BA7DA804FD695200CF23A4 /* ReconTableView.h */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> sourcecode.c.h; path = ReconTableView.h; sourceTree = "<group>"; };
> + 69BA7DA904FD695200CF23A4 /* ReconTableView.m */ = {isa =
> PBXFileReference; fileEncoding = 4; lastKnownFileType =
> sourcecode.c.objc; path = ReconTableView.m; sourceTree = "<group>"; };
> + 69C625CA0664E94E00B3C46A /* Unison.icns */ = {isa =
> PBXFileReference; lastKnownFileType = image.icns; path =
> Unison.icns; sourceTree = "<group>"; };
> + 69C625F40664EC3300B3C46A /* Info.plist */ = {isa =
> PBXFileReference; lastKnownFileType = text.xml; path = Info.plist;
> sourceTree = "<group>"; };
> + 69C625F50664EC3300B3C46A /* Unison.app */ = {isa =
> PBXFileReference; explicitFileType = wrapper.application;
> includeInIndex = 0; path = Unison.app; sourceTree =
> BUILT_PRODUCTS_DIR; };
> + 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = ReconItem.m; sourceTree = "<group>"; };
> + 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = ReconItem.h; sourceTree = "<group>"; };
> + 69E407B907EB95AA00D37AA1 /* Security.framework */ = {isa =
> PBXFileReference; lastKnownFileType = wrapper.framework; name =
> Security.framework; path = /System/Library/Frameworks/
> Security.framework; sourceTree = "<absolute>"; };
> + B518071209D6652100B1B21F /* add.tif */ = {isa = PBXFileReference;
> lastKnownFileType = image.tiff; path = add.tif; sourceTree =
> "<group>"; };
> + B518071309D6652100B1B21F /* diff.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = diff.tif;
> sourceTree = "<group>"; };
> + B518071409D6652100B1B21F /* go.tif */ = {isa = PBXFileReference;
> lastKnownFileType = image.tiff; path = go.tif; sourceTree =
> "<group>"; };
> + B518071509D6652100B1B21F /* left.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = left.tif;
> sourceTree = "<group>"; };
> + B518071609D6652100B1B21F /* merge.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = merge.tif;
> sourceTree = "<group>"; };
> + B518071709D6652100B1B21F /* quit.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = quit.tif;
> sourceTree = "<group>"; };
> + B518071809D6652100B1B21F /* restart.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path =
> restart.tif; sourceTree = "<group>"; };
> + B518071909D6652100B1B21F /* right.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = right.tif;
> sourceTree = "<group>"; };
> + B518071A09D6652100B1B21F /* save.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = save.tif;
> sourceTree = "<group>"; };
> + B518071B09D6652100B1B21F /* skip.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = skip.tif;
> sourceTree = "<group>"; };
> + B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.h; path = UnisonToolbar.h; sourceTree = "<group>"; };
> + B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */ = {isa =
> PBXFileReference; fileEncoding = 30; lastKnownFileType =
> sourcecode.c.objc; path = UnisonToolbar.m; sourceTree = "<group>"; };
> + B5B44C1109DF61A4000DC7AF /* table-conflict.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> conflict.tif"; sourceTree = "<group>"; };
> + B5B44C1209DF61A4000DC7AF /* table-error.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> error.tif"; sourceTree = "<group>"; };
> + B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-
> blue.tif"; sourceTree = "<group>"; };
> + B5B44C1409DF61A4000DC7AF /* table-left-green.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-
> green.tif"; sourceTree = "<group>"; };
> + B5B44C1509DF61A4000DC7AF /* table-merge.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> merge.tif"; sourceTree = "<group>"; };
> + B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> right-blue.tif"; sourceTree = "<group>"; };
> + B5B44C1709DF61A4000DC7AF /* table-right-green.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> right-green.tif"; sourceTree = "<group>"; };
> + B5B44C1809DF61A4000DC7AF /* table-skip.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; path = "table-
> skip.tif"; sourceTree = "<group>"; };
> + B5E03B3809E38B9E0058C7B9 /* rescan.tif */ = {isa =
> PBXFileReference; lastKnownFileType = image.tiff; name = rescan.tif;
> path = toolbar/rescan.tif; sourceTree = "<group>"; };
> +/* End PBXFileReference section */
> +
> +/* Begin PBXFrameworksBuildPhase section */
> + 69C625F10664EC3300B3C46A /* Frameworks */ = {
> + isa = PBXFrameworksBuildPhase;
> + buildActionMask = 2147483647;
> + files = (
> + 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */,
> + 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */,
> + 2A3C3FAE0992323F00E404E9 /* Growl.framework in Frameworks */,
> + 44A794A10BE16C380069680C /* ExceptionHandling.framework in
> Frameworks */,
> + 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */,
> + );
> + runOnlyForDeploymentPostprocessing = 0;
> + };
> +/* End PBXFrameworksBuildPhase section */
> +
> +/* Begin PBXGroup section */
> + 19C28FACFE9D520D11CA2CBB /* Products */ = {
> + isa = PBXGroup;
> + children = (
> + 69C625F50664EC3300B3C46A /* Unison.app */,
> + );
> + name = Products;
> + sourceTree = "<group>";
> + };
> + 29B97314FDCFA39411CA2CEA /* uimac */ = {
> + isa = PBXGroup;
> + children = (
> + B5E03B3809E38B9E0058C7B9 /* rescan.tif */,
> + 44042D0F0BE52AD700A6BBB2 /* progressicons */,
> + B5B44C1009DF61A4000DC7AF /* tableicons */,
> + B518071109D6652000B1B21F /* toolbar */,
> + 44A795C90BE2B91B0069680C /* Classes */,
> + 29B97315FDCFA39411CA2CEA /* Other Sources */,
> + 29B97317FDCFA39411CA2CEA /* Resources */,
> + 29B97323FDCFA39411CA2CEA /* Frameworks */,
> + 19C28FACFE9D520D11CA2CBB /* Products */,
> + 69C625F40664EC3300B3C46A /* Info.plist */,
> + 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */,
> + 2E282CB80D9AE16300439D01 /* External objects */,
> + );
> + name = uimac;
> + sourceTree = "<group>";
> + };
> + 29B97315FDCFA39411CA2CEA /* Other Sources */ = {
> + isa = PBXGroup;
> + children = (
> + 29B97316FDCFA39411CA2CEA /* main.m */,
> + );
> + name = "Other Sources";
> + sourceTree = "<group>";
> + };
> + 29B97317FDCFA39411CA2CEA /* Resources */ = {
> + isa = PBXGroup;
> + children = (
> + 29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
> + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
> + 69C625CA0664E94E00B3C46A /* Unison.icns */,
> + );
> + name = Resources;
> + sourceTree = "<group>";
> + };
> + 29B97323FDCFA39411CA2CEA /* Frameworks */ = {
> + isa = PBXGroup;
> + children = (
> + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
> + 44A794A00BE16C380069680C /* ExceptionHandling.framework */,
> + 2A3C3F3209922A8000E404E9 /* Growl.framework */,
> + 69E407B907EB95AA00D37AA1 /* Security.framework */,
> + );
> + name = Frameworks;
> + sourceTree = "<group>";
> + };
> + 2E282CB80D9AE16300439D01 /* External objects */ = {
> + isa = PBXGroup;
> + children = (
> + 2E282CC70D9AE2B000439D01 /* unison-blob.o */,
> + );
> + name = "External objects";
> + sourceTree = "<group>";
> + };
> + 44042D0F0BE52AD700A6BBB2 /* progressicons */ = {
> + isa = PBXGroup;
> + children = (
> + 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */,
> + 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */,
> + 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */,
> + 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */,
> + 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */,
> + 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */,
> + 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */,
> + 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */,
> + 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */,
> + 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */,
> + 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */,
> + );
> + name = progressicons;
> + sourceTree = "<group>";
> + };
> + 44A795C90BE2B91B0069680C /* Classes */ = {
> + isa = PBXGroup;
> + children = (
> + 69660DC604F08CC100CF23A4 /* MyController.h */,
> + 69660DC704F08CC100CF23A4 /* MyController.m */,
> + 2A3C3F7A09922D4900E404E9 /* NotificationController.h */,
> + 2A3C3F7B09922D4900E404E9 /* NotificationController.m */,
> + 69BA7DA804FD695200CF23A4 /* ReconTableView.h */,
> + 69BA7DA904FD695200CF23A4 /* ReconTableView.m */,
> + 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */,
> + 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */,
> + 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */,
> + 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */,
> + 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */,
> + 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */,
> + 690F564404F11EC300CF23A4 /* ProfileController.h */,
> + 690F564504F11EC300CF23A4 /* ProfileController.m */,
> + 697985CD050CFA2D00CF23A4 /* PreferencesController.h */,
> + 697985CE050CFA2D00CF23A4 /* PreferencesController.m */,
> + 691CE180051BB44A00CF23A4 /* ProfileTableView.h */,
> + 691CE181051BB44A00CF23A4 /* ProfileTableView.m */,
> + B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */,
> + B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */,
> + 449F03DE0BE00DE9003F15C8 /* Bridge.h */,
> + 449F03DF0BE00DE9003F15C8 /* Bridge.m */,
> + );
> + name = Classes;
> + sourceTree = "<group>";
> + };
> + B518071109D6652000B1B21F /* toolbar */ = {
> + isa = PBXGroup;
> + children = (
> + B518071209D6652100B1B21F /* add.tif */,
> + B518071309D6652100B1B21F /* diff.tif */,
> + B518071409D6652100B1B21F /* go.tif */,
> + B518071509D6652100B1B21F /* left.tif */,
> + B518071609D6652100B1B21F /* merge.tif */,
> + B518071709D6652100B1B21F /* quit.tif */,
> + B518071809D6652100B1B21F /* restart.tif */,
> + B518071909D6652100B1B21F /* right.tif */,
> + B518071A09D6652100B1B21F /* save.tif */,
> + B518071B09D6652100B1B21F /* skip.tif */,
> + );
> + path = toolbar;
> + sourceTree = "<group>";
> + };
> + B5B44C1009DF61A4000DC7AF /* tableicons */ = {
> + isa = PBXGroup;
> + children = (
> + 44F472AF0C0DB735006428EF /* Change_Absent.png */,
> + 44F472B00C0DB735006428EF /* Change_Unmodified.png */,
> + 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */,
> + 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */,
> + 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */,
> + 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */,
> + 44A797F10BE3F9B70069680C /* table-mixed.tif */,
> + B5B44C1109DF61A4000DC7AF /* table-conflict.tif */,
> + B5B44C1209DF61A4000DC7AF /* table-error.tif */,
> + B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */,
> + B5B44C1409DF61A4000DC7AF /* table-left-green.tif */,
> + B5B44C1509DF61A4000DC7AF /* table-merge.tif */,
> + B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */,
> + B5B44C1709DF61A4000DC7AF /* table-right-green.tif */,
> + B5B44C1809DF61A4000DC7AF /* table-skip.tif */,
> + 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */,
> + 445A29260BFA5C1200E4E641 /* Outline-Flat.png */,
> + 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */,
> + );
> + path = tableicons;
> + sourceTree = "<group>";
> + };
> +/* End PBXGroup section */
> +
> +/* Begin PBXNativeTarget section */
> + 69C625DD0664EC3300B3C46A /* uimac */ = {
> + isa = PBXNativeTarget;
> + buildConfigurationList = 2A3C3F280992245300E404E9 /* Build
> configuration list for PBXNativeTarget "uimac" */;
> + buildPhases = (
> + 2A8C3B3C0DB78B0A002EADE2 /* Run Script (version, ocaml lib dir)
> */,
> + 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */,
> + 69C625E50664EC3300B3C46A /* Resources */,
> + 69C625E90664EC3300B3C46A /* Sources */,
> + 69C625F10664EC3300B3C46A /* Frameworks */,
> + 2A3C3F3709922AA600E404E9 /* CopyFiles */,
> + );
> + buildRules = (
> + );
> + dependencies = (
> + );
> + name = uimac;
> + productInstallPath = "$(HOME)/Applications";
> + productName = uimac;
> + productReference = 69C625F50664EC3300B3C46A /* Unison.app */;
> + productType = "com.apple.product-type.application";
> + };
> +/* End PBXNativeTarget section */
> +
> +/* Begin PBXProject section */
> + 29B97313FDCFA39411CA2CEA /* Project object */ = {
> + isa = PBXProject;
> + buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build
> configuration list for PBXProject "uimacnew" */;
> + compatibilityVersion = "Xcode 2.4";
> + hasScannedForEncodings = 1;
> + mainGroup = 29B97314FDCFA39411CA2CEA /* uimac */;
> + projectDirPath = "";
> + projectRoot = "";
> + targets = (
> + 69C625DD0664EC3300B3C46A /* uimac */,
> + );
> + };
> +/* End PBXProject section */
> +
> +/* Begin PBXResourcesBuildPhase section */
> + 69C625E50664EC3300B3C46A /* Resources */ = {
> + isa = PBXResourcesBuildPhase;
> + buildActionMask = 2147483647;
> + files = (
> + 69C625E60664EC3300B3C46A /* MainMenu.nib in Resources */,
> + 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */,
> + 69C625E80664EC3300B3C46A /* Unison.icns in Resources */,
> + B518071C09D6652100B1B21F /* add.tif in Resources */,
> + B518071D09D6652100B1B21F /* diff.tif in Resources */,
> + B518071E09D6652100B1B21F /* go.tif in Resources */,
> + B518071F09D6652100B1B21F /* left.tif in Resources */,
> + B518072009D6652100B1B21F /* merge.tif in Resources */,
> + B518072109D6652100B1B21F /* quit.tif in Resources */,
> + B518072209D6652100B1B21F /* restart.tif in Resources */,
> + B518072309D6652100B1B21F /* right.tif in Resources */,
> + B518072409D6652100B1B21F /* save.tif in Resources */,
> + B518072509D6652100B1B21F /* skip.tif in Resources */,
> + B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */,
> + B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */,
> + B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */,
> + B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */,
> + B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */,
> + B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */,
> + B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources
> */,
> + B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */,
> + B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */,
> + 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */,
> + 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in
> Resources */,
> + 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */,
> + 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in
> Resources */,
> + 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources
> */,
> + 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources
> */,
> + 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in
> Resources */,
> + 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in
> Resources */,
> + 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */,
> + 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */,
> + 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in
> Resources */,
> + 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */,
> + 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */,
> + 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */,
> + 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources
> */,
> + 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */,
> + 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */,
> + 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */,
> + 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in
> Resources */,
> + 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */,
> + 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources
> */,
> + );
> + runOnlyForDeploymentPostprocessing = 0;
> + };
> +/* End PBXResourcesBuildPhase section */
> +
> +/* Begin PBXShellScriptBuildPhase section */
> + 2A8C3B3C0DB78B0A002EADE2 /* Run Script (version, ocaml lib dir)
> */ = {
> + isa = PBXShellScriptBuildPhase;
> + buildActionMask = 2147483647;
> + files = (
> + );
> + inputPaths = (
> + );
> + name = "Run Script (version, ocaml lib dir)";
> + outputPaths = (
> + );
> + runOnlyForDeploymentPostprocessing = 0;
> + shellPath = /bin/sh;
> + shellScript = "if [ -x /usr/libexec/path_helper ]; then\n eval
> `/usr/libexec/path_helper -s`\nfi\nOCAMLLIBDIR=`ocamlc -v | tail -n
> -1 | sed -e 's/.* //g' | sed -e 's/\\\\\\/\\\\//g' | tr -d '\\r'`
> \nsource ${PROJECT_DIR}/../Makefile.ProjectInfo\necho
> MARKETING_VERSION = $VERSION > ${PROJECT_DIR}/
> ExternalSettings.xcconfig\necho OCAMLLIBDIR = $OCAMLLIBDIR >> $
> {PROJECT_DIR}/ExternalSettings.xcconfig";
> + };
> + 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */ = {
> + isa = PBXShellScriptBuildPhase;
> + buildActionMask = 2147483647;
> + files = (
> + );
> + inputPaths = (
> + );
> + name = "Run Script (make unison-blob.o)";
> + outputPaths = (
> + );
> + runOnlyForDeploymentPostprocessing = 0;
> + shellPath = /bin/sh;
> + shellScript = "echo \"Building unison-blob.o...\"\nif [ -x /usr/
> libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi
> \ncd ${PROJECT_DIR}/..\nmake unison-blob.o\necho \"done\"";
> + };
> +/* End PBXShellScriptBuildPhase section */
> +
> +/* Begin PBXSourcesBuildPhase section */
> + 69C625E90664EC3300B3C46A /* Sources */ = {
> + isa = PBXSourcesBuildPhase;
> + buildActionMask = 2147483647;
> + files = (
> + 69C625EA0664EC3300B3C46A /* main.m in Sources */,
> + 69C625EB0664EC3300B3C46A /* MyController.m in Sources */,
> + 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */,
> + 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */,
> + 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */,
> + 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources
> */,
> + 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */,
> + 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources
> */,
> + B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */,
> + 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */,
> + 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */,
> + 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */,
> + );
> + runOnlyForDeploymentPostprocessing = 0;
> + };
> +/* End PBXSourcesBuildPhase section */
> +
> +/* Begin PBXVariantGroup section */
> + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
> + isa = PBXVariantGroup;
> + children = (
> + 089C165DFE840E0CC02AAC07 /* English */,
> + );
> + name = InfoPlist.strings;
> + sourceTree = "<group>";
> + };
> + 29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
> + isa = PBXVariantGroup;
> + children = (
> + 29B97319FDCFA39411CA2CEA /* English */,
> + );
> + name = MainMenu.nib;
> + sourceTree = "<group>";
> + };
> +/* End PBXVariantGroup section */
> +
> +/* Begin XCBuildConfiguration section */
> + 2A3C3F290992245300E404E9 /* Development */ = {
> + isa = XCBuildConfiguration;
> + buildSettings = {
> + COPY_PHASE_STRIP = NO;
> + FRAMEWORK_SEARCH_PATHS = (
> + "$(FRAMEWORK_SEARCH_PATHS)",
> + "$(SRCROOT)",
> + );
> + 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;
> + GCC_PRECOMPILE_PREFIX_HEADER = YES;
> + INFOPLIST_FILE = Info.plist;
> + INSTALL_PATH = "$(HOME)/Applications";
> + LIBRARY_SEARCH_PATHS = "";
> + NSZombieEnabled = YES;
> + OPTIMIZATION_CFLAGS = "-O0";
> + OTHER_CFLAGS = "";
> + OTHER_LDFLAGS = (
> + "-L$(OCAMLLIBDIR)",
> + "-lunix",
> + "-lthreadsnat",
> + "-lstr",
> + "-lasmrun",
> + );
> + PREBINDING = NO;
> + PRODUCT_NAME = Unison;
> + SECTORDER_FLAGS = "";
> + WARNING_CFLAGS = (
> + "-Wmost",
> + "-Wno-four-char-constants",
> + "-Wno-unknown-pragmas",
> + );
> + WRAPPER_EXTENSION = app;
> + ZERO_LINK = YES;
> + };
> + name = Development;
> + };
> + 2A3C3F2A0992245300E404E9 /* Deployment */ = {
> + isa = XCBuildConfiguration;
> + buildSettings = {
> + COPY_PHASE_STRIP = YES;
> + FRAMEWORK_SEARCH_PATHS = (
> + "$(FRAMEWORK_SEARCH_PATHS)",
> + "$(SRCROOT)",
> + );
> + GCC_ENABLE_FIX_AND_CONTINUE = NO;
> + GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> + GCC_PRECOMPILE_PREFIX_HEADER = YES;
> + GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
> + INFOPLIST_FILE = Info.plist;
> + INSTALL_PATH = "$(HOME)/Applications";
> + LIBRARY_SEARCH_PATHS = "";
> + OTHER_CFLAGS = "";
> + OTHER_LDFLAGS = (
> + "-L$(OCAMLLIBDIR)",
> + "-lunix",
> + "-lthreadsnat",
> + "-lstr",
> + "-lasmrun",
> + );
> + PREBINDING = NO;
> + PRODUCT_NAME = Unison;
> + SECTORDER_FLAGS = "";
> + WARNING_CFLAGS = (
> + "-Wmost",
> + "-Wno-four-char-constants",
> + "-Wno-unknown-pragmas",
> + );
> + WRAPPER_EXTENSION = app;
> + ZERO_LINK = NO;
> + };
> + name = Deployment;
> + };
> + 2A3C3F2B0992245300E404E9 /* Default */ = {
> + isa = XCBuildConfiguration;
> + buildSettings = {
> + FRAMEWORK_SEARCH_PATHS = (
> + "$(FRAMEWORK_SEARCH_PATHS)",
> + "$(SRCROOT)",
> + );
> + GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> + GCC_PRECOMPILE_PREFIX_HEADER = YES;
> + INFOPLIST_FILE = Info.plist;
> + INSTALL_PATH = "$(HOME)/Applications";
> + LIBRARY_SEARCH_PATHS = "";
> + OTHER_CFLAGS = "";
> + OTHER_LDFLAGS = (
> + "-L$(OCAMLLIBDIR)",
> + "-lunix",
> + "-lthreadsnat",
> + "-lstr",
> + "-lasmrun",
> + );
> + PREBINDING = NO;
> + PRODUCT_NAME = Unison;
> + SECTORDER_FLAGS = "";
> + WARNING_CFLAGS = (
> + "-Wmost",
> + "-Wno-four-char-constants",
> + "-Wno-unknown-pragmas",
> + );
> + WRAPPER_EXTENSION = app;
> + };
> + name = Default;
> + };
> + 2A3C3F2D0992245300E404E9 /* Development */ = {
> + isa = XCBuildConfiguration;
> + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /*
> ExternalSettings.xcconfig */;
> + buildSettings = {
> + LIBRARY_SEARCH_PATHS = "";
> + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
> + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
> + };
> + name = Development;
> + };
> + 2A3C3F2E0992245300E404E9 /* Deployment */ = {
> + isa = XCBuildConfiguration;
> + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /*
> ExternalSettings.xcconfig */;
> + buildSettings = {
> + LIBRARY_SEARCH_PATHS = "";
> + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
> + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
> + };
> + name = Deployment;
> + };
> + 2A3C3F2F0992245300E404E9 /* Default */ = {
> + isa = XCBuildConfiguration;
> + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /*
> ExternalSettings.xcconfig */;
> + buildSettings = {
> + LIBRARY_SEARCH_PATHS = "";
> + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
> + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
> + };
> + name = Default;
> + };
> +/* End XCBuildConfiguration section */
> +
> +/* Begin XCConfigurationList section */
> + 2A3C3F280992245300E404E9 /* Build configuration list for
> PBXNativeTarget "uimac" */ = {
> + isa = XCConfigurationList;
> + buildConfigurations = (
> + 2A3C3F290992245300E404E9 /* Development */,
> + 2A3C3F2A0992245300E404E9 /* Deployment */,
> + 2A3C3F2B0992245300E404E9 /* Default */,
> + );
> + defaultConfigurationIsVisible = 0;
> + defaultConfigurationName = Default;
> + };
> + 2A3C3F2C0992245300E404E9 /* Build configuration list for
> PBXProject "uimacnew" */ = {
> + isa = XCConfigurationList;
> + buildConfigurations = (
> + 2A3C3F2D0992245300E404E9 /* Development */,
> + 2A3C3F2E0992245300E404E9 /* Deployment */,
> + 2A3C3F2F0992245300E404E9 /* Default */,
> + );
> + defaultConfigurationIsVisible = 0;
> + defaultConfigurationName = Default;
> + };
> +/* End XCConfigurationList section */
> + };
> + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
> +}
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.seas.upenn.edu/pipermail/unison-hackers/attachments/20080519/27b604c6/attachment-0001.htm
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
Url : http://lists.seas.upenn.edu/pipermail/unison-hackers/attachments/20080519/27b604c6/PGP-0001.sig
More information about the Unison-hackers
mailing list