diff --git a/.gitignore b/.gitignore index dc2f3d3ef..8f169f08b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.swp *~.nib -build/* +**/build/* .build/* build-iPhoneSimulator/* build-iPhoneOS/* diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index a2c2fafea..ed752a9af 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1225,8 +1225,6 @@ 79262F0F13C697BE00A4B1EA /* Copy git2 Headers */, BEF7E4DF1A3A47450035BB8E /* Copy git2 Headers again */, 8DC2EF500486A6940098B216 /* Headers */, - 4D751E9D215D765D003CD3CE /* Package external libraries */, - 37C7720A23A05A13006796C8 /* ShellScript */, ); buildRules = ( ); @@ -1283,14 +1281,13 @@ attributes = { LastSwiftUpdateCheck = 0700; LastTestingUpgradeCheck = 0510; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1120; ORGANIZATIONNAME = "GitHub, Inc"; TargetAttributes = { 88F05A6A16011E5400B7AD1D = { LastSwiftMigration = 0830; }; 8DC2EF4F0486A6940098B216 = { - DevelopmentTeam = 432ZXYXDNY; LastSwiftMigration = 0800; }; D01B6ED219F82E2000D411BC = { @@ -1359,37 +1356,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 37C7720A23A05A13006796C8 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n/usr/bin/codesign --deep --force --sign \"${CODE_SIGN_IDENTITY}\" --timestamp=none ${BUILT_PRODUCTS_DIR}/ObjectiveGit.framework/Versions/A\n"; - }; - 4D751E9D215D765D003CD3CE /* Package external libraries */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Package external libraries"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./script/repackage-dylibs.rb"; - }; 6A28265317C69CB400C6A948 /* OpenSSL-iOS */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1715,29 +1681,30 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "Apple Development"; - DEVELOPMENT_TEAM = 432ZXYXDNY; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - /usr/local/lib/libssh2.a, "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -1746,29 +1713,30 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0D8186A174421EB00995A2E /* Mac-Framework.xcconfig */; buildSettings = { - CODE_SIGN_IDENTITY = "Apple Development"; - DEVELOPMENT_TEAM = 432ZXYXDNY; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - /usr/local/lib/libssh2.a, "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Release; @@ -1798,13 +1766,12 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1837,12 +1804,11 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1970,12 +1936,11 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -1991,24 +1956,27 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - /usr/local/lib/libssh2.a, "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Test; @@ -2046,9 +2014,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2103,9 +2075,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2128,9 +2104,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2153,9 +2133,13 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", External/build/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", ); INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/External/build/lib"; + LIBRARY_SEARCH_PATHS = ( + "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", + ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = "-all_load"; PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2190,12 +2174,11 @@ ., External, ); - MACOSX_DEPLOYMENT_TARGET = 10.8; + MACOSX_DEPLOYMENT_TARGET = 10.12; OTHER_CFLAGS = ( "$(inherited)", "-DGIT_SSH", ); - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; WARNING_CFLAGS = ( "$(inherited)", @@ -2211,24 +2194,27 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = ( + External/libgit2/include, + "$(PROJECT_DIR)/../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/include", + ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/usr/local/opt/openssl@1.1/lib", "$(PROJECT_DIR)/External/build/lib", + "$(PROJECT_DIR)/../../ThirdPartyPreCompiled/OpenSSL/$(PLATFORM_NAME)/lib", ); MODULEMAP_FILE = ObjectiveGit.modulemap; OTHER_LDFLAGS = ( "-lgit2", "-force_load", External/libgit2.a, - /usr/local/lib/libssh2.a, "-lcrypto", - "-lssl", "-lcurl", ); PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ObjectiveGit; + SDKROOT = macosx10.15; WRAPPER_EXTENSION = framework; }; name = Profile; diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme index 2e7f2c268..d966bdc45 100644 --- a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -95,17 +104,6 @@ - - - - - - - - + + + + @@ -81,17 +90,6 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme new file mode 100644 index 000000000..aed8e5a5d --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2-iOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme new file mode 100644 index 000000000..758bed7a8 --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libgit2.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme new file mode 100644 index 000000000..877b81c3b --- /dev/null +++ b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/libssh2-iOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +