Skip to content

Commit

Permalink
Rename macOS libgit.a
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiennou
tiennou committed Feb 10, 2021
1 parent a12b11c commit 3e3bea1
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
*.xccheckout
*.xcscmblueprint

External/libgit2-mac.a
Carthage/Build

18 changes: 12 additions & 6 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@
4D5AB89422874300003CD3CE /* EXTScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 306123A917EA5261006591D4 /* EXTScope.h */; };
4D79C0EE17DF9F4D00997DE4 /* GTCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */; settings = {ATTRIBUTES = (Public, ); }; };
4D79C0EF17DF9F4D00997DE4 /* GTCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */; };
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
4D9BCD25206D84B2003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
4DBA4A3217DA73CE006CD5F5 /* GTRemoteSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */; };
4DC55AE51AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DC55AE61AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DC55AE71AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; };
4DC55AE81AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; };
4DFA918F207D0B87003CD3CE /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63865207ACCAA00D1FD32 /* Nimble.framework */; };
4DD7422C25D3F8CB009D9A17 /* libgit2-mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */; };
4DFFB15B183AA8D600D1565E /* GTRepository+RemoteOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DFFB15C183AA8D600D1565E /* GTRepository+RemoteOperations.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */; };
55C8055013861FE7004DCB0F /* GTObjectDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C8054D13861F34004DCB0F /* GTObjectDatabase.m */; };
Expand Down Expand Up @@ -502,6 +502,7 @@
4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemoteSpec.m; sourceTree = "<group>"; };
4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCheckoutOptions.h; sourceTree = "<group>"; };
4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCheckoutOptions.m; sourceTree = "<group>"; };
4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgit2-mac.a"; path = "External/libgit2-mac.a"; sourceTree = "<group>"; };
4DE864341794A37E00371A65 /* GTRepository+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Private.h"; sourceTree = "<group>"; };
4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+RemoteOperations.h"; sourceTree = "<group>"; };
4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+RemoteOperations.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -691,7 +692,7 @@
files = (
F8D6385D207AC75100D1FD32 /* libz.tbd in Frameworks */,
F8D6385C207AC74A00D1FD32 /* libiconv.tbd in Frameworks */,
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */,
4DD7422C25D3F8CB009D9A17 /* libgit2-mac.a in Frameworks */,
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -766,6 +767,7 @@
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
6A502B8617D6892D00BAF4A5 /* libssh2.a */,
4D9BCD23206D84AD003CD3CE /* libgit2.a */,
4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */,
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
D0A0128B19F9853D007F1914 /* Nimble.framework */,
F8D63865207ACCAA00D1FD32 /* Nimble.framework */,
Expand Down Expand Up @@ -1730,12 +1732,13 @@
"$(inherited)",
/usr/local/opt/openssl/lib,
"$(PROJECT_DIR)/External/build/lib",
"$(PROJECT_DIR)/External",
);
MODULEMAP_FILE = ObjectiveGit.modulemap;
OTHER_LDFLAGS = (
"-lgit2",
"-force_load",
External/libgit2.a,
"External/libgit2-mac.a",
/usr/local/lib/libssh2.a,
"-lcrypto",
"-lssl",
Expand All @@ -1758,12 +1761,13 @@
"$(inherited)",
/usr/local/opt/openssl/lib,
"$(PROJECT_DIR)/External/build/lib",
"$(PROJECT_DIR)/External",
);
MODULEMAP_FILE = ObjectiveGit.modulemap;
OTHER_LDFLAGS = (
"-lgit2",
"-force_load",
External/libgit2.a,
"External/libgit2-mac.a",
/usr/local/lib/libssh2.a,
"-lcrypto",
"-lssl",
Expand Down Expand Up @@ -1993,12 +1997,13 @@
"$(inherited)",
/usr/local/opt/openssl/lib,
"$(PROJECT_DIR)/External/build/lib",
"$(PROJECT_DIR)/External",
);
MODULEMAP_FILE = ObjectiveGit.modulemap;
OTHER_LDFLAGS = (
"-lgit2",
"-force_load",
External/libgit2.a,
"External/libgit2-mac.a",
/usr/local/lib/libssh2.a,
"-lcrypto",
"-lssl",
Expand Down Expand Up @@ -2210,12 +2215,13 @@
"$(inherited)",
/usr/local/opt/openssl/lib,
"$(PROJECT_DIR)/External/build/lib",
"$(PROJECT_DIR)/External",
);
MODULEMAP_FILE = ObjectiveGit.modulemap;
OTHER_LDFLAGS = (
"-lgit2",
"-force_load",
External/libgit2.a,
"External/libgit2-mac.a",
/usr/local/lib/libssh2.a,
"-lcrypto",
"-lssl",
Expand Down
8 changes: 4 additions & 4 deletions script/update_libgit2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
# ~/.MacOSX/environment.plist
PATH="/usr/local/bin:$PATH"

if [ "External/libgit2.a" -nt "External/libgit2" ]
if [ "External/libgit2-mac.a" -nt "External/libgit2" ]
then
echo "No update needed."
exit 0
Expand All @@ -33,9 +33,9 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \
cmake --build .

product="libgit2.a"
install_path="../../${product}"
if [ "${product}" -nt "${install_path}" ]; then
cp -v "${product}" "${install_path}"
install_path="../../"
if [ "libgit2.a" -nt "${install_path}/libgit2-mac.a" ]; then
cp -v "libgit2.a" "${install_path}/libgit2-mac.a"
fi

echo "libgit2 has been updated."

0 comments on commit 3e3bea1

Please sign in to comment.