Skip to content

Commit

Permalink
Merge pull request #5313 from camptocamp/do-not-generate-wmts-cap-at-…
Browse files Browse the repository at this point in the history
…build

Do not try to generate WMTS capabilities at build
  • Loading branch information
arnaud-morvan committed Sep 23, 2019
2 parents ae7526b + 3aab114 commit 2286fc8
Showing 1 changed file with 0 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ endif

# Use TileCloud chain
TILECLOUD_CHAIN ?= TRUE
TILECLOUD_CHAIN_LOCAL ?= FALSE

TEMPLATE_EXCLUDE += node_modules \
print/templates \
Expand Down Expand Up @@ -94,7 +93,6 @@ endif
WMTSCAPABILITIES_PATH ?= 1.0.0/WMTSCapabilities-$(ENVIRONMENT).xml
export WMTSCAPABILITIES_PATH
ifeq ($(TILECLOUD_CHAIN), TRUE)
WMTSCAPABILITIES_FILE ?= /var/sig/tiles/$(WMTSCAPABILITIES_PATH)
MAPCACHE_FILE ?= mapcache/mapcache.xml.tmpl
GEN_MAPCACHE_ARGS ?= --generate-mapcache-config
ifeq ($(DOCKER), TRUE)
Expand All @@ -103,9 +101,6 @@ endif

TILEGENERATION_CONFIG_FILE ?= tilegeneration/config.yaml.tmpl
DEFAULT_BUILD_RULES += $(TILEGENERATION_CONFIG_FILE)
ifeq ($(TILECLOUD_CHAIN_LOCAL), TRUE)
DEFAULT_BUILD_RULES += $(WMTSCAPABILITIES_FILE)
endif
endif


Expand Down Expand Up @@ -419,9 +414,6 @@ clean: template-clean
mapcache \
$(addprefix geoportal/$(PACKAGE)_geoportal/locale/, $(addsuffix /LC_MESSAGES/$(PACKAGE)_geoportal-$(L10N_CLIENT_POSTFIX).mo, $(LANGUAGES))) \
$(addprefix geoportal/$(PACKAGE)_geoportal/locale/, $(addsuffix /LC_MESSAGES/$(PACKAGE)_geoportal-$(L10N_SERVER_POSTFIX).mo, $(LANGUAGES)))
ifeq ($(TILECLOUD_CHAIN_LOCAL), TRUE)
rm --force $(WMTSCAPABILITIES_FILE)
endif

.PHONY: clean-all
clean-all: clean
Expand Down Expand Up @@ -743,11 +735,6 @@ $(MAPCACHE_FILE): $(TILEGENERATION_CONFIG_FILE)
mkdir --parent $(dir $@)
generate_controller --config=$< $(GEN_MAPCACHE_ARGS)

$(WMTSCAPABILITIES_FILE): $(TILEGENERATION_CONFIG_FILE)
$(PRERULE_CMD)
mkdir --parent $(dir $@)
generate_controller --config=$< --capabilities

# Secrets

secrets.tar.bz2.gpg:
Expand Down

0 comments on commit 2286fc8

Please sign in to comment.