1 删除无用文件;

2 新增打包使用 vcredist opencl 等库文件

bin/ddfd.cpg

-UTF-8
\ No newline at end of file

bin/node.cpg

-UTF-8
\ No newline at end of file

bin/qt.conf

@@ -5,3 +5,4 @@ Plugins=$(O4W_QT_PLUGINS)
 Libraries=$(O4W_QT_LIBRARIES)
 Translations=$(O4W_QT_TRANSLATIONS)
 Headers=$(O4W_QT_HEADERS)
+Documentation=$(O4W_QT_DOC)

bin/road.cpg

-UTF-8
\ No newline at end of file

etc/setup/installed.db

@@ -17,9 +17,9 @@ freetype-vc-devel freetype-vc-devel-2.5.0-1.tar.bz2 0
 freexl freexl-1.0.2-1.tar.bz2 0
 gdal gdal-3.0.4-2.tar.bz2 0
 gdal-csharp gdal-csharp-3.0.4-2.tar.bz2 0
-gdal-dev gdal-dev-3.2.0-101.tar.bz2 0
-gdal-dev-mss gdal-dev-mss-3.2.0-101.tar.bz2 0
-gdal-dev-oracle gdal-dev-oracle-3.2.0-101.tar.bz2 0
+gdal-dev gdal-dev-3.2.0-103.tar.bz2 0
+gdal-dev-mss gdal-dev-mss-3.2.0-103.tar.bz2 0
+gdal-dev-oracle gdal-dev-oracle-3.2.0-103.tar.bz2 0
 gdal-ecw gdal-ecw-3.0.4-2.tar.bz2 0
 gdal-filegdb gdal-filegdb-3.0.4-2.tar.bz2 0
 gdal-hdf5 gdal-hdf5-3.0.4-2.tar.bz2 0
@@ -89,8 +89,8 @@ proj proj-6.3.2-1.tar.bz2 0
 proj-beta2007 proj-beta2007-1.0-2.tar.bz2 0
 proj-datumgrid proj-datumgrid-1.8-1.tar.bz2 0
 proj-datumgrid-oceania proj-datumgrid-oceania-1.2-1.tar.bz2 0
-proj-dev proj-dev-7.2.0-25.tar.bz2 0
-proj-dev-data proj-dev-data-1.2-1.tar.bz2 0
+proj-dev proj-dev-7.2.0-28.tar.bz2 0
+proj-dev-data proj-dev-data-1.2-2.tar.bz2 0
 proj-hpgn proj-hpgn-1.0-1.tar.bz2 0
 proj4dll proj4dll-4.9.3-2.tar.bz2 0
 proj5dll proj5dll-5.2.0-1.tar.bz2 0
@@ -195,7 +195,7 @@ qwt-devel-qt5 qwt-devel-qt5-6.1.3-5.tar.bz2 0
 qwt-doc-qt5 qwt-doc-qt5-6.1.3-5.tar.bz2 0
 qwt-libs-qt5 qwt-libs-qt5-6.1.3-5.tar.bz2 0
 qwt5-libs-qt4 qwt5-libs-qt4-5.2.3-1.tar.bz2 0
-rbatch rbatch-149-4.tar.bz2 0
+rbatch rbatch-149-5.tar.bz2 0
 saga-ltr saga-ltr-2.3.2-4.tar.bz2 0
 setup setup-1.0.7-16.tar.bz2 0
 shell shell-1.0.2-4.tar.bz2 0

etc/setup/setup.rc

@@ -4,7 +4,7 @@ mirrors-lst
 	http://ftp.osuosl.org/pub/osgeo/download/osgeo4w/;OSL;USA;Oregon
 	http://www.norbit.de/osgeo4w/;norBIT GmbH;Germany;Niedersachsen
 window-placement
-	44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,182,0,0,0,192,0,0,0,151,5,0,0,52,3,0,0
+	44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,161,0,0,0,11,1,0,0,130,5,0,0,127,3,0,0
 last-mode
 	Advanced
 last-mirror

etc/setup/timestamp

-1599721915
\ No newline at end of file
+1600067353
\ No newline at end of file

installpackages/etc/ini/msvcrt.bat

+rem This is just a dummy to make sure the for loop in ..\..\osgeo4w.bat 
+rem always has some files to process.

installpackages/etc/postinstall/msvcrt-2008.bat

+for %%f in ("%TEMP%") do call set TEMPDRIVE=%%~df
+cd %TEMP%
+
+"%OSGEO4W_ROOT%\bin\vcredist-2008-sp1-x64.exe" /q
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2008-sp1-x64.exe"

installpackages/etc/postinstall/msvcrt-2010.bat

+for %%f in ("%TEMP%") do call set TEMPDRIVE=%%~df
+cd %TEMP%
+
+"%OSGEO4W_ROOT%\bin\vcredist-2010-x64.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2010-x64.exe"

installpackages/etc/postinstall/msvcrt-2013.bat

+for %%f in ("%TEMP%") do call set TEMPDRIVE=%%~df
+cd %TEMP%
+
+"%OSGEO4W_ROOT%\bin\vcredist-2013-x64.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2013-x64.exe"

installpackages/etc/postinstall/opencl.bat

+dllupdate -copy -reboot "%OSGEO4W_ROOT%\bin\opencl.dll"
+if errorlevel 1 exit /b 1
+if exist %WINDIR%\system32\opencl.dll del "%OSGEO4W_ROOT%\bin\opencl.dll"

installpackages/etc/postinstall/sqlncli.bat

+IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" msiexec /i "%OSGEO4W_ROOT%\bin\sqlncli-x86_64.msi" /qb IACCEPTSQLNCLILICENSETERMS=YES
+IF "%PROCESSOR_ARCHITECTURE%" == "x86" msiexec /i "%OSGEO4W_ROOT%\bin\sqlncli-x86.msi" /qb IACCEPTSQLNCLILICENSETERMS=YES

installpackages/etc/preremove/opencl.bat

+dllupdate -unref -reboot "%OSGEO4W_ROOT%\bin\opencl.dll"

installpackages/etc/preremove/sqlncli.bat

+IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" msiexec /x "%OSGEO4W_ROOT%\bin\sqlncli-x86_64.msi"
+IF "%PROCESSOR_ARCHITECTURE%" == "x86" msiexec /x "%OSGEO4W_ROOT%\bin\sqlncli-x86.msi"

postinstall.bat

+@echo off
+pushd %~dp0
+
+set OSGEO4W_ROOT=%~dp0
+if "%OSGEO4W_ROOT:~-1%" == "\"  set OSGEO4W_ROOT=%OSGEO4W_ROOT:~0,-1%
+path %OSGEO4W_ROOT%bin;%path%
+
+REM 2008 vcredist
+for %%f in ("%TEMP%") do call set TEMPDRIVE=%%~df
+cd %TEMP%
+
+echo "patient install vcredist 2008 ...."
+"%OSGEO4W_ROOT%\bin\vcredist-2008-sp1-x64.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2008-sp1-x64.exe"
+
+echo "patient install vcredist 2010 ...."
+REM 2010 vcredist
+"%OSGEO4W_ROOT%\bin\vcredist-2010-x64.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2010-x64.exe"
+
+echo "patient install vcredist 2013 ...."
+REM 2013 vcredist
+"%OSGEO4W_ROOT%\bin\vcredist-2013-x64.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2013-x64.exe"
+
+REM 2012 vcredist 2015 vcredist 安装库的方式都是直接拷贝dll库到 bin目录下
+
+echo "patient install vcredist 2015-19 x64 ...."
+REM 2015-19 vcredist x64 安装
+"%OSGEO4W_ROOT%\bin\vcredist-2015-19-x64.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2015-19-x64.exe"
+
+echo "patient install vcredist 2015-19 x86 ...."
+REM 2015-19 vcredist x86 安装
+"%OSGEO4W_ROOT%\bin\vcredist-2015-19-x86.exe" /q /norestart
+if errorlevel 3010 echo>"%OSGEO4W_ROOT%\etc\reboot"
+del "%OSGEO4W_ROOT%\bin\vcredist-2015-19-x86.exe"
+
+echo "patient install liblas.bat.tmpl --> liblas.bat"
+REM liblas
+call textreplace -sf "%OSGEO4W_ROOT%\bin\liblas.bat.tmpl" -df "%OSGEO4W_ROOT%\bin\liblas.bat" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+echo "patient install bin\nc-config.tmpl --> bin\nc-config"
+REM netcdf
+set OSGEO4W_ROOT_TEMP=%OSGEO4W_ROOT:\=/%
+textreplace -std -t "%OSGEO4W_ROOT%\bin\nc-config"
+call textreplace -sf "%OSGEO4W_ROOT%\bin\nc-config.tmpl" -df "%OSGEO4W_ROOT%\bin\nc-config" -map @osgeo4w_msys@ "%OSGEO4W_ROOT_TEMP%"
+
+echo "patient check bin\opencl.dll --> system32\opencl.dll"
+set OSGEO4W_ROOT=%OSGEO4W_ROOT:/=\%
+REM opencl
+dllupdate -copy -reboot "%OSGEO4W_ROOT%\bin\opencl.dll"
+if errorlevel 1 exit /b 1
+if exist %WINDIR%\system32\opencl.dll del "%OSGEO4W_ROOT%\bin\opencl.dll"
+
+echo "patient check openssl ..."
+REM openssl
+dllupdate -oite -copy -reboot "%OSGEO4W_ROOT%\bin\libcrypto-1_1-x64.dll"
+dllupdate -oite -copy -reboot "%OSGEO4W_ROOT%\bin\libssl-1_1-x64.dll"
+
+echo "patient check openssl10 ..."
+REM openssl10
+dllupdate -oite -copy -reboot "%OSGEO4W_ROOT%\bin\libeay32.dll"
+dllupdate -oite -copy -reboot "%OSGEO4W_ROOT%\bin\ssleay32.dll" 
+
+echo "patient check python3-pip ..."
+REM python3-pip
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\pip.exe.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\pip.exe" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\pip3.exe.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\pip3.exe" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\pip3.7.exe.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\pip3.7.exe" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+echo "patient check python3-setuptools ..."
+REM python3-setuptools
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\easy_install-3.7.exe.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\easy_install-3.7.exe" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\easy_install.exe.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\easy_install.exe" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+echo "patient check python-core gdal-pythoh ..."
+REM python-core.bat gdal-python
+call "%OSGEO4W_ROOT%\bin\make-bat-for-py.bat"
+
+echo "patient check qt4-libs ..."
+REM qt4-libs
+copy "%OSGEO4W_ROOT%\bin\qt4.conf" "%OSGEO4W_ROOT%\bin\qt.conf"
+
+echo "patient check qt5-libs ..."
+REM qt5-libs
+copy "%OSGEO4W_ROOT%\bin\qt5.conf" "%OSGEO4W_ROOT%\bin\qt.conf"
+
+echo "patient check pyqt4 ..."
+REM pyqt4
+textreplace -sf "%OSGEO4W_ROOT%\bin\pyuic4.bat.tmpl" -df "%OSGEO4W_ROOT%\bin\pyuic4.bat" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+REM textreplace -sf "%OSGEO4W_ROOT%\apps\Python27\Lib\site-packages\PyQt4\pyqtconfig.py.tmpl" -df "%OSGEO4W_ROOT%apps\Python27\Lib\site-packages\PyQt4\pyqtconfig.py" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+REM pyqt5
+echo "patient check pyqt5 ..."
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\pyuic5.bat.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\pyuic5.bat" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\pyrcc5.bat.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\pyrcc5.bat" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Scripts\pylupdate5.bat.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Scripts\pylupdate5.bat" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+REM shell.bat
+REM if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
+REM if not %OSGEO4W_MENU_LINKS%==0 xxmklink "%OSGEO4W_STARTMENU%\OSGeo4W Shell.lnk" "%OSGEO4W_ROOT%\OSGeo4W.bat" " " \ "OSGeo for Windows command shell" 1 "%OSGEO4W_ROOT%\OSGeo4W.ico"
+REM if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"
+REM if not %OSGEO4W_DESKTOP_LINKS%==0 xxmklink "%OSGEO4W_DESKTOP%\OSGeo4W Shell.lnk" "%OSGEO4W_ROOT%\OSGeo4W.bat" " " \ "OSGeo for Windows command shell" 1 "%OSGEO4W_ROOT%\OSGeo4W.ico"
+
+REM sip.bat
+REM textreplace -sf "%OSGEO4W_ROOT%\apps\Python27\Lib\site-packages\sipconfig.py.tmpl" -df "%OSGEO4W_ROOT%\apps\Python27\Lib\site-packages\sipconfig.py" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+echo "patient check sip-qt5 ..."
+REM sip-qt5.bat
+textreplace -sf "%OSGEO4W_ROOT%\apps\Python37\Lib\site-packages\sipconfig.py.tmpl" -df "%OSGEO4W_ROOT%\apps\Python37\Lib\site-packages\sipconfig.py" -map @osgeo4w@ "%OSGEO4W_ROOT%"
+
+echo "patient install sqlncli ..."
+REM sqlncli
+IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" msiexec /i "%OSGEO4W_ROOT%\bin\sqlncli-x86_64.msi" /qb IACCEPTSQLNCLILICENSETERMS=YES
+IF "%PROCESSOR_ARCHITECTURE%" == "x86" msiexec /i "%OSGEO4W_ROOT%\bin\sqlncli-x86.msi" /qb IACCEPTSQLNCLILICENSETERMS=YES
+
+goto end
+
+:end
+ popd