cartodb4/data-services
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more changes in the Make file

Browse Source 
- Dont destroy upgrade/downgrade files
- Only remove the current version file which could be regenerated
- Added PHONY tags
This commit is contained in:
Mario de Frutos
2018-03-26 13:24:34 +02:00
parent a74e49a3e2
commit 481dbdfe3e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geocoder/extension/Makefile
+4 -4
View File
@@ -4,8 +4,7 @@ EXTENSION = cdb_geocoder
EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql NEW_EXTENSION_ARTIFACT = $(EXTENSION)--$(EXTVERSION).sql
DATA = $(NEW_EXTENSION_ARTIFACT) \ DATA = $(NEW_EXTENSION_ARTIFACT)
$(EXTENSION)--*--*.sql
REGRESS = $(notdir $(basename $(sort $(wildcard test/sql/*test.sql)))) REGRESS = $(notdir $(basename $(sort $(wildcard test/sql/*test.sql))))
TEST_DIR = test/ TEST_DIR = test/
@@ -16,15 +15,16 @@ PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs) PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS) include $(PGXS)
SOURCES_DATA = $(wildcard sql/*.sql) SOURCES_DATA = $(wildcard sql/*.sql)
$(NEW_EXTENSION_ARTIFACT): $(SOURCES_DATA) $(NEW_EXTENSION_ARTIFACT): $(SOURCES_DATA)
find . -type f -regex '.*$(EXTENSION)--[0-9]\.[0-9]\.[0-9]\.sql' | xargs rm rm -f $@
cat $(SOURCES_DATA) >> $@ cat $(SOURCES_DATA) >> $@
.PHONY: all
all: $(DATA) all: $(DATA)
# Only meant for development time, do not use once a version is released # Only meant for development time, do not use once a version is released
.PHONY: devclean
devclean: devclean:
rm -f $(DATA) rm -f $(DATA)