Skip to content

Commit ca0946d

Browse files
pmeemspmeems
committed
Getting ready for a new release.
1 parent 8ac88cb commit ca0946d

6 files changed

Lines changed: 534 additions & 506 deletions

File tree

‎src/InnoSetup/MapWinGIS-only.iss‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "MapWinGIS"
5-
#define MyAppVersion "5.0.1.0"
5+
#define MyAppVersion "5.0.2.3"
66
#define MyAppPublisher "MapWindow Open Source GIS Community"
77
#define MyAppURL "http://www.mapwindow.org"
8-
#define SetupLocation "D:\dev\MapwinGIS\GitHub\src\InnoSetup"
9-
#define BinLocation "D:\dev\MapwinGIS\GitHub\src\bin"
10-
#define x64BitVersion
8+
#define SetupLocation "D:\dev\MapWindow\MapWinGIS\git\src\InnoSetup"
9+
#define BinLocation "D:\dev\MapWindow\MapWinGIS\git\src\bin"
10+
;; #define x64BitVersion
1111

1212
#ifdef x64BitVersion
1313
#define CPU "x64"
14-
#define vcredist "vcredist_x64_2015.exe"
14+
#define vcredist "vcredist_x64_2017.exe"
1515
#define MySourceDir BinLocation + "\x64\"
1616
#define SystemFlag "64bit"
1717
#else
1818
#define CPU "Win32"
19-
#define vcredist "vcredist_x86-2015.exe"
19+
#define vcredist "vcredist_x86-2017.exe"
2020
#define MySourceDir BinLocation + "\Win32\"
2121
#define SystemFlag "32bit"
2222
#endif
@@ -46,7 +46,7 @@ WizardImageFile={#SetupLocation}\WizImage-MW.bmp
4646
WizardSmallImageFile={#SetupLocation}\WizSmallImage-MW.bmp
4747
AppCopyright={#MyAppPublisher}
4848
PrivilegesRequired=admin
49-
MinVersion=0,5.01sp3
49+
MinVersion=0,6.0
5050
ChangesEnvironment=yes
5151
AlwaysShowDirOnReadyPage=True
5252
EnableDirDoesntExistWarning=True
@@ -194,6 +194,11 @@ const
194194
VC_2015_REDIST_X86 = '{8F271F6C-6E7B-3D0A-951B-6E7B694D78BD}'; //Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14
195195
VC_2015_REDIST_X64 = '{221D6DB4-46E2-333C-B09B-5F49351D0980}'; //Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14
196196
197+
// https://bell0bytes.eu/inno-setup-vc/
198+
// { Visual C++ 2017 Redistributable 14.16.27024 }
199+
VC_2017_REDIST_X86 = '{5EEFCEFB-E5F7-4C82-99A5-813F04AA4FBD}';
200+
VC_2017_REDIST_X64 = '{F1B0FB3A-E0EA-47A6-9383-3650655403B0}';
201+
197202
function MsiQueryProductState(szProduct: string): INSTALLSTATE;
198203
external 'MsiQueryProductState{#AW}@msi.dll stdcall';
199204
@@ -209,7 +214,7 @@ begin
209214
// this statement, the following won't install your VC redist only when
210215
// the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
211216
// are installed for the current user
212-
Result := not (VCVersionInstalled(VC_2015_REDIST_X86));
217+
Result := not (VCVersionInstalled(VC_2017_REDIST_X86));
213218
end;
214219
215220
function VCRedistNeedsInstall_x64(): Boolean;
@@ -219,7 +224,7 @@ begin
219224
// this statement, the following won't install your VC redist only when
220225
// the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
221226
// are installed for the current user
222-
Result := not (VCVersionInstalled(VC_2015_REDIST_X64));
227+
Result := not (VCVersionInstalled(VC_2017_REDIST_X64));
223228
end;
224229
225230
function NeedsAddPath(Param: string): boolean;
@@ -241,51 +246,51 @@ end;
241246
242247
[Languages]
243248
Name: "english"; MessagesFile: "compiler:Default.isl"
244-
Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"
245-
Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
246-
Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
247-
Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
248-
Name: "belarusian"; MessagesFile: "compiler:Languages\Belarusian.isl"
249-
Name: "bosnian"; MessagesFile: "compiler:Languages\Bosnian.isl"
249+
;;Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"
250+
;;Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
251+
;;Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
252+
;;Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
253+
;;Name: "belarusian"; MessagesFile: "compiler:Languages\Belarusian.isl"
254+
;;Name: "bosnian"; MessagesFile: "compiler:Languages\Bosnian.isl"
250255
Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
251-
Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
256+
;;Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
252257
Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
253-
Name: "chinesesimp"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
254-
Name: "chinesetrad"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
258+
;;Name: "chinesesimp"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
259+
;;Name: "chinesetrad"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
255260
Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
256261
Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
257262
Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
258263
Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
259-
Name: "estonian"; MessagesFile: "compiler:Languages\Estonian.isl"
264+
;;Name: "estonian"; MessagesFile: "compiler:Languages\Estonian.isl"
260265
Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
261266
Name: "french"; MessagesFile: "compiler:Languages\French.isl"
262-
Name: "galician"; MessagesFile: "compiler:Languages\Galician.isl"
267+
;;Name: "galician"; MessagesFile: "compiler:Languages\Galician.isl"
263268
Name: "german"; MessagesFile: "compiler:Languages\German.isl"
264-
Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
269+
;;Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
265270
Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
266-
Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
271+
;;Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
267272
Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
268-
Name: "indonesian"; MessagesFile: "compiler:Languages\Indonesian.isl"
273+
;;Name: "indonesian"; MessagesFile: "compiler:Languages\Indonesian.isl"
269274
Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
270275
Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
271-
Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
272-
Name: "lithuanian"; MessagesFile: "compiler:Languages\Lithuanian.isl"
273-
Name: "luxemburgish"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
274-
Name: "macedonian"; MessagesFile: "compiler:Languages\Macedonian.isl"
275-
Name: "malaysian"; MessagesFile: "compiler:Languages\Malaysian.isl"
276+
;;Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
277+
;;Name: "lithuanian"; MessagesFile: "compiler:Languages\Lithuanian.isl"
278+
;;Name: "luxemburgish"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
279+
;;Name: "macedonian"; MessagesFile: "compiler:Languages\Macedonian.isl"
280+
;;Name: "malaysian"; MessagesFile: "compiler:Languages\Malaysian.isl"
276281
;;Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
277282
Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
278283
Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
279284
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
280-
Name: "romanian"; MessagesFile: "compiler:Languages\Romanian.isl"
285+
;;Name: "romanian"; MessagesFile: "compiler:Languages\Romanian.isl"
281286
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
282-
Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
283-
Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
284-
Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
287+
;;Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
288+
;;Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
289+
;;Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
285290
Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
286291
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
287-
Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
288-
Name: "tatarish"; MessagesFile: "compiler:Languages\Tatar.isl"
292+
;;Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
293+
;;Name: "tatarish"; MessagesFile: "compiler:Languages\Tatar.isl"
289294
Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
290295
Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
291296

‎src/MapWinGIS.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ END
112112
//
113113

114114
VS_VERSION_INFO VERSIONINFO
115-
FILEVERSION 5,0,1,0
116-
PRODUCTVERSION 5,0,1,0
115+
FILEVERSION 5,0,2,3
116+
PRODUCTVERSION 5,0,2,3
117117
FILEFLAGSMASK 0x3fL
118118
#ifdef _DEBUG
119119
FILEFLAGS 0x1L
@@ -131,13 +131,13 @@ BEGIN
131131
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."
132132
VALUE "CompanyName", "MapWindow OSS Team - www.mapwindow.org"
133133
VALUE "FileDescription", "MapWinGIS ActiveX Control"
134-
VALUE "FileVersion", "5.0.1.0"
134+
VALUE "FileVersion", "5.0.2.3"
135135
VALUE "InternalName", "MapWinGIS ActiveX Control"
136136
VALUE "LegalCopyright", "Copyright (C) 2004-2019 MapWindow OSS Team"
137137
VALUE "LegalTrademarks", "MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019"
138138
VALUE "OriginalFilename", "MapWinGIS.ocx"
139139
VALUE "ProductName", "MapWinGIS ActiveX Control"
140-
VALUE "ProductVersion", "5.0.1.0"
140+
VALUE "ProductVersion", "5.0.2.3"
141141
END
142142
END
143143
BLOCK "VarFileInfo"

‎src/changingVersionNumbers.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
When releasing a new version version numbers need to be updated on several locations:
22
MapWinGIS.rc lines: 114, 115, 133, 139 [5.0.0.0]
33
MapWinGIS.cpp lines: 32, 33 [5.0]
4-
MapWinGIS.idl line: 6629 (helpfile("MapWinGIS.chm")) [5.0]
5-
, 6651 (helpstring("Dispatch interface for Map Control")) [5.0]
4+
MapWinGIS.idl line: 6662 (helpfile("MapWinGIS.chm")) [5.0]
5+
, 6684 (helpstring("Dispatch interface for Map Control")) [5.0]
66
MapWinGIS.h lines: 13, 14 [5.0]
77

88
If you want to update AxInterop.MapWinGIS.dll and Interop.MapWinGIS.dll

0 commit comments

Comments
 (0)