Removed text from icons. Version number is checked when building rele…

…ase. Windows release is labeled as 32 bit

src/main/MainWindow.cpp

@@ -107,8 +107,6 @@ const QString TSV_FILENAME_EXTENSION ("tsv");
 
 const unsigned int MAX_RECENT_FILE_LIST_SIZE = 8;
 
-const char *VERSION_NUMBER = "6.0";
-
 MainWindow::MainWindow(const QString &errorReportFile,
                        bool isGnuplot,
                        QWidget *parent) :

src/util/Version.cpp

@@ -1,5 +1,7 @@
 #include "Version.h"
 
+const char *VERSION_NUMBER = "6.1";
+
 QString engaugeWindowTitle()
 {
   QString str = QString ("Engauge - %1").arg (VERSION_NUMBER);

windows/.gitignore

@@ -1,4 +1,5 @@
 digit*.msi
 *.wixobj
-engauge.wixpdb
+digit*.wixpdb
+engauge*.wixpdb
 staging

windows/build_msi

@@ -10,6 +10,10 @@ ls -ls $FROMQHC | awk '{print $7,$8,$9,$10}'
 
 read -p 'If the help input files are up to date, press Enter to continue'
 
+fgrep -e 'char *VERSION_NUMBER' ../src/util/Version.cpp
+
+read -p 'If the version number is correct, press Enter to continue'
+
 echo "***Copying help input files"
 mkdir -p documentation
 cp $FROMQCH  ../bin/documentation
@@ -29,15 +33,15 @@ cp $FROMICO  ../bin
 echo "***Rebuilding release executable" &&
 export PATH=/C/QtOpenSource/Qt5.5.1/Tools/mingw492_32/bin:$PATH &&
 export ENGAUGE_RELEASE=1 &&
-cd ../src &&
+cd .. &&
 qmake engauge.pro &&
 make clean &&
 make &&
-cd ../windows &&
+cd windows &&
 echo "***Rebuilding release directory" &&
 windeployqt -release ../bin/engauge.exe &&
 echo "***Compiling release files" &&
 candle.exe engauge.wxs &&
 candle.exe WixUI_InstallDir_NoLicense.wxs &&
 echo "***Creating MSI" &&
-light.exe -ext WixUIExtension -ext WixUtilExtension engauge.wixobj WixUI_InstallDir_NoLicense.wixobj -o digit-exe-windows-64-bit-installer-6_0.msi
+light.exe -ext WixUIExtension -ext WixUtilExtension engauge.wixobj WixUI_InstallDir_NoLicense.wixobj -o digit-exe-windows-32-bit-installer-6_0.msi