Skip to content
This repository has been archived by the owner on Nov 13, 2023. It is now read-only.

Commit

Permalink
v2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
timcharper committed Jun 29, 2014
1 parent ae47d7a commit d0f138a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
9 changes: 5 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x

. env.sh

Expand All @@ -15,8 +15,9 @@ $SUDO mv $PREFIX{,_`date +%s`} || echo "Git not installed currently"

mkdir -p git_build

export CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
export LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
export TARGET_FLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -DMACOSX_DEPLOYMENT_TARGET=10.6"
export CFLAGS="$TARGET_FLAGS -arch i386 -arch x86_64"
export LDFLAGS="$TARGET_FLAGS -arch i386 -arch x86_64"

export C_INCLUDE_PATH=/usr/include
export CPLUS_INCLUDE_PATH=/usr/include
Expand All @@ -41,7 +42,7 @@ pushd git_build

# git-credential-osxkeychain
pushd contrib/credential/osxkeychain
CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch x86_64" LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch x86_64" make
CFLAGS="$TARGET_FLAGS -arch x86_64" LDFLAGS="$TARGET_FLAGS -arch x86_64" make
$SUDO cp git-credential-osxkeychain $PREFIX/bin/git-credential-osxkeychain
popd
popd
Expand Down
1 change: 1 addition & 0 deletions build_package_test_and_bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rm -f Disk\ Image/*.pkg
if [ "`uname`" == "Darwin" ]; then sed_regexp="-E"; else sed_regexp="-r"; fi
GIT_VERSION="${1:-`curl http://git-scm.com/ 2>&1 | grep '<span class="version">' -A 1 | tail -n 1 | sed $sed_regexp 's/ *//'`}"

echo $GIT_VERSION
./build.sh $GIT_VERSION

PACKAGE_NAME="git-$GIT_VERSION-intel-universal-snow-leopard"
Expand Down
2 changes: 1 addition & 1 deletion git-manpages
Submodule git-manpages updated from 8e0f4d to 67adeb

0 comments on commit d0f138a

Please sign in to comment.