[postgis-tickets] r16667 - Better parallel build (references #4105)

[Paul Ramsey]

Author: pramsey
Date: 2018-07-24 06:46:23 -0700 (Tue, 24 Jul 2018)
New Revision: 16667

Modified:
   trunk/extensions/address_standardizer/Makefile.in
   trunk/extensions/postgis/Makefile.in
   trunk/extensions/postgis_tiger_geocoder/Makefile.in
Log:
Better parallel build (references #4105)


Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in	2018-07-24 13:34:49 UTC (rev 16666)
+++ trunk/extensions/address_standardizer/Makefile.in	2018-07-24 13:46:23 UTC (rev 16667)
@@ -80,21 +80,26 @@
 
 sql/address_standardizer-- at POSTGIS_LIB_VERSION@.sql: sql/address_standardizer_types.sql \
     sql/address_standardizer_functions.sql
+	mkdir -p sql
 	cat $^ > $@
 
 sql/address_standardizer.sql: sql/address_standardizer_types.sql \
     sql/address_standardizer_functions.sql
+	mkdir -p sql
 	cat $^ > $@
 
 sql/address_standardizer--1.0--$(EXTVERSION).sql:  sql/address_standardizer_functions.sql
+	mkdir -p sql
 	cat $^ > $@
 
 # upgrade logic for us data extension (to go to next cludge for dev upgrading)
 sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/address_standardizer_functions.sql
+	mkdir -p sql
 	cat $^ > $@
 
 # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
 sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
+	mkdir -p sql
 	cat $^ > $@
 
 # build us data extension
@@ -108,10 +113,12 @@
 
 # upgrade logic for us data extension (to go to next cludge for dev upgrading)
 sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+	mkdir -p sql
 	cat $^ > $@
 
 # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
 sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+	mkdir -p sql
 	cat $^ > $@
 
 mk-st-regexp: mk-st-regexp.pl

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2018-07-24 13:34:49 UTC (rev 16666)
+++ trunk/extensions/postgis/Makefile.in	2018-07-24 13:46:23 UTC (rev 16667)
@@ -113,6 +113,7 @@
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql | sql_bits
+	mkdir -p sql
 	$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl | sql_bits

Modified: trunk/extensions/postgis_tiger_geocoder/Makefile.in
===================================================================
--- trunk/extensions/postgis_tiger_geocoder/Makefile.in	2018-07-24 13:34:49 UTC (rev 16666)
+++ trunk/extensions/postgis_tiger_geocoder/Makefile.in	2018-07-24 13:46:23 UTC (rev 16667)
@@ -124,6 +124,7 @@
 	../../extras/tiger_geocoder/geocode/geocode.sql \
 	../../extras/tiger_geocoder/geocode/reverse_geocode.sql \
 	../../extras/tiger_geocoder/geocode/census_tracts_functions.sql
+	mkdir -p sql_bits
 	cat $^ > $@
 
 #also remove tiger_data from extension if it is part of it so data gets backed up
@@ -163,15 +164,18 @@
 	../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \
 	../postgis_extension_helper.sql \
 	sql_bits/add_search_path.sql
+	mkdir -p sql_bits
 	cat $^ > $@
 	echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
 	cat ../postgis_extension_helper_uninstall.sql  >> $@
 
 sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
+	mkdir -p sql_bits
 	sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
 	$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 sql_bits/add_search_path.sql: sql_bits/add_search_path.sql.in
+	mkdir -p sql_bits
 	cp $< $@
 
 ../../doc/tiger_geocoder_comments.sql:
@@ -178,6 +182,7 @@
 	$(MAKE) -C ../../doc comments
 
 sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
+	mkdir -p sql_bits
 	cp $< $@
 
 #grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...