Skip to content

Commit e4a0cf6

Browse files
laullonlaullon
committed
Merge pull request brotherbard#66 from RomainMuller/update_libgit2
Update libgit2 to 0.12
2 parents 94efa43 + a317561 commit e4a0cf6

File tree

9 files changed

+48
-22
lines changed

9 files changed

+48
-22
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "libgit2"]
22
path = libgit2
3-
url = git://repo.or.cz/libgit2.git
3+
url = git://github.com/RomainMuller/libgit2.git

‎GitX.xcodeproj/project.pbxproj

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
F5B721C30E05CF7E00AF29DC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
504504
F5C007730E731B48007B84B2 /* PBGitRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRef.h; sourceTree = "<group>"; };
505505
F5C007740E731B48007B84B2 /* PBGitRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRef.m; sourceTree = "<group>"; };
506-
F5C580E40EDA250900995434 /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgit2.a; path = libgit2/libgit2.a; sourceTree = "<group>"; };
506+
F5C580E40EDA250900995434 /* libgit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgit2.a; sourceTree = BUILT_PRODUCTS_DIR; };
507507
F5C6F68B0E65FF9300478D97 /* PBGitLane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitLane.h; sourceTree = "<group>"; };
508508
F5C6F68C0E65FF9300478D97 /* PBGitLane.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitLane.mm; sourceTree = "<group>"; };
509509
F5D2DC850EA401A80034AD24 /* PBGitConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitConfig.h; sourceTree = "<group>"; };
@@ -1227,6 +1227,7 @@
12271227
isa = PBXProject;
12281228
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
12291229
compatibilityVersion = "Xcode 3.1";
1230+
developmentRegion = English;
12301231
hasScannedForEncodings = 1;
12311232
knownRegions = (
12321233
English,
@@ -1604,6 +1605,7 @@
16041605
26FC0A850875C7B200E6366F /* Debug */ = {
16051606
isa = XCBuildConfiguration;
16061607
buildSettings = {
1608+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
16071609
COPY_PHASE_STRIP = NO;
16081610
FRAMEWORK_SEARCH_PATHS = (
16091611
"$(inherited)",
@@ -1616,13 +1618,14 @@
16161618
GCC_OPTIMIZATION_LEVEL = 0;
16171619
GCC_PRECOMPILE_PREFIX_HEADER = YES;
16181620
GCC_PREFIX_HEADER = GitX_Prefix.pch;
1619-
HEADER_SEARCH_PATHS = libgit2/src;
1621+
HEADER_SEARCH_PATHS = libgit2/include;
16201622
INFOPLIST_FILE = Info.plist;
16211623
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
16221624
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision;
16231625
INFOPLIST_PREPROCESS = YES;
16241626
INSTALL_PATH = "$(HOME)/Applications";
1625-
LIBRARY_SEARCH_PATHS = libgit2;
1627+
LIBRARY_SEARCH_PATHS = "";
1628+
ONLY_ACTIVE_ARCH = YES;
16261629
PRODUCT_NAME = GitX;
16271630
SDKROOT = "";
16281631
WRAPPER_EXTENSION = app;
@@ -1633,6 +1636,7 @@
16331636
26FC0A860875C7B200E6366F /* Release */ = {
16341637
isa = XCBuildConfiguration;
16351638
buildSettings = {
1639+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
16361640
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
16371641
FRAMEWORK_SEARCH_PATHS = (
16381642
"$(inherited)",
@@ -1643,13 +1647,13 @@
16431647
GCC_PRECOMPILE_PREFIX_HEADER = YES;
16441648
GCC_PREFIX_HEADER = GitX_Prefix.pch;
16451649
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
1646-
HEADER_SEARCH_PATHS = libgit2/src;
1650+
HEADER_SEARCH_PATHS = libgit2/include;
16471651
INFOPLIST_FILE = Info.plist;
16481652
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
16491653
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision;
16501654
INFOPLIST_PREPROCESS = YES;
16511655
INSTALL_PATH = "$(HOME)/Applications";
1652-
LIBRARY_SEARCH_PATHS = libgit2;
1656+
LIBRARY_SEARCH_PATHS = "";
16531657
PRODUCT_NAME = GitX;
16541658
SDKROOT = "";
16551659
WRAPPER_EXTENSION = app;
@@ -1695,6 +1699,7 @@
16951699
isa = XCBuildConfiguration;
16961700
buildSettings = {
16971701
ALWAYS_SEARCH_USER_PATHS = NO;
1702+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
16981703
COPY_PHASE_STRIP = NO;
16991704
GCC_DYNAMIC_NO_PIC = NO;
17001705
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -1703,6 +1708,7 @@
17031708
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17041709
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
17051710
INSTALL_PATH = /usr/local/bin;
1711+
ONLY_ACTIVE_ARCH = YES;
17061712
OTHER_LDFLAGS = (
17071713
"-framework",
17081714
Foundation,
@@ -1719,6 +1725,7 @@
17191725
isa = XCBuildConfiguration;
17201726
buildSettings = {
17211727
ALWAYS_SEARCH_USER_PATHS = NO;
1728+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17221729
COPY_PHASE_STRIP = YES;
17231730
DEBUG_INFORMATION_FORMAT = dwarf;
17241731
GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -1743,6 +1750,7 @@
17431750
isa = XCBuildConfiguration;
17441751
buildSettings = {
17451752
ALWAYS_SEARCH_USER_PATHS = NO;
1753+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17461754
GCC_ENABLE_FIX_AND_CONTINUE = YES;
17471755
GCC_MODEL_TUNING = G5;
17481756
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1763,6 +1771,7 @@
17631771
913D5E4B0E55644600CECEA2 /* Debug */ = {
17641772
isa = XCBuildConfiguration;
17651773
buildSettings = {
1774+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17661775
COPY_PHASE_STRIP = NO;
17671776
GCC_DYNAMIC_NO_PIC = NO;
17681777
GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -1771,7 +1780,8 @@
17711780
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17721781
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
17731782
INSTALL_PATH = /usr/local/bin;
1774-
LIBRARY_SEARCH_PATHS = libgit2;
1783+
LIBRARY_SEARCH_PATHS = "";
1784+
ONLY_ACTIVE_ARCH = YES;
17751785
OTHER_LDFLAGS = (
17761786
"-framework",
17771787
Foundation,
@@ -1788,14 +1798,15 @@
17881798
913D5E4C0E55644600CECEA2 /* Release */ = {
17891799
isa = XCBuildConfiguration;
17901800
buildSettings = {
1801+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17911802
COPY_PHASE_STRIP = YES;
17921803
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
17931804
GCC_ENABLE_FIX_AND_CONTINUE = NO;
17941805
GCC_MODEL_TUNING = G5;
17951806
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17961807
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
17971808
INSTALL_PATH = /usr/local/bin;
1798-
LIBRARY_SEARCH_PATHS = libgit2;
1809+
LIBRARY_SEARCH_PATHS = "";
17991810
OTHER_LDFLAGS = (
18001811
"-framework",
18011812
Foundation,
@@ -1812,6 +1823,7 @@
18121823
D8022B1511DFCE7F003C21F6 /* Debug */ = {
18131824
isa = XCBuildConfiguration;
18141825
buildSettings = {
1826+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18151827
COPY_PHASE_STRIP = NO;
18161828
GCC_DYNAMIC_NO_PIC = NO;
18171829
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1823,6 +1835,7 @@
18231835
D8022B1611DFCE7F003C21F6 /* Release */ = {
18241836
isa = XCBuildConfiguration;
18251837
buildSettings = {
1838+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18261839
COPY_PHASE_STRIP = YES;
18271840
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
18281841
GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -1835,6 +1848,7 @@
18351848
F56439F80F792B2100A579C2 /* Debug */ = {
18361849
isa = XCBuildConfiguration;
18371850
buildSettings = {
1851+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18381852
COPY_PHASE_STRIP = NO;
18391853
GCC_DYNAMIC_NO_PIC = NO;
18401854
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1846,6 +1860,7 @@
18461860
F56439F90F792B2100A579C2 /* Release */ = {
18471861
isa = XCBuildConfiguration;
18481862
buildSettings = {
1863+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18491864
COPY_PHASE_STRIP = YES;
18501865
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
18511866
GCC_ENABLE_FIX_AND_CONTINUE = NO;

‎PBGitGrapher.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import "PBGitLane.h"
1212
#import "PBGitGraphLine.h"
1313
#import <list>
14-
#import "git/oid.h"
14+
#import <git2/oid.h>
1515

1616
using namespace std;
1717

‎PBGitLane.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright 2008 __MyCompanyName__. All rights reserved.
77
//
88
#import <Cocoa/Cocoa.h>
9-
#include "git/oid.h"
9+
#include <git2/oid.h>
1010

1111
class PBGitLane {
1212
static int s_colorIndex;

‎PBGitRevList.mm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#include <string>
1818
#include <map>
1919

20+
#include <git2/errors.h>
21+
2022
using namespace std;
2123

2224

‎PBGitSHA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import <Cocoa/Cocoa.h>
10-
#include "git/oid.h"
10+
#include <git2/oid.h>
1111

1212

1313
@interface PBGitSHA : NSObject <NSCopying> {

‎PBGitSHA.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "PBGitSHA.h"
10-
10+
#import <git2/errors.h>
1111

1212
@interface PBGitSHA ()
1313

‎build_libgit2.sh

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,29 @@
99
# based on: http://log.yeahrightkeller.com/post/270155578/run-script-while-cleaning-in-xcode
1010

1111
buildAction () {
12-
echo "Building libgit2..."
12+
echo "Building libgit2..."
1313
if [[ -d .git ]]
1414
then
15-
if [ "$(which git)" == "" ]; then
16-
echo "git not found"
17-
exit -1
18-
fi
15+
if [ "$(which git)" == "" ]; then
16+
echo "git not found"
17+
exit -1
18+
fi
1919
git submodule init
2020
git submodule sync
2121
git submodule update
2222
cd libgit2
23-
rm -f libgit2.a
24-
make CFLAGS="-arch i386 -arch ppc"
25-
ranlib libgit2.a
23+
CFLAGS='-arch i386 -arch x86_64' ./waf --out=$TARGET_TEMP_DIR --prefix=$TARGET_BUILD_DIR configure
24+
if [ $? != 0 ]; then
25+
echo "error: failed to waf configure"
26+
exit -1
27+
fi
28+
./waf build-static
29+
if [ $? != 0 ]; then
30+
echo "error: failed to waf build-static"
31+
exit -1
32+
fi
33+
ranlib $TARGET_TEMP_DIR/static/libgit2.a
34+
cp $TARGET_TEMP_DIR/static/libgit2.a $TARGET_BUILD_DIR
2635
else
2736
echo "error: Not a git repository."
2837
echo "error: clone GitX first so that the libgit2 submodule can be updated"
@@ -33,7 +42,7 @@ buildAction () {
3342
cleanAction () {
3443
echo "Cleaning libgit2..."
3544
cd libgit2
36-
make clean
45+
./waf clean
3746
}
3847

3948
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

‎libgit2

Submodule libgit2 updated from 998a7bf to d1685ac

0 commit comments

Comments
 (0)