Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Share shaders with gl-js #5122

Merged
merged 10 commits into from
May 26, 2016
Merged

Share shaders with gl-js #5122

merged 10 commits into from
May 26, 2016

Conversation

jfirebaugh
Copy link
Contributor

See mapbox/mapbox-gl-js#2599.

Note that this adds a build dependency on npm to all platforms. Previously, it was a build dependency for node, and a test dependency for node, osx, qt, and linux. If there's resistance to this, I can explore using a submodule instead. But I'd prefer to use npm.

@1ec5
Copy link
Contributor

1ec5 commented May 24, 2016

Note that this adds a build dependency on npm to all platforms.

Can you update INSTALL.md to explain how to get npm? The platform-specific INSTALL.md documents refer to the main INSTALL.md for core dependencies.

@jfirebaugh jfirebaugh force-pushed the shared-shaders branch 3 times, most recently from 384ff58 to 0edfd6c Compare May 25, 2016 00:59
@jfirebaugh jfirebaugh merged commit 172e645 into master May 26, 2016
@jfirebaugh jfirebaugh deleted the shared-shaders branch May 26, 2016 05:01
1ec5 added a commit that referenced this pull request May 26, 2016
Documented the submodule step for running KIF-based SDK UI tests. This happened as part of installing core dependencies until #5122.

git clone https://github.com/mapbox/mapbox-gl-native.git
cd mapbox-gl-native
git submodule init
git submodule update
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Submodules are still used for the KIF-based iOS SDK UI tests, so I moved this step to the iOS SDK testing guide in 102e62a. Once enough of the KIF tests have been ported to XCUITest in #4837, we can delete the KIF tests outright, and the two remaining submodules will be no more.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants