Merge pull request rowanj#189 from claybridges/claybridges-misc

Rewire/fix MGScopeBar compile errors, etc.

Author: tiennou

.gitmodules

@@ -9,7 +9,7 @@
 	url = https://github.com/alexgorbatchev/SyntaxHighlighter.git
 [submodule "MGScopeBar"]
 	path = External/MGScopeBar
-	url = https://github.com/rowanj/MGScopeBar.git
+	url = https://github.com/gitx/MGScopeBar.git
 [submodule "External/MAKVONotificationCenter"]
 	path = External/MAKVONotificationCenter
 	url = https://github.com/mikeash/MAKVONotificationCenter

External/MGScopeBar

@@ -343,6 +343,34 @@
 			remoteGlobalIDString = 551BF110112F371800265053;
 			remoteInfo = gitx_askpasswd;
 		};
+		6F9CFC2823327F1E0061EBAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4A68AD5814A0050E006DE321 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5AB8F19F214DA72000A1187F;
+			remoteInfo = generate_keys;
+		};
+		6F9CFC2A23327F1E0061EBAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4A68AD5814A0050E006DE321 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5A5ADED7214EDE4900DF0099;
+			remoteInfo = sign_update;
+		};
+		6F9CFC2C23327F1E0061EBAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4A68AD5814A0050E006DE321 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EA4311EA229D651300A5503D;
+			remoteInfo = bsdiff;
+		};
+		6F9CFC2E23327F1E0061EBAD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4A68AD5814A0050E006DE321 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EA4311A0229D5FBC00A5503D;
+			remoteInfo = ed25519;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -1093,6 +1121,10 @@
 				4D761CE61E552B1F004C3A6F /* UI Tests.xctest */,
 				4D761CE81E552B1F004C3A6F /* fileop */,
 				4D761CEA1E552B1F004C3A6F /* generate_appcast */,
+				6F9CFC2923327F1E0061EBAD /* generate_keys */,
+				6F9CFC2B23327F1E0061EBAD /* sign_update */,
+				6F9CFC2D23327F1E0061EBAD /* libbsdiff.a */,
+				6F9CFC2F23327F1E0061EBAD /* libed25519.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1184,7 +1216,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1100;
 			};
 			buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1321,6 +1353,34 @@
 			remoteRef = 4D901E031C237186004C3A6F /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		6F9CFC2923327F1E0061EBAD /* generate_keys */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = generate_keys;
+			remoteRef = 6F9CFC2823327F1E0061EBAD /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		6F9CFC2B23327F1E0061EBAD /* sign_update */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = sign_update;
+			remoteRef = 6F9CFC2A23327F1E0061EBAD /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		6F9CFC2D23327F1E0061EBAD /* libbsdiff.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libbsdiff.a;
+			remoteRef = 6F9CFC2C23327F1E0061EBAD /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		6F9CFC2F23327F1E0061EBAD /* libed25519.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libed25519.a;
+			remoteRef = 6F9CFC2E23327F1E0061EBAD /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */

External/Sparkle

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:GitX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -74,8 +72,6 @@
             isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

External/SyntaxHighlighter

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

External/objective-git

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+import os
+
+this_file = os.path.realpath(__file__)
+proj_dir = os.path.abspath(os.path.join(os.path.dirname(this_file), ".."))
+os.chdir(proj_dir)
+
+os.system("git submodule update --init --recursive")
+os.chdir("External/objective-git")
+os.system("script/bootstrap")
+os.system("script/update_libgit2")