Finishing changes for release v5.1

pmeems · pmeems · commit 25148a76c692 · 2019-10-23T15:53:58.000+02:00
diff --git a/src/COM classes/GdalUtils.cpp b/src/COM classes/GdalUtils.cpp
@@ -422,7 +422,7 @@ STDMETHODIMP CGdalUtils::GdalBuildOverviews(BSTR sourceFilename, const tkGDALRes
 	}
 
 	const auto pszResampling = GdalHelper::GetResamplingAlgorithm(resamplingMethod);
-	// TODO: Shouldn't pszResampling be freed?
+	// It's a stack-based variable rather than an allocated variable.  So no delete is necessary.
 
 	// Call the GDALBuildOverviews function:	
 	m_globalSettings.SetGdalUtf8(true);
diff --git a/src/CopyTamasFiles.bat b/src/CopyTamasFiles.bat
@@ -25,9 +25,9 @@ FOR %%G IN (gdal_MrSID.dll gdal_netCDF.dll gdal_HDF5.dll gdal_HDF5Image.dll) DO
 )
 
 REM Copy gdal plugins:
-FOR %%G IN (gdal_ECW_JP2ECW.dll) DO (
-	IF EXIST %_from_dir%\gdal\plugins\%%G (
-    xcopy /v /c /r /y %_from_dir%\gdal\plugins\%%G  %_to_dir%gdalplugins\
+FOR %%G IN (gdal_ECW_JP2ECW.dll ogr_MSSQLSpatial.dll ogr_PG.dll) DO (
+	IF EXIST %_from_dir%\gdal\plugins-optional\%%G (
+    xcopy /v /c /r /y %_from_dir%\gdal\plugins-optional\%%G  %_to_dir%gdalplugins\
 	)
 )
 
diff --git a/src/InnoSetup/MapWinGIS-only.iss b/src/InnoSetup/MapWinGIS-only.iss
@@ -2,21 +2,23 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "MapWinGIS"
-#define MyAppVersion "5.0.2.3"
+#define MyAppVersion "5.1.0"
 #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 VsVersion = "2015" 
+#define VsVersion = "2017" 
 
 #ifdef x64BitVersion
   #define CPU "x64"
-  #define vcredist "vcredist_x64_2017.exe"
+  #define vcredist "vcredist_x64-" + VsVersion + ".exe"
   #define MySourceDir BinLocation + "\x64\"
   #define SystemFlag "64bit"
 #else
   #define CPU "Win32"
-  #define vcredist "vcredist_x86-2017.exe"
+  #define vcredist "vcredist_x86-" + VsVersion + ".exe"
   #define MySourceDir BinLocation + "\Win32\"
   #define SystemFlag "32bit"
 #endif
@@ -104,6 +106,9 @@ 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
+
 ;; GDAL data
 Source: "{#MySourceDir}\gdal-data\*"; DestDir: "{app}\gdal-data"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: MapWinGIS_Core
 Source: "{#BinLocation}\PROJ_NAD\*"; DestDir: "{app}\PROJ_NAD"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: MapWinGIS_Core
@@ -129,7 +134,7 @@ Name: "HDF5"; Description: "Add Hierarchical Data Format Release 5 support"; Typ
 Name: "MapWinGIS_Delphi"; Description: "Delphi Unit Source file (MapWinGIS_TLB.pas). If you don't know what it is you probably won't need it."; Types: full custom
 
 [Run]
-; Install VC++ 2015 if needed:
+; Install VC++ redistributables if needed:
 #ifdef x64BitVersion
 Filename: "{tmp}\{#vcredist}"; Parameters: "/quiet"; Flags: waituntilterminated; Check: VCRedistNeedsInstall_x64()
 #else
@@ -138,8 +143,8 @@ Filename: "{tmp}\{#vcredist}"; Parameters: "/quiet"; Flags: waituntilterminated;
 ;Run some command files:
 Filename: "{app}\regMapWinGIS.cmd"; WorkingDir: "{app}"; Flags: runhidden
 Filename: "https://www.mapwindow.org/documentation/mapwingis4.9/getting_started.html?utm_source=MWv50&utm_medium=cpc&utm_campaign=MWGvInstaller-v{#MyAppVersion}"; Flags: shellexec runasoriginaluser postinstall nowait skipifsilent; Description: "Go to the online documentation"
-Filename: "https://www.mapwindow.org/documentation/mapwingis4.9/MapWindow49.html?utm_source=MWv50&utm_medium=cpc&utm_campaign=MWGInstaller-v{#MyAppVersion}"; Flags: shellexec runasoriginaluser postinstall nowait skipifsilent; Description: "Read about the future of MapWinGIS/MapWindow v5"
 Filename: "https://www.mapwindow.org/documentation/mapwingis4.9/version_history.html?utm_source=MWv50&utm_medium=cpc&utm_campaign=MWGInstaller-v{#MyAppVersion}"; Flags: shellexec runasoriginaluser postinstall nowait skipifsilent; Description: "Read about the changes in this version"
+Filename: "https://mapwindow.discourse.group/?utm_source=MWv50&utm_medium=cpc&utm_campaign=MWGInstaller-v{#MyAppVersion}"; Flags: shellexec runasoriginaluser postinstall nowait skipifsilent; Description: "The official MapWinGIS and MW5 forum"
 
 [UninstallRun]
 Filename: "{app}\unregMapWinGIS.cmd"; WorkingDir: "{app}"; Flags: runhidden
diff --git a/src/InnoSetup/ReleaseNotes.rtf b/src/InnoSetup/ReleaseNotes.rtf
diff --git a/src/InnoSetup/vcredist_x64-2015.exe b/src/InnoSetup/vcredist_x64-2015.exe
diff --git a/src/InnoSetup/vcredist_x64-2017.exe b/src/InnoSetup/vcredist_x64-2017.exe
diff --git a/src/InnoSetup/vcredist_x86-2017.exe b/src/InnoSetup/vcredist_x86-2017.exe
diff --git a/src/MapWinGIS.cpp b/src/MapWinGIS.cpp
@@ -31,7 +31,7 @@ static char THIS_FILE[] = __FILE__;
 
 const GUID CDECL BASED_CODE _tlid = { 0xc368d713, 0xcc5f, 0x40ed, { 0x9f, 0x53, 0xf8, 0x4f, 0xe1, 0x97, 0xb9, 0x6a } };
 const WORD _wVerMajor = 5;
-const WORD _wVerMinor = 0;
+const WORD _wVerMinor = 1;
 
 CMapWinGISApp NEAR theApp;
 CMapWinGISModule _AtlModule;    // this one is from ATL7 (used by all ATL co-classes)
diff --git a/src/MapWinGIS.h b/src/MapWinGIS.h
@@ -11,7 +11,7 @@
 #include "GlobalClassFactory.h"
 
 #define VERSION_MAJOR 5
-#define VERSION_MINOR 0
+#define VERSION_MINOR 1
 
 extern const GUID CDECL _tlid;
 extern const WORD _wVerMajor;
diff --git a/src/MapWinGIS.idl b/src/MapWinGIS.idl
@@ -6679,7 +6679,7 @@ interface IGdalUtils : IDispatch{
 }
 
 [ 
-	uuid(C368D713-CC5F-40ED-9F53-F84FE197B96A), version(5.0),
+	uuid(C368D713-CC5F-40ED-9F53-F84FE197B96A), version(5.1),
 	helpfile("MapWinGIS.chm"),
 	helpstring("MapWinGIS Components"),
 	control 
@@ -6701,7 +6701,7 @@ library MapWinGIS
 	//  Primary dispatch interface for CMap
 	
 	[ uuid(1D077739-E866-46A0-B256-8AECC04F2312),
-	  helpstring("Dispatch interface for Map Control"),version(5.0), hidden
+	  helpstring("Dispatch interface for Map Control"),version(5.1), hidden
 	]
 	dispinterface _DMap
 	{
diff --git a/src/MapWinGIS.rc b/src/MapWinGIS.rc
@@ -112,8 +112,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,2,3
- PRODUCTVERSION 5,0,2,3
+ FILEVERSION 5,1,0,0
+ PRODUCTVERSION 5,1,0,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.0.2.3"
+            VALUE "FileVersion", "5.1.0.0"
             VALUE "InternalName", "MapWinGIS ActiveX Control"
             VALUE "LegalCopyright", "Copyright (C) 2004-2019 MapWindow OSS Team"
             VALUE "LegalTrademarks", "MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019"
             VALUE "OriginalFilename", "MapWinGIS.ocx"
             VALUE "ProductName", "MapWinGIS ActiveX Control"
-            VALUE "ProductVersion", "5.0.2.3"
+            VALUE "ProductVersion", "5.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/changingVersionNumbers.txt b/src/changingVersionNumbers.txt
@@ -1,8 +1,8 @@
 When releasing a new version version numbers need to be updated on several locations:
 MapWinGIS.rc lines: 114, 115, 133, 139  						 [5.0.0.0]
 MapWinGIS.cpp lines: 32, 33             						 [5.0]
-MapWinGIS.idl line: 6662 (helpfile("MapWinGIS.chm"))                                     [5.0]
-                  , 6684 (helpstring("Dispatch interface for Map Control"))              [5.0]
+MapWinGIS.idl line: 6682 (helpfile("MapWinGIS.chm"))                                     [5.0]
+                  , 6704 (helpstring("Dispatch interface for Map Control"))              [5.0]
 MapWinGIS.h lines: 13, 14                                                                [5.0]
 
 If you want to update AxInterop.MapWinGIS.dll and Interop.MapWinGIS.dll

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ STDMETHODIMP CGdalUtils::GdalBuildOverviews(BSTR sourceFilename, const tkGDALRes`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`const auto pszResampling = GdalHelper::GetResamplingAlgorithm(resamplingMethod);`
`425`		`- // TODO: Shouldn't pszResampling be freed?`
	`425`	`+ // It's a stack-based variable rather than an allocated variable. So no delete is necessary.`
`426`	`426`
`427`	`427`	`// Call the GDALBuildOverviews function:`
`428`	`428`	`m_globalSettings.SetGdalUtf8(true);`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ FOR %%G IN (gdal_MrSID.dll gdal_netCDF.dll gdal_HDF5.dll gdal_HDF5Image.dll) DO`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`REM Copy gdal plugins:`
`28`		`-FOR %%G IN (gdal_ECW_JP2ECW.dll) DO (`
`29`		`- IF EXIST %_from_dir%\gdal\plugins\%%G (`
`30`		`- xcopy /v /c /r /y %_from_dir%\gdal\plugins\%%G %_to_dir%gdalplugins\`
	`28`	`+FOR %%G IN (gdal_ECW_JP2ECW.dll ogr_MSSQLSpatial.dll ogr_PG.dll) DO (`
	`29`	`+ IF EXIST %_from_dir%\gdal\plugins-optional\%%G (`
	`30`	`+ xcopy /v /c /r /y %_from_dir%\gdal\plugins-optional\%%G %_to_dir%gdalplugins\`
`31`	`31`	`)`
`32`	`32`	`)`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -6679,7 +6679,7 @@ interface IGdalUtils : IDispatch{`
`6679`	`6679`	`}`
`6680`	`6680`
`6681`	`6681`	`[`
`6682`		`- uuid(C368D713-CC5F-40ED-9F53-F84FE197B96A), version(5.0),`
	`6682`	`+ uuid(C368D713-CC5F-40ED-9F53-F84FE197B96A), version(5.1),`
`6683`	`6683`	`helpfile("MapWinGIS.chm"),`
`6684`	`6684`	`helpstring("MapWinGIS Components"),`
`6685`	`6685`	`control`
`@@ -6701,7 +6701,7 @@ library MapWinGIS`
`6701`	`6701`	`// Primary dispatch interface for CMap`
`6702`	`6702`
`6703`	`6703`	`[ uuid(1D077739-E866-46A0-B256-8AECC04F2312),`
`6704`		`- helpstring("Dispatch interface for Map Control"),version(5.0), hidden`
	`6704`	`+ helpstring("Dispatch interface for Map Control"),version(5.1), hidden`
`6705`	`6705`	`]`
`6706`	`6706`	`dispinterface _DMap`
`6707`	`6707`	`{`