Merge branch 'release/v4.9.4.2'

Author: Paul Meems

src/InnoSetup/MapWinGIS-only.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "MapWinGIS"
-#define MyAppVersion "4.9.4.0"
+#define MyAppVersion "4.9.4.2"
 #define MyAppPublisher "MapWindow Open Source GIS Community"
 #define MyAppURL "http://www.mapwindow.org"
-#define SetupLocation "D:\dev\MapwinGIS\GIT\src\InnoSetup"
-#define BinLocation "D:\dev\MapwinGIS\GIT\src\bin"
+#define SetupLocation "D:\dev\MapwinGIS\GitHub\src\InnoSetup"
+#define BinLocation "D:\dev\MapwinGIS\GitHub\src\bin"
 #define x64BitVersion
 
 #ifdef x64BitVersion

src/InnoSetup/ReleaseNotes.rtf

@@ -111,8 +111,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,9,4,0
- PRODUCTVERSION 4,9,4,0
+ FILEVERSION 4,9,4,2
+ PRODUCTVERSION 4,9,4,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -130,13 +130,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", "4.9.4.0"
+            VALUE "FileVersion", "4.9.4.2"
             VALUE "InternalName", "MapWinGIS ActiveX Control"
             VALUE "LegalCopyright", "Copyright (C) 2004-2016 MapWindow OSS Team"
             VALUE "LegalTrademarks", "MapWindow GIS is a trademark of Daniel P. Ames, 2005-2016"
             VALUE "OriginalFilename", "MapWinGIS.ocx"
             VALUE "ProductName", "MapWinGIS ActiveX Control"
-            VALUE "ProductVersion", "4.9.4.0"
+            VALUE "ProductVersion", "4.9.4.2"
         END
     END
     BLOCK "VarFileInfo"

src/MapWinGIS.rc

@@ -1,18 +1,10 @@
 When releasing a new version version numbers need to be updated on several locations:
-MapWinGIS.rc lines: 56, 57, 75, 71
-MapWinGIS.cpp lines: 21, 22
-MapWinGIS.odl line: 1835 (helpfile("MapWinGIS.chm"))
-                  , 1848 (helpstring("Dispatch interface for Map Control"))
+MapWinGIS.rc lines: 114, 115, 133, 139
+MapWinGIS.cpp lines: 32, 33
+MapWinGIS.idl line: 6395 (helpfile("MapWinGIS.chm"))
+                  , 6416 (helpstring("Dispatch interface for Map Control"))
 
 If you want to update AxInterop.MapWinGIS.dll and Interop.MapWinGIS.dll
-just delete them, unregister the ocx using
-regsvr32 /u /s MapWinGIS.ocx
-Rebuild the MapWinGIS solution.
-register the ocx again using regMapWinGIS.cmd
-Start a new project in VS2008.
-Add a reference to the MapWinGIS Components (using the COM tab of the reference form)
-Compile and in the bin folder of this temp project a new Interop.MapWinGIS.dll is created.
-Add a form to your project and drag the MapWinGIS component on your form.
-Recompile and a new AxInterop.MapWinGIS.dll is also created.
+you can run the InteropCreator project. It is a C# project which will create the interop dlls for you.
 
 Copy these two interop dll to the bin folder and you're ready to go.