From a0d3a854693ff186ba1c925698d3caf5bb9a73b8 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sun, 3 Apr 2016 20:43:18 +0000 Subject: [PATCH] minor cleanup to prevent adding ofa ll address*.dlls git-svn-id: http://svn.osgeo.org/postgis/trunk@14816 b70326c6-7e19-0410-871a-916f4a2858ee --- ci/winnie/package_postgis.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh index 118828f23..fa3fd98c1 100644 --- a/ci/winnie/package_postgis.sh +++ b/ci/winnie/package_postgis.sh @@ -55,8 +55,8 @@ else export svnurl="http://svn.osgeo.org/postgis/tags/${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VERSION}" fi; -if [[ "$POSTGIS_MINOR_VER" == 2.2 ]] ; then - export svnurl="http://svn.osgeo.org/postgis/branches/trunk" +if [[ "$POSTGIS_MINOR_VER" == 2.3 ]] ; then + export svnurl="http://svn.osgeo.org/postgis/trunk" fi; #export POSTGIS_SRC=${PROJECTS}/postgis/trunk #POSTGIS_SVN_REVISION=will_be_passed_in_by_bot @@ -129,7 +129,6 @@ if [ "$POSTGIS_MAJOR_VERSION" == "2" ] ; then if [ "$POSTGIS_MINOR_VERSION" > "0" ] ; then ## only copy pagc standardizer components for 2.1+ cp -p ${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/bin/libpcre-1*.dll $outdir/bin - cp -p ${PGPATH}/lib/address*.dll $outdir/lib # cp -p ${PGPATH}/share/extension/address*.* $outdir/share/extension # cp -p ${PGPATH}/share/extension/us-*.sql $outdir/share/extension fi; @@ -189,6 +188,7 @@ cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis- #cp extras/* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras cp -r extensions/*/sql/* ${RELDIR}/${RELVERDIR}/share/extension cp -r extensions/*/*.control ${RELDIR}/${RELVERDIR}/share/extension +cp -r extensions/*/*.dll ${RELDIR}/${RELVERDIR}/lib #only address_standardizer in theory has this #cp extensions/postgis_topology/sql/* ${RELDIR}/${RELVERDIR}/share/extension #cp extensions/postgis_topology/*.control ${RELDIR}/${RELVERDIR}/share/extension cp -r ${RELDIR}/packaging_notes/* ${RELDIR}/${RELVERDIR}/ -- 2.40.0