tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] move mbgl.gyp to gyp directory

Browse Source 
So npm won't clobber binding.gyp, refs
https://github.com/npm/npm/issues/10243
This commit is contained in:
Mike Morris
2015-11-03 16:03:40 -05:00
parent da569c266b
commit dfb36d6231
14 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/render.gypi
View File

@@ -8,13 +8,13 @@
'type': 'executable',
'dependencies': [
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:headless-<(headless_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'../mbgl.gyp:copy_certificate_bundle',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:headless-<(headless_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:copy_certificate_bundle',
],
'include_dirs': [

6
binding.gyp
View File

@@ -5,9 +5,9 @@
'targets': [
{ 'target_name': '<(module_name)',
'dependencies': [
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:headless-<(headless_lib)',
'gyp/mbgl.gyp:core',
'gyp/mbgl.gyp:platform-<(platform_lib)',
'gyp/mbgl.gyp:headless-<(headless_lib)',
],
'include_dirs': [

16
gyp/core.gypi
View File

@@ -11,14 +11,14 @@
],
'sources': [
'<!@(find src -name "*.hpp")',
'<!@(find src -name "*.cpp")',
'<!@(find src -name "*.c")',
'<!@(find src -name "*.h")',
'<!@(find include -name "*.hpp")',
'<!@(find include -name "*.h")',
'<!@(find src -name "*.glsl")',
'bin/style.json'
'<!@(find ../src -name "*.hpp")',
'<!@(find ../src -name "*.cpp")',
'<!@(find ../src -name "*.c")',
'<!@(find ../src -name "*.h")',
'<!@(find ../include -name "*.hpp")',
'<!@(find ../include -name "*.h")',
'<!@(find ../src -name "*.glsl")',
'../bin/style.json'
],
'include_dirs': [

27
gyp/mbgl.gyp Normal file
View File

@@ -0,0 +1,27 @@
{
'includes': [
'common.gypi',
'shaders.gypi',
'version.gypi',
'certificates.gypi',
'standalone.gypi',
'core.gypi',
'none.gypi',
],
'conditions': [
['headless_lib == "cgl" and host == "osx"', { 'includes': [ 'headless-cgl.gypi' ] } ],
['headless_lib == "glx" and host == "linux"', { 'includes': [ 'headless-glx.gypi' ] } ],
['platform_lib == "osx" and host == "osx"', { 'includes': [ 'platform-osx.gypi' ] } ],
['platform_lib == "ios" and host == "ios"', { 'includes': [ 'platform-ios.gypi' ] } ],
['platform_lib == "linux"', { 'includes': [ 'platform-linux.gypi' ] } ],
['platform_lib == "android" and host == "android"', { 'includes': [ 'platform-android.gypi' ] } ],
['http_lib == "curl"', { 'includes': [ 'http-curl.gypi' ] } ],
['http_lib == "nsurl" and (host == "osx" or host == "ios")', { 'includes': [ 'http-nsurl.gypi' ] } ],
['http_lib == "android" and host == "android"', { 'includes': [ 'http-android.gypi' ] } ],
['asset_lib == "fs"', { 'includes': [ 'asset-fs.gypi' ] } ],
['asset_lib == "zip"', { 'includes': [ 'asset-zip.gypi' ] } ],
['cache_lib == "sqlite"', { 'includes': [ 'cache-sqlite.gypi' ] } ],
['install_prefix != ""', { 'includes': ['install.gypi' ] } ],
],
}

4
gyp/platform-ios.gypi
View File

@@ -94,7 +94,7 @@
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
'CLANG_ENABLE_OBJC_ARC': 'YES',
'CLANG_ENABLE_MODULES': 'YES',
'FRAMEWORK_SEARCH_PATHS': './platform/ios/vendor',
'FRAMEWORK_SEARCH_PATHS': '../platform/ios/vendor',
},
'link_settings': {
@@ -109,7 +109,7 @@
'../include',
],
'mac_bundle_resources': [
'<!@(find ./platform/ios/resources -type f \! -name "README")',
'<!@(find ../platform/ios/resources -type f \! -name "README")',
],
},
},

4
gyp/shaders.gypi
View File

@@ -9,14 +9,14 @@
'action_name': 'Build Shaders',
'inputs': [
'../scripts/build-shaders.py',
'<!@(find src -name "*.glsl")'
'<!@(find ../src -name "*.glsl")'
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp',
],
'action': ['scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
'action': ['../scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
}
],
'direct_dependent_settings': {

10
ios/app/mapboxgl-app.gypi
View File

@@ -18,11 +18,11 @@
],
'dependencies': [
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
],
'sources': [

10
ios/benchmark/benchmark-ios.gypi
View File

@@ -16,11 +16,11 @@
],
'dependencies': [
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
],
'sources': [

12
linux/mapboxgl-app.gypi
View File

@@ -8,12 +8,12 @@
'type': 'executable',
'dependencies': [
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'../mbgl.gyp:copy_certificate_bundle',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:copy_certificate_bundle',
],
'sources': [

10
macosx/mapboxgl-app.gypi
View File

@@ -13,11 +13,11 @@
],
'dependencies': [
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
],
'sources': [

27
mbgl.gyp
View File

@@ -1,27 +0,0 @@
{
'includes': [
'./gyp/common.gypi',
'./gyp/shaders.gypi',
'./gyp/version.gypi',
'./gyp/certificates.gypi',
'./gyp/standalone.gypi',
'./gyp/core.gypi',
'./gyp/none.gypi',
],
'conditions': [
['headless_lib == "cgl" and host == "osx"', { 'includes': [ './gyp/headless-cgl.gypi' ] } ],
['headless_lib == "glx" and host == "linux"', { 'includes': [ './gyp/headless-glx.gypi' ] } ],
['platform_lib == "osx" and host == "osx"', { 'includes': [ './gyp/platform-osx.gypi' ] } ],
['platform_lib == "ios" and host == "ios"', { 'includes': [ './gyp/platform-ios.gypi' ] } ],
['platform_lib == "linux"', { 'includes': [ './gyp/platform-linux.gypi' ] } ],
['platform_lib == "android" and host == "android"', { 'includes': [ './gyp/platform-android.gypi' ] } ],
['http_lib == "curl"', { 'includes': [ './gyp/http-curl.gypi' ] } ],
['http_lib == "nsurl" and (host == "osx" or host == "ios")', { 'includes': [ './gyp/http-nsurl.gypi' ] } ],
['http_lib == "android" and host == "android"', { 'includes': [ './gyp/http-android.gypi' ] } ],
['asset_lib == "fs"', { 'includes': [ './gyp/asset-fs.gypi' ] } ],
['asset_lib == "zip"', { 'includes': [ './gyp/asset-zip.gypi' ] } ],
['cache_lib == "sqlite"', { 'includes': [ './gyp/cache-sqlite.gypi' ] } ],
['install_prefix != ""', { 'includes': ['./gyp/install.gypi' ] } ],
],
}

10
platform/android/mapboxgl-app.gypi
View File

@@ -9,11 +9,11 @@
'hard_dependency': 1,
'dependencies': [
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
],
'sources': [

10
scripts/ios/package.sh
View File

@@ -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"

12
test/test.gypi
View File

@@ -20,12 +20,12 @@
'include_dirs': [ '../include', '../src', '../platform/default' ],
'dependencies': [
'symlink_TEST_DATA',
'../mbgl.gyp:core',
'../mbgl.gyp:platform-<(platform_lib)',
'../mbgl.gyp:http-<(http_lib)',
'../mbgl.gyp:asset-<(asset_lib)',
'../mbgl.gyp:cache-<(cache_lib)',
'../mbgl.gyp:headless-<(headless_lib)',
'mbgl.gyp:core',
'mbgl.gyp:platform-<(platform_lib)',
'mbgl.gyp:http-<(http_lib)',
'mbgl.gyp:asset-<(asset_lib)',
'mbgl.gyp:cache-<(cache_lib)',
'mbgl.gyp:headless-<(headless_lib)',
],
'sources': [
'fixtures/main.cpp',