diff --git a/dev/osx/Info_valid.plist b/dev/osx/Info_valid.plist index abfd44d9..20da1e7a 100644 --- a/dev/osx/Info_valid.plist +++ b/dev/osx/Info_valid.plist @@ -13,9 +13,9 @@ CFBundleExecutable Engauge Digitizer CFBundleVersion - 10.1 + 10.2 CFBundleShortVersionString - 10.1 + 10.2 LSApplicationCategoryType public.app-category.utilities CFBundleIdentifier diff --git a/dev/windows/build_msi_and_zip.bat b/dev/windows/build_msi_and_zip.bat index fce28b2b..e8c41a4d 100644 --- 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 "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 index 435bec19..0784bd3e 100644 --- a/dev/windows/engauge.wxs +++ b/dev/windows/engauge.wxs @@ -2,10 +2,10 @@ + Version='10.2'> diff --git a/dev/windows/engauge_64.wxs b/dev/windows/engauge_64.wxs index 40e225d5..299a5f09 100644 --- a/dev/windows/engauge_64.wxs +++ b/dev/windows/engauge_64.wxs @@ -2,10 +2,10 @@ + Version='10.2'> diff --git a/src/util/Version.cpp b/src/util/Version.cpp index 773ebdfa..37e6e51e 100644 --- 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() {