diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-12-02 13:17:02 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-12-13 17:26:53 -0800 |
commit | 47fb5e820b7759bcd783cffba80bc27ac7743ee4 (patch) | |
tree | c885103ff478f9f102890a5be70a05bf260ca376 /scripts | |
parent | 1598330a9384de7c89c8e3cac55a8333e6b97c75 (diff) | |
download | qtlocation-mapboxgl-47fb5e820b7759bcd783cffba80bc27ac7743ee4.tar.gz |
[osx] Moved Mapbox.{h,m} into framework proper; set version variables
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/osx/package.sh | 17 |
1 files changed, 2 insertions, 15 deletions
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 \ |