From 2cf60640c98a573624db8e3101d5dc97fe2ceb9f Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Mon, 3 Jun 2019 20:55:09 +0000 Subject: [PATCH] this should do it for fixing packaging -- next after would be to upgrade the versions of things git-svn-id: http://svn.osgeo.org/postgis/trunk@17467 b70326c6-7e19-0410-871a-916f4a2858ee --- ci/winnie/package_postgis.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh index 14993d724..79de0d203 100644 --- a/ci/winnie/package_postgis.sh +++ b/ci/winnie/package_postgis.sh @@ -41,7 +41,7 @@ export PATHOLD=$PATH WEB=/home/www/postgis/htdocs DWN=${WEB}/download -export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin:/c/ming${OS_BUILD}/svn" +export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin:/c/ming${OS_BUILD}}${GCC_TYPE}/svn" #export PG_VER=9.2beta2 echo PATH BEFORE: $PATH @@ -80,7 +80,7 @@ export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER} export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE} export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib" export PCRE_VER=8.33 -#PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-${ICON_VER}.1w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}" +#PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}" #echo PATH AFTER: $PATH outdir="${RELDIR}/${RELVERDIR}" package="${RELDIR}/${RELVERDIR}.zip" @@ -98,7 +98,7 @@ mkdir $outdir/bin/postgisgui mkdir $outdir/bin/postgisgui/share mkdir $outdir/bin/postgisgui/lib mkdir $outdir/utils -cp ${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}/bin/*.dll $outdir/bin/postgisgui +cp ${MINGPROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui # it seems 9.2 and 9.3 doesn't come with its own libiconv good grief # and trying to use their libiconv2.dll makes shp2pgsql crash if [[ "$PG_VER" == *9.2* || "$PG_VER" == *9.3* ]]; then @@ -172,8 +172,8 @@ echo "PROTOBUF-C VERSION: ${PROTOBUFC_VER} https://github.com/protobuf-c/protobu cp ${PGPATHEDB}/bin/libxml2-2.dll $outdir/bin/ cd ${POSTGIS_SRC} -strip postgis/postgis-${POSTGIS_MINOR_VER}.dll -strip raster/rt_pg/postgis_raster-${POSTGIS_MINOR_VER}.dll +strip postgis/*.dll +strip raster/rt_pg/*.dll strip liblwgeom/.libs/*.dll cp postgis/*.dll ${RELDIR}/${RELVERDIR}/lib @@ -184,19 +184,23 @@ cp postgis/*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VE cp raster/rt_pg/*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER} cp utils/*.pl ${RELDIR}/${RELVERDIR}/utils #add extras -svn export "${svnurl}/extras" ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras +#svn export "${svnurl}/extras" ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras #cp raster/rt_pg/rtpostgis.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER} #cp raster/rt_pg/rtpostgis_upgrade_20_minor.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER} cp raster/loader/.libs/raster2pgsql.exe ${RELDIR}/${RELVERDIR}/bin cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin +cp loader/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin cp loader/.libs/shp2pgsql.exe ${RELDIR}/${RELVERDIR}/bin +cp loader/pgsql2shp.exe ${RELDIR}/${RELVERDIR}/bin cp loader/.libs/pgsql2shp.exe ${RELDIR}/${RELVERDIR}/bin +cp loader/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui cp loader/.libs/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui + #cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui #shp2pgsql-gui now has dependency on geos (though in theory it shouldn't) -cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui +cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui cp spatial_ref_sys.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER} cp topology/topology.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER} cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER} @@ -227,4 +231,4 @@ cd ${RELDIR} zip -r $package ${RELVERDIR} #scp $package robe@www.refractions.net:${DWN}/${REL_PGVER}/buildbot/${RELVERDIR}.zip cp $package ${PROJECTS}/postgis/win_web/download/windows/pg${REL_PGVER}/buildbot -cd ${POSTGIS_SRC} +cd ${POSTGIS_SRC} \ No newline at end of file -- 2.49.0