Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature - Bring back node support #217

Merged
merged 57 commits into from
Feb 8, 2022
Merged

Feature - Bring back node support #217

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
c3bd48e
Ignore node_modules
jutaz Oct 28, 2021
98c5145
Add a package lock
jutaz Oct 28, 2021
e07fa14
Update CMake to build platform loop w/ libuv
jutaz Jan 14, 2022
b905fcf
Support new NAN version as well as node v10
jutaz Jan 14, 2022
423eebc
Support node 14, 16, 17
jutaz Jan 14, 2022
3e85ac0
Update the docs
jutaz Jan 14, 2022
96aecee
Revert Readme changes
jutaz Jan 16, 2022
ab40da3
Install libuv
jutaz Jan 20, 2022
ef3497e
_actually_ add libuv
jutaz Jan 20, 2022
0ec78dc
Link platform loop
jutaz Jan 20, 2022
c996193
Add Darwin build script
jutaz Jan 22, 2022
7271b39
Small fix
jutaz Jan 22, 2022
f8f8ac8
use a generic workflow name
jutaz Jan 22, 2022
e065269
Fix some mock names
jutaz Jan 22, 2022
7b3afb6
Fix tests
jutaz Jan 22, 2022
5d0145c
rename
jutaz Jan 22, 2022
f4b8f8b
Run multiple macos versions, cache homebrew
jutaz Jan 22, 2022
eebce07
Update package name, ignore rest of files for the package
jutaz Jan 22, 2022
1dab828
needs runs-on, duh
jutaz Jan 22, 2022
6276885
Run on Linux
jutaz Jan 22, 2022
92efcd3
sudo!
jutaz Jan 22, 2022
c137081
use libjpeg
jutaz Jan 22, 2022
b1fc0d3
Run in Headless mode on Linux
jutaz Jan 22, 2022
3e3d077
try xvfb
jutaz Jan 22, 2022
7bf6df5
Whooops
jutaz Jan 22, 2022
e5769e0
Ignore Qt too
jutaz Jan 22, 2022
51a1215
Simplify dependencies, remove osx deployment target
jutaz Jan 22, 2022
4a91682
Remove brew cache
jutaz Jan 22, 2022
9fd8244
Remove more deps
jutaz Jan 22, 2022
0a81774
Purge more deps
jutaz Jan 23, 2022
d877808
Revert circleCI changes
jutaz Jan 23, 2022
0cc23a2
Remove iostream include
jutaz Jan 23, 2022
61d82d1
Ignore node binaries
jutaz Jan 23, 2022
9c85518
Simplify node loop
jutaz Jan 23, 2022
7939bde
Small cleanup
jutaz Jan 23, 2022
8104d83
No need for libuv for regular builds now.
jutaz Jan 23, 2022
92ce170
Rename package lock as well
jutaz Jan 23, 2022
3b85851
Update docs
jutaz Jan 23, 2022
b6ba0a4
Fix typo
jutaz Jan 23, 2022
8e14f86
Use static_cast
jutaz Jan 23, 2022
a1426d5
Few build tweaks
jutaz Jan 23, 2022
e4cbe7d
Merge branch 'feature/bring-back-node-support' of https://github.com/…
jutaz Jan 23, 2022
57df26b
Add a CI badge
jutaz Jan 23, 2022
237f7e7
Switch Debug/Release based on branch
jutaz Jan 23, 2022
ab69c6f
Remove python deps
jutaz Jan 26, 2022
d57758a
Remove few more deps
jutaz Jan 26, 2022
827f39f
rm more deps
jutaz Jan 26, 2022
6d41d3c
Remove m0ar stuff
jutaz Jan 26, 2022
5bc5238
Missing \
jutaz Jan 26, 2022
f0d2b18
Cache based on matrix.os
jutaz Jan 26, 2022
099b2d4
Use env for build type var
jutaz Jan 26, 2022
459a09a
Remove zip, valgrind, fonts and doxygen
jutaz Jan 26, 2022
84715ee
Remove more deps, yay
jutaz Jan 26, 2022
067cfc1
We need curl
jutaz Jan 26, 2022
acb8cc9
Remove some gfx deps
jutaz Jan 26, 2022
d40b2c9
No more mesa and zlib
jutaz Jan 26, 2022
711f72f
Update instructions
jutaz Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@
/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Condensed Italic,Noto Sans Italic
/platform/ios/platform/ios/benchmark/assets/glyphs/Noto Sans Regular
/platform/android/key.json
node_modules
2 changes: 1 addition & 1 deletion benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ get_target_property(MBGL_CORE_PRIVATE_LIBRARIES mbgl-core LINK_LIBRARIES)

target_link_libraries(
mbgl-benchmark
PRIVATE ${MBGL_CORE_PRIVATE_LIBRARIES} mbgl-vendor-benchmark mbgl-compiler-options
PRIVATE ${MBGL_CORE_PRIVATE_LIBRARIES} mbgl-vendor-benchmark mbgl-compiler-options mbgl-platform-loop
PUBLIC mbgl-core
)

Expand Down
5 changes: 3 additions & 2 deletions bin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ target_link_libraries(
Mapbox::Base
Mapbox::Base::Extras::args
mbgl-compiler-options
mbgl-platform-loop
mbgl-core
)

Expand All @@ -19,7 +20,7 @@ add_executable(

target_link_libraries(
mbgl-offline
PRIVATE Mapbox::Base::Extras::args mbgl-compiler-options mbgl-core
PRIVATE Mapbox::Base::Extras::args mbgl-compiler-options mbgl-platform-loop mbgl-core
)

add_executable(
Expand All @@ -29,7 +30,7 @@ add_executable(

target_link_libraries(
mbgl-render
PRIVATE Mapbox::Base::Extras::args mbgl-compiler-options mbgl-core
PRIVATE Mapbox::Base::Extras::args mbgl-compiler-options mbgl-platform-loop mbgl-core
)

install(TARGETS mbgl-offline mbgl-render RUNTIME DESTINATION bin)
Expand Down
1 change: 1 addition & 0 deletions expression-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ target_link_libraries(
Mapbox::Base
Mapbox::Base::Extras::args
Mapbox::Base::Extras::filesystem
mbgl-platform-loop
mbgl-core
)

Expand Down
Loading