From 1ad7d67df1ea597000eb3e8652996ec7108a72e8 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Fri, 30 Oct 2015 19:25:52 -0700 Subject: [PATCH] Linux installer builds 32 bit rather than 64 bit --- engauge.pro.user.mmitchell | 260 +++++++++++++++++++++++++++++++++++++ linux/build_installer | 10 +- 2 files changed, 267 insertions(+), 3 deletions(-) create mode 100644 engauge.pro.user.mmitchell diff --git a/engauge.pro.user.mmitchell b/engauge.pro.user.mmitchell new file mode 100644 index 00000000..4cad6958 --- /dev/null +++ b/engauge.pro.user.mmitchell @@ -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/linux/build_installer b/linux/build_installer index 155e8f0a..ebb3a8ad 100755 --- a/linux/build_installer +++ b/linux/build_installer @@ -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' + export STAGINGDIR=engauge export DOCDIR=$STAGINGDIR/documentation export IMAGEDIR=$STAGINGDIR/imageformats @@ -72,13 +76,13 @@ cp /usr/lib/i386-linux-gnu/qt5/plugins/sqldrivers/libqsqlite.so $SQLDIR echo "***Rebuilding release executable" && export ENGAUGE_RELEASE=1 && -cd ../src && +cd .. && qmake engauge.pro && make clean && make && -cd ../linux +cd linux echo "***Compiling installer" cp startup_script.run $STAGINGDIR # './' prefix is needed before script so script is found during installation (especially if running sudo) -makeself engauge/ digit-exe-linux-64-bits-installer-6_0.run "Engauge Digitizer" ./startup_script.run +makeself engauge/ digit-exe-debian-linux-32-bit-installer-6_0.run "Engauge Digitizer" ./startup_script.run