[postgis-tickets] r14420 - change json check to be json version based instead of postgis version based

Regina Obe lr at pcorp.us
Mon Nov 23 21:41:27 PST 2015


Author: robe
Date: 2015-11-23 21:41:26 -0800 (Mon, 23 Nov 2015)
New Revision: 14420

Modified:
   buildbots/windows/mingw64/scripts/regress_postgis.sh
Log:
change json check to be json version based instead of postgis version based

Modified: buildbots/windows/mingw64/scripts/regress_postgis.sh
===================================================================
--- buildbots/windows/mingw64/scripts/regress_postgis.sh	2015-11-24 05:03:41 UTC (rev 14419)
+++ buildbots/windows/mingw64/scripts/regress_postgis.sh	2015-11-24 05:41:26 UTC (rev 14420)
@@ -167,8 +167,8 @@
 make clean
 
 ##hack to get around boolean incompatibility
-##hack to get around boolean incompatibility now only needed for 2.0 (no longer for 2.1)
-if [ "$POSTGIS_MINOR_VERSION" == "0" ] ; then
+##hack to get around boolean incompatibility now only needed for json 0.9 (no longer for 2.1)
+if [ "$JSON_VER" == "0.9" ] ; then
 cp ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h.for_compile ${MINGPROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/include/json/json_object.h
 fi;
 make



More information about the postgis-tickets mailing list