diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-03 16:03:40 -0500 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-04 11:34:35 -0500 |
| commit | dfb36d62317d99482e6a16b772e8d370464d1cce (patch) | |
| tree | 9bd31f0a1abbaf4cbd5e46e18aeb4199ca4ac2f7 /scripts | |
| parent | da569c266b663b815b0fa754be59c78904b92fa6 (diff) | |
| download | qtlocation-mapboxgl-dfb36d62317d99482e6a16b772e8d370464d1cce.tar.gz | |
[core] move mbgl.gyp to gyp directory
So npm won't clobber binding.gyp, refs
https://github.com/npm/npm/issues/10243
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ios/package.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index d719440fdd..58ff3e265c 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -55,7 +55,7 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ ENABLE_BITCODE=YES \ DEPLOYMENT_POSTPROCESSING=YES \ - -project ./build/ios-all/mbgl.xcodeproj \ + -project ./build/ios-all/gyp/mbgl.xcodeproj \ -configuration ${BUILDTYPE} \ -target everything \ -jobs ${JOBS} @@ -66,7 +66,7 @@ xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \ ARCHS="x86_64 i386" \ ONLY_ACTIVE_ARCH=NO \ GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ - -project ./build/ios-all/mbgl.xcodeproj \ + -project ./build/ios-all/gyp/mbgl.xcodeproj \ -configuration ${BUILDTYPE} \ -target everything \ -jobs ${JOBS} @@ -79,14 +79,14 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \ -o ${OUTPUT}/static/lib${NAME}.a \ - ${LIBS[@]/#/build/${BUILDTYPE}-iphoneos/libmbgl-} \ - ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} + ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphoneos/libmbgl-} \ + ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} else libtool -static -no_warning_for_no_symbols \ `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \ -o ${OUTPUT}/static/lib${NAME}.a \ - ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} + ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} fi echo "Created ${OUTPUT}/static/lib${NAME}.a" |