Merge branch 'release/v5.2.3'

src/CopyTamasFiles.bat

@@ -36,10 +36,10 @@ xcopy /v /c /r /y %_from_dir%\gdal-data\*.* %_to_dir%gdal-data\
 xcopy /v /c /r /y %_from_dir%\proj\SHARE\*.* %_to_dir%..\PROJ_NAD\
 
 REM Copy needed Tamas binaries:
-FOR %%G IN (cfitsio.dll geos.dll geos_c.dll hdf5.dll hdf5_hl.dll hdf5_cpp.dll hdf5_hl_cpp.dll libcurl.dll 
-            iconv.dll libeay32.dll libmysql.dll libpq.dll libxml2.dll lti_lidar_dsdk_1.1.dll netcdf.dll  
-            openjp2.dll proj.dll spatialite.dll sqlite3.dll freexl.dll  
-            ssleay32.dll szip.dll tbb.dll xdrdll.dll zlib1.dll libtiff.dll expat.dll NCSEcw.dll) DO (
+FOR %%G IN (cfitsio.dll expat.dll freexl.dll geos.dll geos_c.dll hdf5.dll hdf5_hl.dll hdf5_cpp.dll hdf5_hl_cpp.dll libcrypto-1_1.dll libcrypto-1_1-x64.dll libcurl.dll  
+            iconv.dll libmysql.dll libpq.dll libssl-1_1.dll libssl-1_1-x64.dll libtiff.dll libxml2.dll lti_lidar_dsdk_1.1.dll netcdf.dll   
+            openjp2.dll proj.dll spatialite.dll sqlite3.dll szip.dll tbb.dll xdrdll.dll zlib1.dll  
+            NCSEcw.dll) DO (
 	IF EXIST %_from_dir%\%%G (
     xcopy /v /c /r /y %_from_dir%\%%G  %_to_dir%
 	)

src/InnoSetup/MapWinGIS-only.iss

@@ -2,12 +2,12 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "MapWinGIS"
-#define MyAppVersion "5.2.2"
+#define MyAppVersion "5.2.3"
 #define MyAppPublisher "MapWindow Open Source GIS Community"
 #define MyAppURL "http://www.mapwindow.org"
 #define SetupLocation "D:\dev\MapWindow\MapWinGIS\git\src\InnoSetup"
 #define BinLocation "D:\dev\MapWindow\MapWinGIS\git\src\bin"
-;; #define x64BitVersion
+#define x64BitVersion
 ;; #define VsVersion = "2015" 
 #define VsVersion = "2017" 
 
@@ -94,8 +94,8 @@ Source: "{#BinLocation}\Licenses\MapWinGISLicense.rtf"; DestDir: "{app}\Licenses
 ;Source: "Licenses\OCILicense.rtf"; DestDir: "{app}\Licenses\"; Flags: ignoreversion; Components: MapWinGIS_Core
 ;Source: "Licenses\SZIPLicense.rtf"; DestDir: "{app}\Licenses\"; Flags: ignoreversion; Components: MapWinGIS_Core
 ;; GDAL Plugins:
-Source: "{#MySourceDir}\gdalplugins\gdal_ECW_JP2ECW.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: ECW
-Source: "{#BinLocation}\Licenses\ECW5License.rtf"; DestDir: "{app}\Licenses\"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: ECW
+;;Source: "{#MySourceDir}\gdalplugins\gdal_ECW_JP2ECW.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: ECW
+;;Source: "{#BinLocation}\Licenses\ECW5License.rtf"; DestDir: "{app}\Licenses\"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: ECW
 Source: "{#MySourceDir}\gdalplugins\gdal_MrSID.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: MrSID
 Source: "{#BinLocation}\Licenses\MRSIDLicense.rtf"; DestDir: "{app}\Licenses\"; Flags: ignoreversion; Components: MrSID
 Source: "{#MySourceDir}\gdalplugins\gdal_netCDF.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: NetCDF
@@ -107,8 +107,8 @@ Source: "{#BinLocation}\Licenses\HDF5License.rtf"; DestDir: "{app}\Licenses\"; F
 ;;Source: "{#MySourceDir}\gdalplugins\gdal_HDF4Image.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: HDF4
 ;;Source: "{#BinLocation}\Licenses\HDF4License.rtf"; DestDir: "{app}\Licenses\"; Flags: ignoreversion; Components: HDF4
 
-Source: "{#MySourceDir}\gdalplugins\ogr_MSSQLSpatial.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: MapWinGIS_Core
-Source: "{#MySourceDir}\gdalplugins\ogr_PG.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: MapWinGIS_Core
+;;Source: "{#MySourceDir}\gdalplugins\ogr_MSSQLSpatial.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: MapWinGIS_Core
+;;Source: "{#MySourceDir}\gdalplugins\ogr_PG.dll"; DestDir: "{app}\gdalplugins\"; Flags: ignoreversion {#SystemFlag}; Components: MapWinGIS_Core
 
 ;; GDAL data
 Source: "{#MySourceDir}\gdal-data\*"; DestDir: "{app}\gdal-data"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: MapWinGIS_Core
@@ -128,7 +128,7 @@ BeveledLabel=MapWinGIS Open Source ActiveX Map Control
 [Components]
 Name: "MapWinGIS_Core"; Description: "Core files for MapWinGIS"; Types: full custom compact; Flags: fixed
 Name: "NetCDF"; Description: "Add NetCDF support"; Types: full custom
-Name: "ECW"; Description: "Add ECW & JPEG2000 support"; Types: full custom
+;;Name: "ECW"; Description: "Add ECW & JPEG2000 support"; Types: full custom
 Name: "MrSID"; Description: "Add MrSID support"; Types: full custom
 ;; Name: "HDF4"; Description: "Add Hierarchical Data Format Release 4 support"; Types: full custom
 Name: "HDF5"; Description: "Add Hierarchical Data Format Release 5 support"; Types: full custom

src/MapWinGIS.rc

@@ -112,8 +112,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,2,2,0
- PRODUCTVERSION 5,2,2,0
+ FILEVERSION 5,2,3,0
+ PRODUCTVERSION 5,2,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -131,13 +131,13 @@ BEGIN
             VALUE "Comments", "This control includes a mapping component and objects for reading and writing shapefiles and various triangulated irregular network and grid files. It also has extensive label and chart options and includes projection routines."
             VALUE "CompanyName", "MapWindow OSS Team - www.mapwindow.org"
             VALUE "FileDescription", "MapWinGIS ActiveX Control"
-            VALUE "FileVersion", "5.2.2.0"
+            VALUE "FileVersion", "5.2.3.0"
             VALUE "InternalName", "MapWinGIS ActiveX Control"
             VALUE "LegalCopyright", "Copyright (C) 2004-2020 MapWindow OSS Team"
             VALUE "LegalTrademarks", "MapWindow GIS is a trademark of Daniel P. Ames, 2005-2020"
             VALUE "OriginalFilename", "MapWinGIS.ocx"
             VALUE "ProductName", "MapWinGIS ActiveX Control"
-            VALUE "ProductVersion", "5.2.2.0"
+            VALUE "ProductVersion", "5.2.3.0"
         END
     END
     BLOCK "VarFileInfo"