Prep for version 10.2 release [ci skip]

markummitchell · Aug 20, 2017 · e906193 · e906193
1 parent 47029dd
commit e906193
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 19 deletions.
diff --git a/dev/osx/Info_valid.plist b/dev/osx/Info_valid.plist
@@ -13,9 +13,9 @@
 	<key>CFBundleExecutable</key>
 	<string>Engauge Digitizer</string>
 	<key>CFBundleVersion</key>
-	<string>10.1</string>
+	<string>10.2</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.1</string>
+	<string>10.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>CFBundleIdentifier</key>

diff --git a/dev/windows/build_msi_and_zip.bat b/dev/windows/build_msi_and_zip.bat
@@ -118,6 +118,33 @@ if "%ARCH%" == "x86" (
   move system32\vcruntime140.dll vcruntime140.dll
 )
 
+cd "%SCRIPTDIR%"
+echo "*** engauge.wxs ***"
+git diff --word-diff --unified=0 engauge.wxs 2>nul | findStr "["
+findStr "Id='" engauge.wxs | findStr /v Component | findStr /v Directory | findStr /v Feature | findStr /v File | findStr /v Folder | findStr /v Media | findStr /v Package | findStr /v Property 
+findStr "Version=" engauge.wxs | findStr /v InstallerVersion
+
+echo "*** engauge_64.wxs ***"
+git diff --word-diff --unified=0 engauge_64.wxs 2>nul | findStr "["
+findStr "Id='" engauge_64.wxs | findStr /v Component | findStr /v Directory | findStr /v Feature | findStr /v File | findStr /v Folder | findStr /v Media | findStr /v Package | findStr /v Property 
+findStr "Version=" engauge_64.wxs | findStr /v InstallerVersion
+
+echo "*** Version.cpp ***"
+findStr "char *VERSION_NUMBER" ..\..\src\util\Version.cpp
+
+echo "*** info_valid.plist ***"
+findStr "<string>1" ..\osx\info_valid.plist
+
+echo *************************************************************************
+echo * Check the version numbers and Ids above. If they are not correct, enter
+echo * Control-C to exit. Otherwise, enter the version number below...
+echo *
+echo * CAUTION - Do not use the mouse wheel at this point or else the
+echo * entered number will be blank
+echo *************************************************************************
+set /p VERNUM="Version number seen above>"
+echo Version number will be %VERNUM%
+
 cd "%APPVEYOR_BUILD_FOLDER%"
 
 echo *************************************
@@ -186,18 +213,6 @@ copy "%APPVEYOR_BUILD_FOLDER%"\translations "%RESULTDIR%"
 
 echo ***creating msi
 cd "%SCRIPTDIR%"
-findStr "char *VERSION_NUMBER" ..\..\src\util\Version.cpp
-findStr "Version=" %WXSFILE% | findStr /v InstallerVersion
-echo *****************************************************************
-echo * Check the version numbers above. If they are not correct, enter
-echo * Control-C to exit. Otherwise, enter the version number below...
-echo *
-echo * CAUTION - Do not use the mouse wheel at this point or else the
-echo * entered number will be blank
-echo *****************************************************************
-set /p VERNUM="Version number seen above>"
-echo Version number will be %VERNUM%
-
 candle %WXSFILE%
 candle WixUI_InstallDir_NoLicense.wxs
 light.exe -ext WixUIExtension -ext WixUtilExtension %WXSOBJFILE% WixUI_InstallDir_NoLicense.wixobj -o "digit-exe-windows-%BITS%-bit-installer-%VERNUM%.msi"

diff --git a/dev/windows/engauge.wxs b/dev/windows/engauge.wxs
@@ -2,10 +2,10 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='Engauge Digitizer' 
            Manufacturer='Engauge Open Source Developers'
-	   Id='9900018c-08b0-4646-b45d-bb6473e0082b'
+	   Id='9629812a-2f9a-414c-90be-cd77b42de488'
 	   UpgradeCode='00A6792B-65ED-4894-A48B-B95D63C62CC6'
 	   Language='1033' Codepage='1252' 
-           Version='10.1'>
+           Version='10.2'>
     <Package Id='*' Keywords='Installer' Description="Engauge Digitizer Installer"
 	     Comments='Engauge Digitizer is available from github.com' Manufacturer='Engauge Open Source Developers'
 	     InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />

diff --git a/dev/windows/engauge_64.wxs b/dev/windows/engauge_64.wxs
@@ -2,10 +2,10 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='Engauge Digitizer' 
            Manufacturer='Engauge Open Source Developers'
-	   Id='9900018c-08b0-4646-b45d-bb6473e0082b'
+	   Id='9629812a-2f9a-414c-90be-cd77b42de488'
 	   UpgradeCode='00A6792B-65ED-4894-A48B-B95D63C62CC6'
 	   Language='1033' Codepage='1252' 
-           Version='10.1'>
+           Version='10.2'>
     <Package Id='*' Keywords='Installer' Description="Engauge Digitizer Installer"
 	     Comments='Engauge Digitizer is available from github.com' Manufacturer='Engauge Open Source Developers'
 	     InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' InstallScope='perMachine' Platform='x64' />

diff --git a/src/util/Version.cpp b/src/util/Version.cpp
@@ -6,7 +6,7 @@
 
 #include "Version.h"
 
-const char *VERSION_NUMBER = "10.1";
+const char *VERSION_NUMBER = "10.2";
 
 QString engaugeWindowTitle()
 {