|
@@ -1,6 +1,6 @@
|
|
#!/usr/bin/bash
|
|
#!/usr/bin/bash
|
|
|
|
|
|
-# osgeo4w-setup -g -k -a x86_64 -q -P gdal proj geos fftw libjpeg liblas-devel libpng libpq libtiff libxdr pdcurses regex-devel sqlite3 zstd-devel zstd laszip2
|
|
|
|
|
|
+# osgeo4w-setup -g -k -a x86_64 -q -P gdal proj geos fftw libjpeg liblas-devel libpng libpq libtiff libxdr pdcurses regex-devel sqlite3 zstd-devel zstd laszip2 python3-core python3-six
|
|
|
|
|
|
set -e
|
|
set -e
|
|
|
|
|
|
@@ -166,14 +166,6 @@ else
|
|
conf_opts=
|
|
conf_opts=
|
|
fi
|
|
fi
|
|
|
|
|
|
-mkdir -p dist.$conf_host/bin
|
|
|
|
-cp -uv $DLLS dist.$conf_host/bin
|
|
|
|
-
|
|
|
|
-mkdir -p mswindows/osgeo4w/lib
|
|
|
|
-cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/pq.lib
|
|
|
|
-cp -uv $OSGEO4W_ROOT_MSYS/lib/proj_i.lib mswindows/osgeo4w/lib/proj.lib
|
|
|
|
-cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
|
|
|
|
-
|
|
|
|
if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
|
|
if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
|
|
if [ -e include/Make/Platform.make ] ; then
|
|
if [ -e include/Make/Platform.make ] ; then
|
|
log make distclean
|
|
log make distclean
|
|
@@ -183,6 +175,14 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
|
|
log remove old logs
|
|
log remove old logs
|
|
rm -f mswindows/osgeo4w/package.log.*
|
|
rm -f mswindows/osgeo4w/package.log.*
|
|
|
|
|
|
|
|
+ mkdir -p dist.$conf_host/bin
|
|
|
|
+ cp -uv $DLLS dist.$conf_host/bin
|
|
|
|
+
|
|
|
|
+ mkdir -p mswindows/osgeo4w/lib
|
|
|
|
+ cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/pq.lib
|
|
|
|
+ cp -uv $OSGEO4W_ROOT_MSYS/lib/proj_i.lib mswindows/osgeo4w/lib/proj.lib
|
|
|
|
+ cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
|
|
|
|
+
|
|
log configure
|
|
log configure
|
|
./configure \
|
|
./configure \
|
|
--host=$conf_host \
|
|
--host=$conf_host \
|