diff --git a/engauge.pro.user.mmitchell b/engauge.pro.user.mmitchell.linux similarity index 100% rename from engauge.pro.user.mmitchell rename to engauge.pro.user.mmitchell.linux diff --git a/engauge.pro.user.mmitchell.windows b/engauge.pro.user.mmitchell.windows new file mode 100644 index 00000000..a2e79107 --- /dev/null +++ b/engauge.pro.user.mmitchell.windows @@ -0,0 +1,260 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {9a861ed4-1705-4ff4-93e4-2b4eb1226fbf} + 0 + 0 + 0 + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + true + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + engauge + + Qt4ProjectManager.Qt4RunConfiguration:/home/mark/engauge6/engauge.pro + -debug + engauge.pro + false + false + + 3768 + true + false + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {678e5f8c-72e6-4af0-8c8d-0f1d7ec5995b} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/src/.gitignore b/src/.gitignore index c7246293..ba12e818 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -12,5 +12,5 @@ engauge_test.log* engauge_test.pro engauge_test.pro.user Makefile* -object_script.engauge +object_script.* qrc_* diff --git a/src/build_and_run_all_tests b/src/build_and_run_all_tests index d6bc0c45..bc81390e 100755 --- a/src/build_and_run_all_tests +++ b/src/build_and_run_all_tests @@ -5,6 +5,9 @@ tests=(TestCorrelation TestFormats TestGraphCoords TestProjectedPoint TestSpline echo "Available tests: " ${tests[*]} +# Need gcc 4 at /C/cygwin/bin rather than gcc 3 at /usr/bin to prevent 'unrecognized command line +# option -fno-keep-inline-dllexport' +PATH=/C/QtOpenSource/Qt5.5.1/Tools/mingw492_32/bin:$PATH argcount="$#" if [ $argcount -gt 0 ] diff --git a/src/engauge_test_template.pro b/src/engauge_test_template.pro index 6a2c53b6..dce5f41f 100644 --- a/src/engauge_test_template.pro +++ b/src/engauge_test_template.pro @@ -484,6 +484,11 @@ TARGET = ../bin/TEST QT += core gui network printsupport testlib widgets xml help +win32-g++* { +CONFIG += windows +LIBS += -L$$(LOG4CPP_HOME)/lib -L$$(FFTW_HOME)/lib +} + LIBS += -llog4cpp -lfftw3 INCLUDEPATH += Background \ Callback \ @@ -525,6 +530,11 @@ INCLUDEPATH += Background \ util \ View +win32-g++* { +INCLUDEPATH += $$(FFTW_HOME)/include \ + $$(LOG4CPP_HOME)/include +} + RESOURCES += \ engauge.qrc diff --git a/src/img/digitizer.ico b/src/img/digitizer.ico index fa33e64b..74a8d0b4 100644 Binary files a/src/img/digitizer.ico and b/src/img/digitizer.ico differ diff --git a/src/main/MainWindow.cpp b/src/main/MainWindow.cpp index 4955c8a6..713b005c 100644 --- a/src/main/MainWindow.cpp +++ b/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) : @@ -131,7 +129,7 @@ MainWindow::MainWindow(const QString &errorReportFile, setCurrentFile (""); createIcons(); - setWindowFlags (Qt::WindowContextHelpButtonHint); + setWindowFlags (Qt::WindowContextHelpButtonHint | windowFlags ()); // Add help to default buttons setWindowTitle (engaugeWindowTitle ()); createCentralWidget(); diff --git a/src/util/Version.cpp b/src/util/Version.cpp index ed0fc66b..efc70c7f 100644 --- a/src/util/Version.cpp +++ b/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); diff --git a/windows/.gitignore b/windows/.gitignore index 6949db8b..9719128e 100755 --- a/windows/.gitignore +++ b/windows/.gitignore @@ -1,4 +1,5 @@ digit*.msi *.wixobj -engauge.wixpdb +digit*.wixpdb +engauge*.wixpdb staging diff --git a/windows/build_msi b/windows/build_msi index 1e160774..d986e0e3 100755 --- a/windows/build_msi +++ b/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