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

rename a few things from mbgl => mapboxgl

Browse Source
This commit is contained in:
Konstantin Käfer
2014-07-16 19:00:49 -07:00
parent 4ea281c750
commit 55dce57896
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@@ -12,9 +12,9 @@ config.gypi:
./setup-libraries.sh
# Builds the regular library
mbgl: config.gypi mbgl.gyp node
deps/run_gyp mbgl.gyp --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-x86
mbgl: config.gypi mapboxgl.gyp node
deps/run_gyp mapboxgl.gyp --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mapboxgl
node:
@if [ ! `which node` ]; then echo 'error: depends on node.js. please make sure node is on your PATH'; exit 1; fi;
@@ -40,8 +40,8 @@ xtest: config.gypi clear_xcode_cache node
# Builds the linux app with make. This is also used by Travis CI
linux: config.gypi linux/mbgl-app.gyp node
deps/run_gyp linux/mbgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
linux: config.gypi linux/mapboxgl-app.gyp node
deps/run_gyp linux/mapboxgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
$(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
# Executes the Linux binary
@@ -51,8 +51,8 @@ run-linux: linux
# Builds the OS X app with make.
osx: config.gypi macosx/mbgl-app.gyp node
deps/run_gyp macosx/mbgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
osx: config.gypi macosx/mapboxgl-app.gyp node
deps/run_gyp macosx/mapboxgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
$(MAKE) -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
# Executes the OS X binary
@@ -65,27 +65,27 @@ clear_xcode_cache:
@CUSTOM_DD=`defaults read com.apple.dt.Xcode IDECustomDerivedDataLocation 2>/dev/null`; \
if [[ $$CUSTOM_DD ]]; then \
echo clearing files in $$CUSTOM_DD older than one day; \
find $$CUSTOM_DD/mbgl-app-* -mtime +1 | xargs rm -rf; \
find $$CUSTOM_DD/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
fi; \
if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]] && [[ ! $$CUSTOM_DD ]]; then \
echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mbgl-app-* older than one day'; \
find ~/Library/Developer/Xcode/DerivedData/mbgl-app-* -mtime +1 | xargs rm -rf; \
echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* older than one day'; \
find ~/Library/Developer/Xcode/DerivedData/mapboxgl-app-* -mtime +1 | xargs rm -rf; \
fi
# build Mac OS X project for Xcode
xproj: config.gypi macosx/mbgl-app.gyp clear_xcode_cache node
deps/run_gyp macosx/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
open ./build/macosx/mbgl-app.xcodeproj
xproj: config.gypi macosx/mapboxgl-app.gyp clear_xcode_cache node
deps/run_gyp macosx/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
open ./build/macosx/mapboxgl-app.xcodeproj
# build iOS project for Xcode
iproj: config.gypi ios/mapbox-gl-cocoa/app/mbgl-app.gyp clear_xcode_cache node
deps/run_gyp ios/mapbox-gl-cocoa/app/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
open ./build/ios/mapbox-gl-cocoa/app/mbgl-app.xcodeproj
iproj: config.gypi ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp clear_xcode_cache node
deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
open ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj
# build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
lproj: config.gypi linux/mbgl-app.gyp clear_xcode_cache node
deps/run_gyp linux/mbgl-app.gyp --depth=. --generator-output=./build -f xcode
open ./build/linux/mbgl-app.xcodeproj
lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache node
deps/run_gyp linux/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
open ./build/linux/mapboxgl-app.xcodeproj
##### Maintenace operations ####################################################

2
ios/mapbox-gl-cocoa

Submodule ios/mapbox-gl-cocoa updated: 8a29646fd2...6d29b1a2be

6
linux/mbgl-app.gyp → linux/mapboxgl-app.gyp
View File

@@ -52,9 +52,9 @@
}],
],
'dependencies': [
'../mbgl.gyp:mbgl-x86',
'../mbgl.gyp:copy_default_stylesheet',
'../mbgl.gyp:copy_certificate_bundle',
'../mapboxgl.gyp:mapboxgl',
'../mapboxgl.gyp:copy_default_stylesheet',
'../mapboxgl.gyp:copy_certificate_bundle',
],
},
],

2
macosx/mbgl-app.gyp → macosx/mapboxgl-app.gyp
View File

@@ -40,7 +40,7 @@
'CLANG_ENABLE_OBJC_ARC': 'YES'
},
'dependencies': [
'../mbgl.gyp:mbgl-x86'
'../mapboxgl.gyp:mapboxgl'
]
}
]

8
mbgl.gyp → mapboxgl.gyp
View File

@@ -81,8 +81,8 @@
]
},
{
'target_name': 'mbgl-x86',
'product_name': 'mbgl-x86',
'target_name': 'mapboxgl',
'product_name': 'mapboxgl',
'type': 'static_library',
'hard_dependency': 1,
'dependencies': [
@@ -149,8 +149,8 @@
}
},
{
'target_name': 'mbgl-ios',
'product_name': 'mbgl-ios',
'target_name': 'mapboxgl-ios',
'product_name': 'mapboxgl-ios',
'type': 'static_library',
'hard_dependency': 1,
'dependencies': [

18
test/test.gyp
View File

@@ -71,7 +71,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -87,7 +87,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -103,7 +103,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -119,7 +119,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -135,7 +135,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -151,7 +151,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -167,7 +167,7 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86"
"../mapboxgl.gyp:mapboxgl"
]
},
{
@@ -188,9 +188,9 @@
],
"dependencies": [
"../deps/gtest/gtest.gyp:gtest",
"../mbgl.gyp:mbgl-x86",
"../mapboxgl.gyp:mapboxgl",
"link_gl",
'../mbgl.gyp:copy_default_stylesheet',
'../mapboxgl.gyp:copy_default_stylesheet',
]
},
{