Commits

Raphael Sebbe  committed 4b18ec3

Reorganized for easier initial build of Murky, BWToolkit is now a subrepo.

  • Participants
  • Parent commits 6376f76

Comments (0)

Files changed (3)

 ext/MYUtilities = ../myutilities
-ext/BWToolkit = ../../bwalkin/bwtoolkit
+ext/BWToolkit = https://bitbucket.org/bwalkin/bwtoolkit
+
+# With Mercurial 1.8 or newer, we can refer to the one on github with more recent changes
+#ext/BWToolkit = [git]git://github.com/glebd/bwtoolkit.git
-0000000000000000000000000000000000000000 ext/BWToolkit
+590c12e68e7a9a35efc753ddfa2fa14217eb3da6 ext/BWToolkit
 be44ee9a6a2a2f6be6071e0a0e714bf759064e99 ext/MYUtilities

File Murky.xcodeproj/project.pbxproj

 	objects = {
 
 /* Begin PBXBuildFile section */
-		05EF632212F0880400D1FAE5 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05EF629D12F0859200D1FAE5 /* BWToolkitFramework.framework */; };
-		05EF632A12F0895700D1FAE5 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05EF629D12F0859200D1FAE5 /* BWToolkitFramework.framework */; };
+		059F4DC913519EA300B8C4F5 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 059F4DC713519E8D00B8C4F5 /* BWToolkitFramework.framework */; };
+		059F4DCA13519EAA00B8C4F5 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 059F4DC713519E8D00B8C4F5 /* BWToolkitFramework.framework */; };
 		270E509D0C56A5400069C9C6 /* HgDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 270E509C0C56A5400069C9C6 /* HgDir.m */; };
 		270E51290C56AD520069C9C6 /* HgLogOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 270E51280C56AD520069C9C6 /* HgLogOperation.m */; };
 		270E512D0C56AED10069C9C6 /* changeset.tmpl in Resources */ = {isa = PBXBuildFile; fileRef = 270E512B0C56AED10069C9C6 /* changeset.tmpl */; };
 		D095A5170FBC376E00512681 /* status_null.png in Resources */ = {isa = PBXBuildFile; fileRef = D095A5160FBC376E00512681 /* status_null.png */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		05EF629A12F0859200D1FAE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8D1AC9740486D14A00FE50C9;
-			remoteInfo = BWToolkit;
-		};
-		05EF629C12F0859200D1FAE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 53DF68FD067E5B5A0090B5B0;
-			remoteInfo = BWToolkitFramework;
-		};
-		05EF62F512F0864900D1FAE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0;
-			remoteInfo = BWToolkitFramework;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
 		730B98BD10EF59CC004B9F6E /* Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				05EF632A12F0895700D1FAE5 /* BWToolkitFramework.framework in Frameworks */,
+				059F4DCA13519EAA00B8C4F5 /* BWToolkitFramework.framework in Frameworks */,
 			);
 			name = Frameworks;
 			runOnlyForDeploymentPostprocessing = 0;
 
 /* Begin PBXFileReference section */
 		05141E2213218BA800885FDB /* MYUtilities.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = MYUtilities.xcconfig; sourceTree = "<group>"; };
+		059F4DC713519E8D00B8C4F5 /* BWToolkitFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BWToolkitFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		270E509B0C56A5400069C9C6 /* HgDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HgDir.h; sourceTree = "<group>"; };
 		270E509C0C56A5400069C9C6 /* HgDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HgDir.m; sourceTree = "<group>"; };
 		271CE83F0CB18B5D000387BF /* HgUncommittedRevision.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HgUncommittedRevision.m; sourceTree = "<group>"; };
 		272AB4C80C8DD2600068C695 /* HgConfigFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HgConfigFile.h; sourceTree = "<group>"; };
 		272AB4C90C8DD2600068C695 /* HgConfigFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HgConfigFile.m; sourceTree = "<group>"; };
-		274677E60FBF5E4D0091FB94 /* French */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = French; path = French.lproj/Projects.xib; sourceTree = SOURCE_ROOT; };
-		274677E70FBF5E550091FB94 /* French */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = French; path = French.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
 		274677EA0FBF5E710091FB94 /* French */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = French; path = ../French.lproj/Credits.rtf; sourceTree = "<group>"; };
 		275938640C93200B0088FFF4 /* ProjectsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectsController.h; sourceTree = "<group>"; };
 		275938650C93200B0088FFF4 /* ProjectsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectsController.m; sourceTree = "<group>"; };
 		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"; name = BWToolkit.xcodeproj; path = ../../BWToolkit/bwtoolkit/BWToolkit.xcodeproj; sourceTree = SOURCE_ROOT; };
+		27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BWToolkit.xcodeproj; path = ext/BWToolkit/BWToolkit.xcodeproj; sourceTree = SOURCE_ROOT; };
 		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>"; };
 		27C656FC0FAE0DC100CFB909 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = ../English.lproj/Credits.rtf; sourceTree = "<group>"; };
 		27C6572C0FAE743800CFB909 /* TextEditors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TextEditors.plist; sourceTree = "<group>"; };
 		27C657A00FAEA7E800CFB909 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Projects.xib; sourceTree = SOURCE_ROOT; };
-		27C657A20FAEA7F900CFB909 /* German */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = German; path = German.lproj/Projects.xib; sourceTree = SOURCE_ROOT; };
 		27C657A40FAEA80D00CFB909 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Repo.xib; sourceTree = SOURCE_ROOT; };
 		27C657A80FAEA82300CFB909 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
-		27C657A90FAEA82300CFB909 /* German */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = German; path = German.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; };
 		27D124F40C8F501B0075446A /* URLFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLFormatter.h; sourceTree = "<group>"; };
 		27D124F50C8F501B0075446A /* URLFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLFormatter.m; sourceTree = "<group>"; };
 		27D918800C890F5500D53A8D /* xmlminimal.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xmlminimal.style; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		32CA4F630368D1EE00C91783 /* Murky_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Murky_Prefix.pch; sourceTree = "<group>"; };
-		37915E7610E904A90057D687 /* French */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = French; path = French.lproj/Repo.xib; sourceTree = SOURCE_ROOT; };
-		37915E7710E904AC0057D687 /* German */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = German; path = German.lproj/Repo.xib; sourceTree = SOURCE_ROOT; };
 		37915E7810E904BC0057D687 /* French */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		37915E7910E904BE0057D687 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		37915E7A10E904CE0057D687 /* French */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
 			files = (
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 				277D16B90C989715001D8600 /* libicucore.dylib in Frameworks */,
+				059F4DC913519EA300B8C4F5 /* BWToolkitFramework.framework in Frameworks */,
 				73CA82D710135FC10081F0D8 /* ScriptingBridge.framework in Frameworks */,
-				05EF632212F0880400D1FAE5 /* BWToolkitFramework.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		05EF629512F0859200D1FAE5 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				05EF629B12F0859200D1FAE5 /* BWToolkit.ibplugin */,
-				05EF629D12F0859200D1FAE5 /* BWToolkitFramework.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		080E96DDFE201D6D7F000001 /* User Interface */ = {
 			isa = PBXGroup;
 			children = (
 				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
 				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
 				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+				059F4DC713519E8D00B8C4F5 /* BWToolkitFramework.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 			buildRules = (
 			);
 			dependencies = (
-				05EF62F612F0864900D1FAE5 /* PBXTargetDependency */,
 			);
 			name = Murky;
 			productInstallPath = "$(HOME)/Applications";
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* MercurialViewer */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 05EF629512F0859200D1FAE5 /* Products */;
-					ProjectRef = 27874BFF10FBCE3800F0B178 /* BWToolkit.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				8D1107260486CEB800E47090 /* Murky */,
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		05EF629B12F0859200D1FAE5 /* BWToolkit.ibplugin */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = BWToolkit.ibplugin;
-			remoteRef = 05EF629A12F0859200D1FAE5 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		05EF629D12F0859200D1FAE5 /* BWToolkitFramework.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = BWToolkitFramework.framework;
-			remoteRef = 05EF629C12F0859200D1FAE5 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		8D1107290486CEB800E47090 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		05EF62F612F0864900D1FAE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = BWToolkitFramework;
-			targetProxy = 05EF62F512F0864900D1FAE5 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		279089860FBFD9CC00CEA97E /* RevisionDescriptionTemplate.rtf */ = {
 			isa = PBXVariantGroup;
 			isa = PBXVariantGroup;
 			children = (
 				27C657A00FAEA7E800CFB909 /* English */,
-				27C657A20FAEA7F900CFB909 /* German */,
-				274677E60FBF5E4D0091FB94 /* French */,
 			);
 			name = Projects.xib;
 			sourceTree = "<group>";
 			isa = PBXVariantGroup;
 			children = (
 				27C657A40FAEA80D00CFB909 /* English */,
-				37915E7610E904A90057D687 /* French */,
-				37915E7710E904AC0057D687 /* German */,
 			);
 			name = Repo.xib;
 			sourceTree = "<group>";
 			isa = PBXVariantGroup;
 			children = (
 				27C657A80FAEA82300CFB909 /* English */,
-				27C657A90FAEA82300CFB909 /* German */,
-				274677E70FBF5E550091FB94 /* French */,
 			);
 			name = MainMenu.xib;
 			sourceTree = "<group>";