<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">My latest commit.<div><br></div><div>Alan </div><div><div><br><div>Begin forwarded message:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>From: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><a href="mailto:unison-hackers-owner@lists.seas.upenn.edu">unison-hackers-owner@lists.seas.upenn.edu</a></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>Date: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica">19 mai 2008 16:47:31 HAEC</font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>To: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><a href="mailto:schmitta@seas.upenn.edu">schmitta@seas.upenn.edu</a></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; "><font face="Helvetica" size="3" color="#000000" style="font: 12.0px Helvetica; color: #000000"><b>Subject: </b></font><font face="Helvetica" size="3" style="font: 12.0px Helvetica"><b>[unison-svn] r277 - branches/2.27/src branches/2.27/src/uimacnew/uimacnew.xcodeproj trunk/src trunk/src/uimacnew trunk/src/uimacnew/uimacnew.xcodeproj</b></font></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; min-height: 14px; "><br></div> </div>You are not allowed to post to this mailing list, and your message has<br>been automatically rejected. If you think that your messages are<br>being rejected in error, contact the mailing list owner at<br><a href="mailto:unison-hackers-owner@lists.seas.upenn.edu">unison-hackers-owner@lists.seas.upenn.edu</a>.<br><br><br><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 0.5);"><b>From: </b></span><span style="font-family:'Helvetica'; font-size:medium;">ALAN SCHMITT <<a href="mailto:schmitta@seas.upenn.edu">schmitta@seas.upenn.edu</a>><br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 0.5);"><b>Date: </b></span><span style="font-family:'Helvetica'; font-size:medium;">19 mai 2008 16:47:23 HAEC<br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 0.5);"><b>To: </b></span><span style="font-family:'Helvetica'; font-size:medium;"><a href="mailto:unison-hackers@lists.seas.upenn.edu">unison-hackers@lists.seas.upenn.edu</a><br></span></div><div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px;"><span style="font-family:'Helvetica'; font-size:medium; color:rgba(0, 0, 0, 0.5);"><b>Subject: </b></span><span style="font-family:'Helvetica'; font-size:medium;"><b>[unison-svn] r277 - branches/2.27/src branches/2.27/src/uimacnew/uimacnew.xcodeproj trunk/src trunk/src/uimacnew trunk/src/uimacnew/uimacnew.xcodeproj</b><br></span></div><br><br>Author: schmitta<br>Date: 2008-05-19 10:47:07 -0400 (Mon, 19 May 2008)<br>New Revision: 277<br><br>Added:<br> trunk/src/uimacnew/Info.plist<br> trunk/src/uimacnew/uimacnew.xcodeproj/<br> trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<br>Removed:<br> trunk/src/uimacnew/uimac.pbproj/<br> trunk/src/uimacnew/uimac.xcodeproj/<br>Modified:<br> branches/2.27/src/Makefile<br> branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<br> trunk/src/Makefile<br> trunk/src/Makefile.OCaml<br> trunk/src/uimacbridgenew.ml<br> trunk/src/uimacnew/Bridge.m<br> trunk/src/uimacnew/MyController.m<br> trunk/src/uimacnew/ReconItem.m<br>Log:<br>Porting the changes from 2.27 to trunk<br>Tweaking the XCode project file for better dependency support (it's now really just one click to compile everything)<br><br><br><br>Modified: branches/2.27/src/Makefile<br>===================================================================<br>--- branches/2.27/src/Makefile<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ branches/2.27/src/Makefile<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -353,7 +353,7 @@<br> ifeq (${OSARCH},osx)<br> clean::<br> <span class="Apple-tab-span" style="white-space:pre"> </span>-(cd $(UIMACDIR); xcodebuild clean)<br>-#<span class="Apple-tab-span" style="white-space:pre"> </span>-(cd $(UIMACDIR); $(RM) -r build *.plist)<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>-(cd $(UIMACDIR); $(RM) -r build ExternalSettings.xcconfig)<br> endif<br><br> checkin:<br><br>Modified: branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<br>===================================================================<br>--- branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ branches/2.27/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -6,6 +6,20 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span>objectVersion = 42;<br> <span class="Apple-tab-span" style="white-space:pre"> </span>objects = {<br><br>+/* Begin PBXAggregateTarget section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9C0DE1C66300524237 /* Create ExternalSettings */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXAggregateTarget;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildConfigurationList = 2A124EA90DE1C69B00524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildPhases = (<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124EA10DE1C67100524237 /* Run Script (version, ocaml lib dir) */,<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>dependencies = (<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>name = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>productName = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+/* End PBXAggregateTarget section */<br>+<br> /* Begin PBXBuildFile section */<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F3309922A8000E404E9 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2A3C3F3209922A8000E404E9 /* Growl.framework */; };<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A3C3F7B09922D4900E404E9 /* NotificationController.m */; };<br>@@ -70,6 +84,16 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5E03B3809E38B9E0058C7B9 /* rescan.tif */; };<br> /* End PBXBuildFile section */<br><br>+/* Begin PBXContainerItemProxy section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124EA20DE1C69800524237 /* PBXContainerItemProxy */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXContainerItemProxy;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>proxyType = 1;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>remoteGlobalIDString = 2A124E9C0DE1C66300524237 /* Create ExternalSettings */;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>remoteInfo = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+/* End PBXContainerItemProxy section */<br>+<br> /* Begin PBXCopyFilesBuildPhase section */<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F3709922AA600E404E9 /* CopyFiles */ = {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXCopyFilesBuildPhase;<br>@@ -336,7 +360,6 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXNativeTarget;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildConfigurationList = 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildPhases = (<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A8C3B3C0DB78B0A002EADE2 /* Run Script (version, ocaml lib dir) */,<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */,<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>69C625E50664EC3300B3C46A /* Resources */,<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>69C625E90664EC3300B3C46A /* Sources */,<br>@@ -346,6 +369,7 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildRules = (<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>dependencies = (<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124EA30DE1C69800524237 /* PBXTargetDependency */,<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>name = uimac;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>productInstallPath = "$(HOME)/Applications";<br>@@ -366,6 +390,7 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>projectRoot = "";<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>targets = (<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>69C625DD0664EC3300B3C46A /* uimac */,<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9C0DE1C66300524237 /* Create ExternalSettings */,<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br> /* End PBXProject section */<br>@@ -424,7 +449,7 @@<br> /* End PBXResourcesBuildPhase section */<br><br> /* Begin PBXShellScriptBuildPhase section */<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A8C3B3C0DB78B0A002EADE2 /* Run Script (version, ocaml lib dir) */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124EA10DE1C67100524237 /* Run Script (version, ocaml lib dir) */ = {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXShellScriptBuildPhase;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildActionMask = 2147483647;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>files = (<br>@@ -436,7 +461,7 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>runOnlyForDeploymentPostprocessing = 0;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>shellPath = /bin/sh;<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>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";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>shellScript = "if [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\nif [ ! -x ${PROJECT_DIR}/../Makefile.ProjectInfo ]; then\n if [ ! -x ${PROJECT_DIR}/../mkProjectInfo ]; then\n cd ${PROJECT_DIR}/..; ocamlc -o mkProjectInfo mkProjectInfo.ml\n fi\n cd ${PROJECT_DIR}/..; ./mkProjectInfo > Makefile.ProjectInfo\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";<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */ = {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXShellScriptBuildPhase;<br>@@ -476,6 +501,14 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br> /* End PBXSourcesBuildPhase section */<br><br>+/* Begin PBXTargetDependency section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124EA30DE1C69800524237 /* PBXTargetDependency */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXTargetDependency;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>target = 2A124E9C0DE1C66300524237 /* Create ExternalSettings */;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>targetProxy = 2A124EA20DE1C69800524237 /* PBXContainerItemProxy */;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+/* End PBXTargetDependency section */<br>+<br> /* Begin PBXVariantGroup section */<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXVariantGroup;<br>@@ -496,6 +529,34 @@<br> /* End PBXVariantGroup section */<br><br> /* Begin XCBuildConfiguration section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9D0DE1C66300524237 /* Development */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = XCBuildConfiguration;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildSettings = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>COPY_PHASE_STRIP = NO;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>GCC_DYNAMIC_NO_PIC = NO;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>GCC_OPTIMIZATION_LEVEL = 0;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>PRODUCT_NAME = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>name = Development;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9E0DE1C66300524237 /* Deployment */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = XCBuildConfiguration;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildSettings = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>COPY_PHASE_STRIP = YES;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>GCC_ENABLE_FIX_AND_CONTINUE = NO;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>PRODUCT_NAME = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>ZERO_LINK = NO;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>name = Deployment;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9F0DE1C66300524237 /* Default */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = XCBuildConfiguration;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildSettings = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>PRODUCT_NAME = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>name = Default;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F290992245300E404E9 /* Development */ = {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = XCBuildConfiguration;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildSettings = {<br>@@ -637,6 +698,16 @@<br> /* End XCBuildConfiguration section */<br><br> /* Begin XCConfigurationList section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124EA90DE1C69B00524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = XCConfigurationList;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildConfigurations = (<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9D0DE1C66300524237 /* Development */,<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9E0DE1C66300524237 /* Deployment */,<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E9F0DE1C66300524237 /* Default */,<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>defaultConfigurationIsVisible = 0;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>defaultConfigurationName = Default;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */ = {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = XCConfigurationList;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildConfigurations = (<br><br>Modified: trunk/src/Makefile<br>===================================================================<br>--- trunk/src/Makefile<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ trunk/src/Makefile<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -356,8 +356,8 @@<br><br> ifeq (${OSARCH},osx)<br> clean::<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>-(cd uimac; xcodebuild clean)<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>-(cd uimac; $(RM) -r build *.plist)<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>-(cd $(UIMACDIR); xcodebuild clean)<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>-(cd $(UIMACDIR); $(RM) -r build ExternalSettings.xcconfig)<br> endif<br><br> checkin:<br><br>Modified: trunk/src/Makefile.OCaml<br>===================================================================<br>--- trunk/src/Makefile.OCaml<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ trunk/src/Makefile.OCaml<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -148,8 +148,8 @@<br> # The two cases for cltool are needed because Xcode 2.1+<br> # builds in build/Default/, and earlier versions use build/<br> macexecutable: $(NAME)-blob.o<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>(cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)")<br>+#<span class="Apple-tab-span" style="white-space:pre"> </span>sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>(cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)<br> <span class="Apple-tab-span" style="white-space:pre"> </span>if [ -e $(UIMACDIR)/build/Default ]; then \<br> <span class="Apple-tab-span" style="white-space:pre"> </span> gcc $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \<br> <span class="Apple-tab-span" style="white-space:pre"> </span>else \<br><br>Modified: trunk/src/uimacbridgenew.ml<br>===================================================================<br>--- trunk/src/uimacbridgenew.ml<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ trunk/src/uimacbridgenew.ml<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -44,7 +44,7 @@<br> totalBytesTransferred := Uutil.Filesize.zero;<br> showGlobalProgress Uutil.Filesize.zero;;<br><br>-(* Defined in MyController.m, used to redisplay the table<br>+(* Defined in Bridge.m, used to redisplay the table<br> when the status for a row changes *)<br> external bridgeThreadWait : int -> unit = "bridgeThreadWait";;<br><br><br>Modified: trunk/src/uimacnew/Bridge.m<br>===================================================================<br>--- trunk/src/uimacnew/Bridge.m<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ trunk/src/uimacnew/Bridge.m<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -12,6 +12,7 @@<br> #include <caml/alloc.h><br> #include <caml/mlvalues.h><br> #include <caml/memory.h><br>+#include <caml/signals.h><br> #import <ExceptionHandling/NSExceptionHandler.h><br><br> #include <pthread.h><br>@@ -181,7 +182,7 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>args[argCount] = caml_copy_string(str);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>break;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>case 'S':<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>str = [va_arg(cs->args, NSString *) cString];<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>str = [va_arg(cs->args, NSString *) UTF8String];<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>args[argCount] = caml_copy_string(str);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>break;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>case 'n':<br>@@ -226,7 +227,7 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>*((char **)&cs->retV) = (e == Val_unit) ? NULL : String_val(e);<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>break;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>case 'S':<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>*((NSString **)&cs->retV) = (e == Val_unit) ? NULL : [[NSString alloc] initWithCString:String_val(e)];<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>*((NSString **)&cs->retV) = (e == Val_unit) ? NULL : [[NSString alloc] initWithUTF8String:String_val(e)];<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>cs->_autorelease = TRUE;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>break;<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>case '@':<br>@@ -282,7 +283,7 @@<br> <span class="Apple-tab-span" style="white-space:pre"> </span>// NSLog(@"*** doCallback -- back with result");<br> <span class="Apple-tab-span" style="white-space:pre"> </span>if (cs->exception) {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>@throw [NSException exceptionWithName:@"OCamlException"<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>reason:[NSString stringWithCString:cs->exception]<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>reason:[NSString stringWithUTF8String:cs->exception]<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>userInfo:nil];<br> <span class="Apple-tab-span" style="white-space:pre"> </span>}<br> <span class="Apple-tab-span" style="white-space:pre"> </span>if (cs->_autorelease) [((id)cs->retV) autorelease];<br><br>Added: trunk/src/uimacnew/Info.plist<br>===================================================================<br>--- trunk/src/uimacnew/Info.plist<span class="Apple-tab-span" style="white-space:pre"> </span> (rev 0)<br>+++ trunk/src/uimacnew/Info.plist<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -0,0 +1,32 @@<br>+<?xml version="1.0" encoding="UTF-8"?><br>+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "<a href="http://www.apple.com/DTDs/PropertyList-1.0.dtd">http://www.apple.com/DTDs/PropertyList-1.0.dtd</a>"><br>+<plist version="1.0"><br>+<dict><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleName</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>Unison</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleDevelopmentRegion</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>English</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleExecutable</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>Unison</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleIconFile</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>Unison.icns</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleIdentifier</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>edu.upenn.cis.Unison</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleInfoDictionaryVersion</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>6.0</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundlePackageType</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>APPL</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleSignature</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>????</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleShortVersionString</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>$(MARKETING_VERSION)</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>CFBundleGetInfoString</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>${MARKETING_VERSION}, ©1999-2007, licensed under GNU GPL.</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>NSHumanReadableCopyright</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>©1999-2006, licensed under GNU GPL.</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>NSMainNibFile</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>MainMenu</string><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><key>NSPrincipalClass</key><br>+<span class="Apple-tab-span" style="white-space:pre"> </span><string>NSApplication</string><br>+</dict><br>+</plist><br><br>Modified: trunk/src/uimacnew/MyController.m<br>===================================================================<br>--- trunk/src/uimacnew/MyController.m<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ trunk/src/uimacnew/MyController.m<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -338,7 +338,7 @@<br> }<br> else {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>[self raisePasswordWindow:[NSString <br>- stringWithCString:String_val(Field(prompt,0))]];<br>+ stringWithUTF8String:String_val(Field(prompt,0))]];<br> return;<br> }<br> }<br>@@ -717,7 +717,7 @@<br> // A function called from ocaml<br> CAMLprim value displayStatus(value s)<br> {<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>NSString *str = [[NSString alloc] initWithCString:String_val(s)];<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)];<br> // NSLog(@"displayStatus: %@", str);<br> [me performSelectorOnMainThread:@selector(statusTextSet:) withObject:str waitUntilDone:FALSE];<br> <span class="Apple-tab-span" style="white-space:pre"> </span>[str release];<br>@@ -745,8 +745,8 @@<br> CAMLprim value displayDiff(value s, value s2)<br> {<br> [me performSelectorOnMainThread:@selector(diffViewTextSet:) <br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>withObject:[NSArray arrayWithObjects:[NSString stringWithCString:String_val(s)],<br>-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>[NSString stringWithCString:String_val(s2)], nil]<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:String_val(s)],<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>[NSString stringWithUTF8String:String_val(s2)], nil]<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>waitUntilDone:FALSE]; <br> return Val_unit;<br> }<br>@@ -754,7 +754,7 @@<br> // Called from ocaml to display diff error messages<br> CAMLprim value displayDiffErr(value s)<br> {<br>- NSString * str = [NSString stringWithCString:String_val(s)];<br>+ NSString * str = [NSString stringWithUTF8String:String_val(s)];<br> str = [[str componentsSeparatedByString:@"\n"] <br> componentsJoinedByString:@" "];<br> <span class="Apple-tab-span" style="white-space:pre"> </span>[me->statusText performSelectorOnMainThread:@selector(setStringValue:) <br>@@ -920,7 +920,7 @@<br> // [bundle pathForResource:@"cltool" ofType:nil];<br><br> if (exec_path == nil) return;<br>- char *args[] = { "-f", (char *)[exec_path cString], <br>+ char *args[] = { "-f", (char *)[exec_path UTF8String], <br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span> "/usr/bin/unison", NULL };<br><br> myFlags = kAuthorizationFlagDefaults;<br><br>Modified: trunk/src/uimacnew/ReconItem.m<br>===================================================================<br>--- trunk/src/uimacnew/ReconItem.m<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 13:42:13 UTC (rev 276)<br>+++ trunk/src/uimacnew/ReconItem.m<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -638,10 +638,10 @@<br><br> - (void)addChild:(ReconItem *)item pathArray:(NSArray *)pathArray level:(int)level<br> {<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>NSString *element = [pathArray objectAtIndex:level];<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>NSString *element = [pathArray count] ? [pathArray objectAtIndex:level] : @"";<br><br> <span class="Apple-tab-span" style="white-space:pre"> </span>// if we're at the leaf of the path, then add the item<br>-<span class="Apple-tab-span" style="white-space:pre"> </span>if (level == [pathArray count]-1) {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>if (((0 == [pathArray count]) && (0 == level)) || (level == [pathArray count]-1)) {<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>[item setParent:self];<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>[item setPath:element];<br> <span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>[_children addObject:item];<br><br>Added: trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<br>===================================================================<br>--- trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<span class="Apple-tab-span" style="white-space:pre"> </span> (rev 0)<br>+++ trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj<span class="Apple-tab-span" style="white-space:pre"> </span>2008-05-19 14:47:07 UTC (rev 277)<br>@@ -0,0 +1,734 @@<br>+// !$*UTF8*$!<br>+{<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>archiveVersion = 1;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>classes = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>objectVersion = 42;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span>objects = {<br>+<br>+/* Begin PBXAggregateTarget section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E780DE1C48400524237 /* Create ExternalSettings */ = {<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>isa = PBXAggregateTarget;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildConfigurationList = 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */;<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>buildPhases = (<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */,<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>dependencies = (<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>);<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>name = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>productName = "Create ExternalSettings";<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>};<br>+/* End PBXAggregateTarget section */<br>+<br>+/* Begin PBXBuildFile section */<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F3309922A8000E404E9 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2A3C3F3209922A8000E404E9 /* Growl.framework */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A3C3F7B09922D4900E404E9 /* NotificationController.m */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2A3C3FAE0992323F00E404E9 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A3C3F3209922A8000E404E9 /* Growl.framework */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E282CC70D9AE2B000439D01 /* unison-blob.o */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29260BFA5C1200E4E641 /* Outline-Flat.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */; };<br>+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"> </span>449F03E10BE00DE9003F15C8 /* Br