Fix style code generation, remove package.json ios (maplibre#847)

bilal614 · Mar 3, 2023 · 5b55f15 · 5b55f15
1 parent fb1572b
commit 5b55f15
Show file tree

Hide file tree

Showing 35 changed files with 97 additions and 7,256 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,24 +5,6 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 3
-    versioning-strategy: increase
-  - package-ecosystem: "npm"
-    directory: "/platform/android"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 3
-    versioning-strategy: increase
-  - package-ecosystem: "npm"
-    directory: "/platform/ios"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 3
-    versioning-strategy: increase
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:

diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
@@ -40,7 +40,6 @@ class BackgroundLayer final : public Layer {
     TransitionOptions getBackgroundPatternTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
@@ -94,7 +94,6 @@ class CircleLayer final : public Layer {
     TransitionOptions getCircleTranslateAnchorTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -70,7 +70,6 @@ class FillExtrusionLayer final : public Layer {
     TransitionOptions getFillExtrusionVerticalGradientTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
@@ -70,7 +70,6 @@ class FillLayer final : public Layer {
     TransitionOptions getFillTranslateAnchorTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp
@@ -53,7 +53,6 @@ class HeatmapLayer final : public Layer {
     TransitionOptions getHeatmapWeightTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp
@@ -58,7 +58,6 @@ class HillshadeLayer final : public Layer {
     TransitionOptions getHillshadeShadowColorTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
@@ -113,7 +113,6 @@ class LineLayer final : public Layer {
     TransitionOptions getLineWidthTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/location_indicator_layer.hpp b/include/mbgl/style/layers/location_indicator_layer.hpp
@@ -97,7 +97,6 @@ class LocationIndicatorLayer final : public Layer {
     TransitionOptions getTopImageSizeTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
@@ -70,7 +70,6 @@ class RasterLayer final : public Layer {
     TransitionOptions getRasterSaturationTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
@@ -275,7 +275,6 @@ class SymbolLayer final : public Layer {
     TransitionOptions getTextTranslateAnchorTransition() const;
 
     // Private implementation
-    /// @cond FALSE
 
     class Impl;
     const Impl& impl() const;

diff --git a/platform/ios/Makefile b/platform/ios/Makefile
@@ -8,7 +8,7 @@ export CI ?= 0
 # Getting rid of the duplicate package.json file is an open issue
 # https://github.com/maplibre/maplibre-gl-native/issues/657
 
-export NODE_PATH = ./node_modules
+export NODE_PATH = ../../node_modules
 
 CMAKE ?= cmake
 
@@ -156,7 +156,7 @@ ios: $(IOS_PROJ_PATH)
 
 #  make iproj
 .PHONY: iproj
-iproj: $(IOS_PROJ_PATH)
+iproj: $(IOS_PROJ_PATH) style-code
 	@#   Check if Xcode should run in headless mode
 	@#     If CI=1, then just perform `make iproj`
 	@#       else, use `xed` to open the XCworkspace
@@ -331,7 +331,6 @@ endif
 .PHONY: style-code
 style-code:
 	node ../../scripts/generate-style-code.js
-	# node ../../scripts/generate-shaders.js
 
 .PHONY: codestyle
 codestyle: