Skip to content

Commit 0a235f4

Browse files
committed
Merge pull request #200 from tiennou/script-fix
Add shebang to update scripts and fix Xcode references
2 parents 846b35c + 06d171d commit 0a235f4

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@
448448
D0D8186B174421EB00995A2E /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
449449
D0D8186C174421EB00995A2E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
450450
D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
451-
E46931A7172740D300F2077D /* update_libgit2.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = update_libgit2.sh; sourceTree = "<group>"; };
452-
E46931A8172740D300F2077D /* update_libgit2_ios.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = update_libgit2_ios.sh; sourceTree = "<group>"; };
451+
E46931A7172740D300F2077D /* update_libgit2 */ = {isa = PBXFileReference; lastKnownFileType = text; name = update_libgit2; path = script/update_libgit2; sourceTree = "<group>"; };
452+
E46931A8172740D300F2077D /* update_libgit2_ios */ = {isa = PBXFileReference; lastKnownFileType = text; name = update_libgit2_ios; path = script/update_libgit2_ios; sourceTree = "<group>"; };
453453
/* End PBXFileReference section */
454454

455455
/* Begin PBXFrameworksBuildPhase section */
@@ -793,8 +793,8 @@
793793
E46931A6172740D300F2077D /* Scripts */ = {
794794
isa = PBXGroup;
795795
children = (
796-
E46931A7172740D300F2077D /* update_libgit2.sh */,
797-
E46931A8172740D300F2077D /* update_libgit2_ios.sh */,
796+
E46931A7172740D300F2077D /* update_libgit2 */,
797+
E46931A8172740D300F2077D /* update_libgit2_ios */,
798798
);
799799
path = Scripts;
800800
sourceTree = "<group>";
@@ -1317,9 +1317,11 @@
13171317
GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch;
13181318
INFOPLIST_FILE = Info.plist;
13191319
OTHER_LDFLAGS = (
1320+
"-L/usr/local/lib",
13201321
"-lgit2",
13211322
"-force_load",
13221323
libgit2.a,
1324+
"-weak-lssh2",
13231325
);
13241326
PRODUCT_NAME = ObjectiveGit;
13251327
WRAPPER_EXTENSION = framework;
@@ -1336,9 +1338,11 @@
13361338
GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch;
13371339
INFOPLIST_FILE = Info.plist;
13381340
OTHER_LDFLAGS = (
1341+
"-L/usr/local/lib",
13391342
"-lgit2",
13401343
"-force_load",
13411344
libgit2.a,
1345+
"-weak-lssh2",
13421346
);
13431347
PRODUCT_NAME = ObjectiveGit;
13441348
WRAPPER_EXTENSION = framework;
@@ -1436,9 +1440,11 @@
14361440
GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch;
14371441
INFOPLIST_FILE = Info.plist;
14381442
OTHER_LDFLAGS = (
1443+
"-L/usr/local/lib",
14391444
"-lgit2",
14401445
"-force_load",
14411446
libgit2.a,
1447+
"-weak-lssh2",
14421448
);
14431449
PRODUCT_NAME = ObjectiveGit;
14441450
WRAPPER_EXTENSION = framework;

script/update_libgit2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/bin/sh
2+
13
set -e
24

35
# augment path to help it find cmake installed in /usr/local/bin,

script/update_libgit2_ios

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/bin/sh
2+
13
set -e
24

35
# augment path to help it find cmake installed in /usr/local/bin,

0 commit comments

Comments
 (0)