Commits

Jens Alfke  committed 0803957

*Added BWToolkit.xcodeproj and set up its framework as a direct dependency of the Murky target. Should fix build problems.
* Updated the README with instructions on how to set up BWToolkit.

  • Participants
  • Parent commits f7fcc89

Comments (0)

Files changed (2)

File Murky.xcodeproj/project.pbxproj

 		277C52120C56761000E60690 /* HgOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 277C52110C56761000E60690 /* HgOperation.m */; };
 		277D16B90C989715001D8600 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 277D16B80C989715001D8600 /* libicucore.dylib */; };
 		277E134410D5CA3400508D2B /* Murky.icns in Resources */ = {isa = PBXBuildFile; fileRef = 277E134310D5CA3400508D2B /* Murky.icns */; };
+		27874C5E10FBD8BF00F0B178 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27874C3310FBD53400F0B178 /* BWToolkitFramework.framework */; };
+		27874C9310FBDA4800F0B178 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27874C3310FBD53400F0B178 /* BWToolkitFramework.framework */; };
 		279089880FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 279089860FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf */; };
 		27A6B63F0CAC254500482D5D /* RepoController_Actions.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A6B63E0CAC254500482D5D /* RepoController_Actions.m */; };
 		27AA81BC0FADF65500D4FCBB /* CollectionUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 27AA81B50FADF65500D4FCBB /* CollectionUtils.m */; };
 		7364973C10107F5700B717B2 /* toolbar_update_to_revision.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973B10107F5700B717B2 /* toolbar_update_to_revision.png */; };
 		7364973E10107FDE00B717B2 /* toolbar_clone_repository_to.png in Resources */ = {isa = PBXBuildFile; fileRef = 7364973D10107FDE00B717B2 /* toolbar_clone_repository_to.png */; };
 		736AC3F0101096B500157930 /* toolbar_view_revision.png in Resources */ = {isa = PBXBuildFile; fileRef = 736AC3ED101096B500157930 /* toolbar_view_revision.png */; };
-		736B489610F2FA5200E420D7 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 736B489510F2FA5200E420D7 /* BWToolkitFramework.framework */; };
-		736B48C710F2FA5400E420D7 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 736B489510F2FA5200E420D7 /* BWToolkitFramework.framework */; };
 		73864C171012B9DA00EF650A /* status_ignored.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C141012B9DA00EF650A /* status_ignored.png */; };
 		73864C181012B9DA00EF650A /* status_needs_update.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C151012B9DA00EF650A /* status_needs_update.png */; };
 		73864C3D1012BB0D00EF650A /* status_deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 73864C3C1012BB0D00EF650A /* status_deleted.png */; };
 		D095A5170FBC376E00512681 /* status_null.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5160FBC376E00512681 /* status_null.png */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		27874C3010FBD53400F0B178 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8D1AC9740486D14A00FE50C9 /* BWToolkit.ibplugin */;
+			remoteInfo = BWToolkit;
+		};
+		27874C3210FBD53400F0B178 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 53DF68FD067E5B5A0090B5B0 /* BWToolkitFramework.framework */;
+			remoteInfo = BWToolkitFramework;
+		};
+		27874C5A10FBD88100F0B178 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0 /* BWToolkitFramework */;
+			remoteInfo = BWToolkitFramework;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		730B98BD10EF59CC004B9F6E /* Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				736B48C710F2FA5400E420D7 /* BWToolkitFramework.framework in Frameworks */,
+				27874C5E10FBD8BF00F0B178 /* BWToolkitFramework.framework in Frameworks */,
 			);
 			name = Frameworks;
 			runOnlyForDeploymentPostprocessing = 0;
 		277D16B80C989715001D8600 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
 		277E134310D5CA3400508D2B /* Murky.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Murky.icns; sourceTree = "<group>"; };
 		277E135C10D5CAD800508D2B /* mercurial-logo-official.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "mercurial-logo-official.icns"; sourceTree = "<group>"; };
+		27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = BWToolkit.xcodeproj; sourceTree = BWToolkit; };
 		279089870FBFD9CC00CEA97E /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/RevisionDescriptionTemplate.rtf; sourceTree = SOURCE_ROOT; };
 		27A6B63E0CAC254500482D5D /* RepoController_Actions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RepoController_Actions.m; sourceTree = "<group>"; };
 		27AA81A50FADF53100D4FCBB /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
 		7364973B10107F5700B717B2 /* toolbar_update_to_revision.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_update_to_revision.png; sourceTree = "<group>"; };
 		7364973D10107FDE00B717B2 /* toolbar_clone_repository_to.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_clone_repository_to.png; sourceTree = "<group>"; };
 		736AC3ED101096B500157930 /* toolbar_view_revision.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_view_revision.png; sourceTree = "<group>"; };
-		736B489510F2FA5200E420D7 /* BWToolkitFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BWToolkitFramework.framework; sourceTree = BWToolkit; };
 		73864C141012B9DA00EF650A /* status_ignored.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_ignored.png; sourceTree = "<group>"; };
 		73864C151012B9DA00EF650A /* status_needs_update.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_needs_update.png; sourceTree = "<group>"; };
 		73864C3C1012BB0D00EF650A /* status_deleted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_deleted.png; sourceTree = "<group>"; };
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				27874C9310FBDA4800F0B178 /* BWToolkitFramework.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 				277D16B90C989715001D8600 /* libicucore.dylib in Frameworks */,
 				73CA82D710135FC10081F0D8 /* ScriptingBridge.framework in Frameworks */,
-				736B489610F2FA5200E420D7 /* BWToolkitFramework.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 			path = Source;
 			sourceTree = "<group>";
 		};
+		27874C2B10FBD53400F0B178 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				27874C3110FBD53400F0B178 /* BWToolkit.ibplugin */,
+				27874C3310FBD53400F0B178 /* BWToolkitFramework.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		27AA81B30FADF60100D4FCBB /* MYUtilities */ = {
 			isa = PBXGroup;
 			children = (
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				736B489510F2FA5200E420D7 /* BWToolkitFramework.framework */,
+				27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */,
 				73CA82D610135FC10081F0D8 /* ScriptingBridge.framework */,
 				277D16B80C989715001D8600 /* libicucore.dylib */,
 				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
 			buildRules = (
 			);
 			dependencies = (
+				27874C5B10FBD88100F0B178 /* PBXTargetDependency */,
 			);
 			name = Murky;
 			productInstallPath = "$(HOME)/Applications";
 			hasScannedForEncodings = 1;
 			mainGroup = 29B97314FDCFA39411CA2CEA /* MercurialViewer */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 27874C2B10FBD53400F0B178 /* Products */;
+					ProjectRef = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				8D1107260486CEB800E47090 /* Murky */,
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		27874C3110FBD53400F0B178 /* BWToolkit.ibplugin */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = BWToolkit.ibplugin;
+			remoteRef = 27874C3010FBD53400F0B178 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		27874C3310FBD53400F0B178 /* BWToolkitFramework.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = BWToolkitFramework.framework;
+			remoteRef = 27874C3210FBD53400F0B178 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		8D1107290486CEB800E47090 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		27874C5B10FBD88100F0B178 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = BWToolkitFramework;
+			targetProxy = 27874C5A10FBD88100F0B178 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		279089860FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf */ = {
 			isa = PBXVariantGroup;
 Murky is a GUI client app for the Mercurial distributed version-control system. 
 It lets you manage repositories and source files without using a command-line.
 
-Website:  http://bitbucket.org/snej/murky/
+Website:       http://bitbucket.org/snej/murky/
+Mailing list:  http://groups.google.com/group/murky-app
+Bug tracker:   http://bitbucket.org/snej/murky/issues/?status=new&status=open
 
 
 = BUILDING IT =
     - Apple's Xcode tools, version 3.1+
 
 Dependencies:
+    - Mercurial, of course <http://mercurial.selenic.com/downloads/>
     - MYUtilities <http://bitbucket.org/snej/myutilities/>
+    - BWToolkit <http://bitbucket.org/bwalkin/bwtoolkit/>
 
 First-Time Configuration:
 
     Before the first time you build, you'll need to tell Xcode where the MYUtilities sources are. 
     You do this by setting up a named 'Source Tree':
 
- 0. Clone or download MYUtilities
- 1. Open Xcode's Preferences panel
- 2. Click the "Source Trees" icon at the top
- 3. Click the "+" button to add a new item to the list
- 4. Fill in the Setting Name as "MYUtilities", 
+ 1. Clone or download MYUtilities
+ 2. Clone or download BWToolkit.
+ 3. Open Xcode's Preferences panel
+ 4. Click the "Source Trees" icon at the top
+ 5. Click the "+" button to add a new item to the list
+ 6. Fill in the Setting Name as "MYUtilities", 
     the Display Name also as "MYUtilities", 
     and the Path as the absolute filesystem path to where you put MYUtilities. 
     (Do not use a "~" (tilde) in this path! The compiler won't understand it.)
+ 7. Repeat steps 5-6 to add a new item named "BWToolkit", whose path points to
+    where you put BWToolkit.
+    
+ You'll also need to install the BWToolkit Interface Builder plugin:
+    
+ 1. Open BWToolkit.xcodeproj and build it.
+ 2. In the Finder, open BWToolkit's build output folder.
+ 3. Double-click "BWToolkit.ibplugin", to install it into IB.
     
 Once you're configured, just open Murky.xcodeproj and choose "Build".
 
 
 This is a BSD license:
 
- Copyright (c) 2008-2009, Jens Alfke <jens@mooseyard.com>. All rights reserved.
+ Copyright (c) 2008-2010, Jens Alfke <jens@mooseyard.com>. All rights reserved.
  
  Redistribution and use in source and binary forms, with or without modification, are permitted
  provided that the following conditions are met: