Skip to content

Commit 3e3bea1

Browse files
tiennoutiennou
committed
Rename macOS libgit.a
1 parent a12b11c commit 3e3bea1

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
*.xccheckout
1414
*.xcscmblueprint
1515

16+
External/libgit2-mac.a
1617
Carthage/Build
1718

‎ObjectiveGitFramework.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@
9393
4D5AB89422874300003CD3CE /* EXTScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 306123A917EA5261006591D4 /* EXTScope.h */; };
9494
4D79C0EE17DF9F4D00997DE4 /* GTCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D79C0EC17DF9F4D00997DE4 /* GTCredential.h */; settings = {ATTRIBUTES = (Public, ); }; };
9595
4D79C0EF17DF9F4D00997DE4 /* GTCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D79C0ED17DF9F4D00997DE4 /* GTCredential.m */; };
96-
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
9796
4D9BCD25206D84B2003CD3CE /* libgit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D9BCD23206D84AD003CD3CE /* libgit2.a */; };
9897
4DBA4A3217DA73CE006CD5F5 /* GTRemoteSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */; };
9998
4DC55AE51AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
10099
4DC55AE61AD859AD0032563C /* GTCheckoutOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
101100
4DC55AE71AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; };
102101
4DC55AE81AD859AD0032563C /* GTCheckoutOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */; };
103102
4DFA918F207D0B87003CD3CE /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8D63865207ACCAA00D1FD32 /* Nimble.framework */; };
103+
4DD7422C25D3F8CB009D9A17 /* libgit2-mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */; };
104104
4DFFB15B183AA8D600D1565E /* GTRepository+RemoteOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */; settings = {ATTRIBUTES = (Public, ); }; };
105105
4DFFB15C183AA8D600D1565E /* GTRepository+RemoteOperations.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */; };
106106
55C8055013861FE7004DCB0F /* GTObjectDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C8054D13861F34004DCB0F /* GTObjectDatabase.m */; };
@@ -502,6 +502,7 @@
502502
4DBA4A3117DA73CE006CD5F5 /* GTRemoteSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRemoteSpec.m; sourceTree = "<group>"; };
503503
4DC55AE31AD859AD0032563C /* GTCheckoutOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTCheckoutOptions.h; sourceTree = "<group>"; };
504504
4DC55AE41AD859AD0032563C /* GTCheckoutOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTCheckoutOptions.m; sourceTree = "<group>"; };
505+
4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgit2-mac.a"; path = "External/libgit2-mac.a"; sourceTree = "<group>"; };
505506
4DE864341794A37E00371A65 /* GTRepository+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Private.h"; sourceTree = "<group>"; };
506507
4DFFB159183AA8D600D1565E /* GTRepository+RemoteOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+RemoteOperations.h"; sourceTree = "<group>"; };
507508
4DFFB15A183AA8D600D1565E /* GTRepository+RemoteOperations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+RemoteOperations.m"; sourceTree = "<group>"; };
@@ -691,7 +692,7 @@
691692
files = (
692693
F8D6385D207AC75100D1FD32 /* libz.tbd in Frameworks */,
693694
F8D6385C207AC74A00D1FD32 /* libiconv.tbd in Frameworks */,
694-
4D9BCD24206D84AD003CD3CE /* libgit2.a in Frameworks */,
695+
4DD7422C25D3F8CB009D9A17 /* libgit2-mac.a in Frameworks */,
695696
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
696697
);
697698
runOnlyForDeploymentPostprocessing = 0;
@@ -766,6 +767,7 @@
766767
6A1F2FD417C6A8F3003DFADE /* libssl.a */,
767768
6A502B8617D6892D00BAF4A5 /* libssh2.a */,
768769
4D9BCD23206D84AD003CD3CE /* libgit2.a */,
770+
4DD7422B25D3F8CB009D9A17 /* libgit2-mac.a */,
769771
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
770772
D0A0128B19F9853D007F1914 /* Nimble.framework */,
771773
F8D63865207ACCAA00D1FD32 /* Nimble.framework */,
@@ -1730,12 +1732,13 @@
17301732
"$(inherited)",
17311733
/usr/local/opt/openssl/lib,
17321734
"$(PROJECT_DIR)/External/build/lib",
1735+
"$(PROJECT_DIR)/External",
17331736
);
17341737
MODULEMAP_FILE = ObjectiveGit.modulemap;
17351738
OTHER_LDFLAGS = (
17361739
"-lgit2",
17371740
"-force_load",
1738-
External/libgit2.a,
1741+
"External/libgit2-mac.a",
17391742
/usr/local/lib/libssh2.a,
17401743
"-lcrypto",
17411744
"-lssl",
@@ -1758,12 +1761,13 @@
17581761
"$(inherited)",
17591762
/usr/local/opt/openssl/lib,
17601763
"$(PROJECT_DIR)/External/build/lib",
1764+
"$(PROJECT_DIR)/External",
17611765
);
17621766
MODULEMAP_FILE = ObjectiveGit.modulemap;
17631767
OTHER_LDFLAGS = (
17641768
"-lgit2",
17651769
"-force_load",
1766-
External/libgit2.a,
1770+
"External/libgit2-mac.a",
17671771
/usr/local/lib/libssh2.a,
17681772
"-lcrypto",
17691773
"-lssl",
@@ -1993,12 +1997,13 @@
19931997
"$(inherited)",
19941998
/usr/local/opt/openssl/lib,
19951999
"$(PROJECT_DIR)/External/build/lib",
2000+
"$(PROJECT_DIR)/External",
19962001
);
19972002
MODULEMAP_FILE = ObjectiveGit.modulemap;
19982003
OTHER_LDFLAGS = (
19992004
"-lgit2",
20002005
"-force_load",
2001-
External/libgit2.a,
2006+
"External/libgit2-mac.a",
20022007
/usr/local/lib/libssh2.a,
20032008
"-lcrypto",
20042009
"-lssl",
@@ -2210,12 +2215,13 @@
22102215
"$(inherited)",
22112216
/usr/local/opt/openssl/lib,
22122217
"$(PROJECT_DIR)/External/build/lib",
2218+
"$(PROJECT_DIR)/External",
22132219
);
22142220
MODULEMAP_FILE = ObjectiveGit.modulemap;
22152221
OTHER_LDFLAGS = (
22162222
"-lgit2",
22172223
"-force_load",
2218-
External/libgit2.a,
2224+
"External/libgit2-mac.a",
22192225
/usr/local/lib/libssh2.a,
22202226
"-lcrypto",
22212227
"-lssl",

‎script/update_libgit2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -e
77
# ~/.MacOSX/environment.plist
88
PATH="/usr/local/bin:$PATH"
99

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

3535
product="libgit2.a"
36-
install_path="../../${product}"
37-
if [ "${product}" -nt "${install_path}" ]; then
38-
cp -v "${product}" "${install_path}"
36+
install_path="../../"
37+
if [ "libgit2.a" -nt "${install_path}/libgit2-mac.a" ]; then
38+
cp -v "libgit2.a" "${install_path}/libgit2-mac.a"
3939
fi
4040

4141
echo "libgit2 has been updated."

0 commit comments

Comments
 (0)