From 47fb5e820b7759bcd783cffba80bc27ac7743ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= <mxn@1ec5.org>
Date: Wed, 2 Dec 2015 13:17:02 -0800
Subject: [osx] Moved Mapbox.{h,m} into framework proper; set version variables

---
 scripts/osx/package.sh | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/osx/package.sh b/scripts/osx/package.sh
index 79ab3f1377..d017ccb3d3 100755
--- a/scripts/osx/package.sh
+++ b/scripts/osx/package.sh
@@ -21,31 +21,18 @@ function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
 trap finish EXIT
 
-
-rm -rf ${OUTPUT}
-mkdir -p "${OUTPUT}"/shared
-
-
-step "Recording library version..."
-VERSION="${OUTPUT}"/shared/version.txt
-echo -n "https://github.com/mapbox/mapbox-gl-native/commit/" > ${VERSION}
-HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
-echo -n "mapbox-gl-native "
-echo ${HASH}
-echo ${HASH} >> ${VERSION}
-
-
 step "Creating build files..."
 export MASON_PLATFORM=osx
 export BUILDTYPE=${BUILDTYPE:-Release}
 export HOST=osx
 make Xcode/osx
 
-step "Building OS X targets..."
+step "Building OS X framework (build ${TRAVIS_JOB_NUMBER:-${BITRISE_BUILD_NUMBER:-0}})..."
 xcodebuild -sdk macosx${OSX_SDK_VERSION} \
     ARCHS="x86_64" \
     ONLY_ACTIVE_ARCH=NO \
     GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
+    CURRENT_PROJECT_VERSION=${TRAVIS_JOB_NUMBER:-${BITRISE_BUILD_NUMBER:-0}} \
     -project ./build/osx-x86_64/gyp/osx.xcodeproj \
     -configuration ${BUILDTYPE} \
     -target osxsdk \
-- 
cgit v1.2.1