From 21598b6c3c5328610630af12ffeef1abb6b714b7 Mon Sep 17 00:00:00 2001 From: Build User Date: Fri, 12 Apr 2013 16:04:17 -0400 Subject: [PATCH 1/2] Fix for CYGWIN which resolves undefined references --- build_geometry.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_geometry.cpp b/build_geometry.cpp index 20523c649..fe21616ff 100644 --- a/build_geometry.cpp +++ b/build_geometry.cpp @@ -25,6 +25,10 @@ #include #include +#if defined(__CYGWIN__) +#define GEOS_INLINE +#endif + /* Need to know which geos version we have to work out which headers to include */ #include From 3d669a3d15200772c01a45c3af446e342d673e74 Mon Sep 17 00:00:00 2001 From: Build User Date: Fri, 12 Apr 2013 16:04:38 -0400 Subject: [PATCH 2/2] Cygwin packaging script --- cygpkg.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 cygpkg.sh diff --git a/cygpkg.sh b/cygpkg.sh new file mode 100644 index 000000000..98ef6b79e --- /dev/null +++ b/cygpkg.sh @@ -0,0 +1,58 @@ +#!/bin/bash +# +# Author: Jason Huntley +# Email: onepremise@gmail.com +# Description: Cygwin Package script +# +# Change Log +# +# Date Description Initials +#------------------------------------------------------------- +# 04-11-13 Initial Coding JAH +#============================================================= + +if [ ! -e "cygwin-package" ]; then + mkdir cygwin-package +fi + +echo +echo Copying Executable... +echo + +cp -rfv 900913.sql cygwin-package || { stat=$?; echo "Packaging failed, aborting" >&2; exit $stat; } +cp -rfv README cygwin-package || { stat=$?; echo "Packaging failed, aborting" >&2; exit $stat; } +cp -rfv .libs/osm2pgsql.exe cygwin-package || { stat=$?; echo "Packaging failed, aborting" >&2; exit $stat; } + +echo +echo Copying Dependent Libraries... +echo + +cp -rfv /bin/cygcrypt*.dll cygwin-package +cp -rfv /bin/cyggcc*.dll cygwin-package +cp -rfv /usr/local/bin/cyggeos*.dll cygwin-package +cp -rfv /bin/cygiconv*.dll cygwin-package +cp -rfv /bin/cygintl*.dll cygwin-package +cp -rfv /bin/cyglber*.dll cygwin-package +cp -rfv /bin/cygldap*.dll cygwin-package +cp -rfv /bin/cyglzma*.dll cygwin-package +cp -rfv /bin/cygpq*.dll cygwin-package +cp -rfv /usr/local/bin/cygproj*.dll cygwin-package +cp -rfv /usr/local/bin/cygproto*.dll cygwin-package +cp -rfv /bin/cygsasl*.dll cygwin-package +cp -rfv /bin/cygssl*.dll cygwin-package +cp -rfv /bin/cygstdc++**.dll cygwin-package +cp -rfv /bin/cygwin*.dll cygwin-package +cp -rfv /bin/cygxml2*.dll cygwin-package +cp -rfv /bin/cygz*.dll cygwin-package + +echo +echo Creating Archive... +echo + +zip -r9 cygwin-package.zip cygwin-package + +echo +echo Packaging Complete. +echo + +exit 0