diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-31 11:50:21 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-01 09:56:40 -0700 |
commit | 6c0d6eac55036ec18702bfba7daf0135c3dbd8ea (patch) | |
tree | e01f1aa705f3ae8af7b0dae0dc397e946a7a5db4 | |
parent | 879382f72405edd1840d2f37744bcba49131859a (diff) | |
download | qtlocation-mapboxgl-6c0d6eac55036ec18702bfba7daf0135c3dbd8ea.tar.gz |
[build] Remove install/standalone/mbgl-config build cruft
This is all believed to be unused, and most or all of it is probably broken.
-rw-r--r-- | gyp/common.gypi | 3 | ||||
-rw-r--r-- | gyp/install.gypi | 45 | ||||
-rw-r--r-- | gyp/mbgl.gyp | 3 | ||||
-rw-r--r-- | gyp/standalone.gypi | 30 | ||||
-rwxr-xr-x | utils/mbgl-config/build.sh | 17 | ||||
-rw-r--r-- | utils/mbgl-config/mbgl-config.template.sh | 61 |
6 files changed, 0 insertions, 159 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index d54a31b640..3972c8f6f9 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -1,7 +1,4 @@ { - 'variables': { - 'install_prefix%': '', - }, 'target_defaults': { 'default_configuration': 'Release', 'conditions': [ diff --git a/gyp/install.gypi b/gyp/install.gypi deleted file mode 100644 index 069686fe8b..0000000000 --- a/gyp/install.gypi +++ /dev/null @@ -1,45 +0,0 @@ -{ - 'targets': [ - { 'target_name': 'install2', - 'type': 'none', - 'hard_dependency': 1, - 'dependencies': [ - 'core', - 'platform-<(platform_lib)', - 'http-<(http_lib)', - 'asset-<(asset_lib)', - 'headless-<(headless_lib)', - 'standalone', - ], - - 'copies': [ - { 'files': [ '<(PRODUCT_DIR)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' }, - { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' }, - ], - - 'actions': [ - { - 'action_name': 'Copy header files', - 'inputs': [ '../include/mbgl/mbgl.hpp' ], - 'outputs': [ '<(install_prefix)/include/mbgl/mbgl.hpp' ], - 'action': [ 'cp', '-r', 'include', '<(install_prefix)/' ] - }, - - { 'action_name': 'mbgl-config', - 'inputs': [ - '../utils/mbgl-config/mbgl-config.template.sh', - '../utils/mbgl-config/build.sh', - ], - 'outputs': [ - '<(install_prefix)/bin/mbgl-config', - ], - 'action': [ - './utils/mbgl-config/build.sh', - '<(install_prefix)', - '<(PRODUCT_DIR)/libmbgl.a.ldflags', - ] - } - ] - }, - ], -} diff --git a/gyp/mbgl.gyp b/gyp/mbgl.gyp index 2d541875e9..388e90c85a 100644 --- a/gyp/mbgl.gyp +++ b/gyp/mbgl.gyp @@ -4,7 +4,6 @@ 'shaders.gypi', 'version.gypi', 'certificates.gypi', - 'standalone.gypi', 'core.gypi', 'none.gypi', ], @@ -64,7 +63,5 @@ ['http_lib == "android" and host == "android"', { 'includes': [ 'http-android.gypi' ] } ], ['asset_lib == "fs"', { 'includes': [ 'asset-fs.gypi' ] } ], ['asset_lib == "zip"', { 'includes': [ 'asset-zip.gypi' ] } ], - - ['install_prefix != ""', { 'includes': ['install.gypi' ] } ], ], } diff --git a/gyp/standalone.gypi b/gyp/standalone.gypi deleted file mode 100644 index 732682cdf2..0000000000 --- a/gyp/standalone.gypi +++ /dev/null @@ -1,30 +0,0 @@ -{ - 'targets': [ - { 'target_name': 'everything', - 'type': 'none', - 'hard_dependency': 1, - - 'dependencies': [ - 'core', - 'platform-<(platform_lib)', - 'http-<(http_lib)', - 'asset-<(asset_lib)', - 'headless-<(headless_lib)', - ], - }, - - { 'target_name': 'standalone', - 'product_name': 'libmbgl.a', - 'type': 'executable', - 'hard_dependency': 1, - - 'dependencies': [ - 'core', - 'platform-<(platform_lib)', - 'http-<(http_lib)', - 'asset-<(asset_lib)', - 'headless-<(headless_lib)', - ], - }, - ], -}
\ No newline at end of file diff --git a/utils/mbgl-config/build.sh b/utils/mbgl-config/build.sh deleted file mode 100755 index f5e6c5d482..0000000000 --- a/utils/mbgl-config/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -PREFIX=$1 -LDFLAGS=$2 - -VARIABLES="#!/bin/bash - -## variables - -CONFIG_MBGL_PREFIX=$PREFIX -CONFIG_MBGL_LDFLAGS=\"`cat $LDFLAGS`\" -" - -echo "$VARIABLES" | cat - utils/mbgl-config/mbgl-config.template.sh \ - > $PREFIX/bin/mbgl-config - -chmod 755 $PREFIX/bin/mbgl-config diff --git a/utils/mbgl-config/mbgl-config.template.sh b/utils/mbgl-config/mbgl-config.template.sh deleted file mode 100644 index f51120ad18..0000000000 --- a/utils/mbgl-config/mbgl-config.template.sh +++ /dev/null @@ -1,61 +0,0 @@ -## program below - -usage() -{ - cat <<EOF -Usage: - mbgl-config [OPTION...] - -Help Options: - -h, --help Show help options - -Application Options: - --prefix output prefix where mbgl is installed - --libs output -L flags - --includedir output include directory path -EOF - - exit $1 -} - -echoerr() { echo "$@" 1>&2; } - -if test $# -eq 0; then - usage 1 -fi - -while test $# -gt 0; do - case "$1" in - esac - - case "$1" in - - --help) - usage 0 - ;; - - -h) - usage 0 - ;; - - --prefix) - echo ${CONFIG_MBGL_PREFIX} - ;; - - --libs) - echo ${CONFIG_MBGL_PREFIX}/lib/libmbgl.a ${CONFIG_MBGL_LDFLAGS} - ;; - - --includedir) - echo ${CONFIG_MBGL_PREFIX}/include - ;; - - *) - # push to stderr any invalid options - echo "unknown option $1" 1>&2; - ;; - esac - shift -done - -exit 0 |