diff options
| author | Leith Bade <leith@mapbox.com> | 2015-10-23 13:42:07 +1100 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-10-30 13:09:04 -0700 |
| commit | abf93c008b993f178df327e7681418df51e72844 (patch) | |
| tree | b57b3f654cb262ee7d5e834610f8fa95ed8603c1 /scripts | |
| parent | ddc4251074dae9115d6e252099ec04995188e29a (diff) | |
| download | qtlocation-mapboxgl-abf93c008b993f178df327e7681418df51e72844.tar.gz | |
[core] Remove bundled styles.
Fixes #2239
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/android/run.sh | 3 | ||||
| -rwxr-xr-x | scripts/ios/package.sh | 2 | ||||
| -rwxr-xr-x | scripts/linux/run.sh | 3 | ||||
| -rw-r--r-- | scripts/main.mk | 4 | ||||
| -rwxr-xr-x | scripts/node/run.sh | 3 | ||||
| -rwxr-xr-x | scripts/osx/run.sh | 3 |
6 files changed, 0 insertions, 18 deletions
diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 00a12d025f..9381edfeed 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -12,9 +12,6 @@ export MASON_ANDROID_ABI=${ANDROID_ABI} # Build ################################################################################ -mapbox_time "checkout_styles" \ -git submodule update --init styles - mkdir -p ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw echo "${MAPBOX_ACCESS_TOKEN}" > ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index bb0aaaefdb..4d219338be 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -104,8 +104,6 @@ step "Copying Resources..." cp -pv LICENSE.md "${OUTPUT}/static" mkdir -p "${OUTPUT}/static/${NAME}.bundle" cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle" -mkdir -p "${OUTPUT}/static/${NAME}.bundle/styles" -cp -pv styles/styles/{dark,emerald,light,streets,satellite,satellite-hybrid}-v8.json "${OUTPUT}/static/${NAME}.bundle/styles" step "Creating API Docs..." if [ -z `which appledoc` ]; then diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh index 31272ea1c2..142cbcb680 100755 --- a/scripts/linux/run.sh +++ b/scripts/linux/run.sh @@ -11,9 +11,6 @@ BUILDTYPE=${BUILDTYPE:-Release} # Build ################################################################################ -mapbox_time "checkout_styles" \ -git submodule update --init styles - mapbox_time "compile_program" \ make linux -j${JOBS} BUILDTYPE=${BUILDTYPE} diff --git a/scripts/main.mk b/scripts/main.mk index deba6db9d4..75e574d26d 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -38,10 +38,6 @@ SUBMODULES += .mason/mason.sh .mason/mason.sh: ./scripts/flock.py .git/Submodule.lock git submodule update --init .mason -SUBMODULES += styles/styles -styles/styles: - ./scripts/flock.py .git/Submodule.lock git submodule update --init styles - SUBMODULES += src/mbgl/util/geojsonvt/geojsonvt.hpp src/mbgl/util/geojsonvt/geojsonvt.hpp: ./scripts/flock.py .git/Submodule.lock git submodule update --init src/mbgl/util/geojsonvt diff --git a/scripts/node/run.sh b/scripts/node/run.sh index 22db3fdedd..983916c90c 100755 --- a/scripts/node/run.sh +++ b/scripts/node/run.sh @@ -14,9 +14,6 @@ BUILDTYPE=${BUILDTYPE:-Release} source ~/.nvm/nvm.sh nvm use $NODE_VERSION -mapbox_time "checkout_styles" \ -git submodule update --init styles - mapbox_time "compile_program" \ npm install --build-from-source diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh index 86a7291522..1020879471 100755 --- a/scripts/osx/run.sh +++ b/scripts/osx/run.sh @@ -11,9 +11,6 @@ BUILDTYPE=${BUILDTYPE:-Release} # Build ################################################################################ -mapbox_time "checkout_styles" \ -git submodule update --init styles - mapbox_time "checkout_geojsonvt" \ git submodule update --init src/mbgl/util/geojsonvt |