From eaba138287171474c12ccfdd168adf85529b974b Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 14 May 2014 19:55:03 +1000 Subject: [PATCH] Windows installer scripts --- Bundle3rdParty | 1 + .../installer-angle.iss | 29 +++++------ innosetup/installer-opengl.iss | 52 +++++++++++++++++++ sleepyhead/sleepyhead.pro | 31 +++++++---- 4 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 Bundle3rdParty rename installer.iss => innosetup/installer-angle.iss (55%) create mode 100644 innosetup/installer-opengl.iss diff --git a/Bundle3rdParty b/Bundle3rdParty new file mode 100644 index 00000000..27ba77dd --- /dev/null +++ b/Bundle3rdParty @@ -0,0 +1 @@ +true diff --git a/installer.iss b/innosetup/installer-angle.iss similarity index 55% rename from installer.iss rename to innosetup/installer-angle.iss index cc624be5..95b1d819 100644 --- a/installer.iss +++ b/innosetup/installer-angle.iss @@ -2,8 +2,8 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "SleepyHead" -#define MyAppVersion "0.9.3" -#define MyAppPublisher "SleepyHead" +#define MyAppVersion "0.9.6" +#define MyAppPublisher "Jedimark" #define MyAppURL "http://sleepyhead.sourceforge.net" #define MyAppExeName "SleepyHead.exe" @@ -11,7 +11,7 @@ ; NOTE: The value of AppId uniquely identifies this application. ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{429228B9-3CB2-47DA-A772-E6FBD05FD3D2} +AppId={{AF23DDE0-E745-456E-AA06-014BB6DEB63F} AppName={#MyAppName} AppVersion={#MyAppVersion} ;AppVerName={#MyAppName} {#MyAppVersion} @@ -21,30 +21,27 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} -AllowNoIcons=yes -LicenseFile=C:\Users\rich\Desktop\SleepyHead-source\rich0-sleepyhead\LICENSE.txt -OutputDir=C:\Users\rich\Desktop\SleepyHead-source\Installer -OutputBaseFilename=setup +LicenseFile=C:\Users\Mark\Documents\src\COPYING.txt +OutputDir=C:\Users\Mark\Documents\src\sleepyhead-code\innosetup +OutputBaseFilename=SleepyHead-{#MyAppVersion}-ANGLE-Setup-32bit +SetupIconFile=C:\Users\Mark\Documents\src\sleepyhead-code\sleepyhead\icons\bob-v3.0.ico Compression=lzma SolidCompression=yes [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\Users\rich\Desktop\SleepyHead-source\SleepyHeadQT-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Release\release\SleepyHead.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\Mark\Desktop\SleepyHead-0.9.6-testing-Qt5.2.1-MSVC2012-ANGLE-32bit\SleepyHead.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\Mark\Desktop\SleepyHead-0.9.6-testing-Qt5.2.1-MSVC2012-ANGLE-32bit\*.dll"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "C:\Users\Mark\Desktop\SleepyHead-0.9.6-testing-Qt5.2.1-MSVC2012-ANGLE-32bit\Translations\*.qm"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files -Source: "C:\QtSDK\mingw\bin\LIBGCC_S_DW2-1.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\mingw\bin\MINGWM10.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\Desktop\Qt\4.8.1\mingw\lib\QTCORE4.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\Desktop\Qt\4.8.1\mingw\lib\QTGUI4.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\Desktop\Qt\4.8.1\mingw\lib\QTNETWORK4.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\Desktop\Qt\4.8.1\mingw\lib\QTOPENGL4.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\Desktop\Qt\4.8.1\mingw\lib\QTWEBKIT4.DLL"; DestDir: "{app}"; -Source: "C:\QtSDK\Desktop\Qt\4.8.1\mingw\lib\QTXML4.DLL"; DestDir: "{app}"; [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" diff --git a/innosetup/installer-opengl.iss b/innosetup/installer-opengl.iss new file mode 100644 index 00000000..f1e8cb7c --- /dev/null +++ b/innosetup/installer-opengl.iss @@ -0,0 +1,52 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "SleepyHead" +#define MyAppVersion "0.9.6" +#define MyAppPublisher "Jedimark" +#define MyAppURL "http://sleepyhead.sourceforge.net" +#define MyAppExeName "SleepyHead.exe" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{AF23DDE0-E745-456E-AA06-014BB6DEB63F} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +LicenseFile=C:\Users\Mark\Documents\src\COPYING.txt +OutputDir=C:\Users\Mark\Documents\src\sleepyhead-code\innosetup +OutputBaseFilename=SleepyHead-{#MyAppVersion}-OpenGL-Setup-32bit +SetupIconFile=C:\Users\Mark\Documents\src\sleepyhead-code\sleepyhead\icons\bob-v3.0.ico +Compression=lzma +SolidCompression=yes + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "C:\Users\Mark\Desktop\SleepyHead-0.9.6-testing-Qt5.2.1-MingW-OpenGL-32bit\SleepyHead.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\Mark\Desktop\SleepyHead-0.9.6-testing-Qt5.2.1-MingW-OpenGL-32bit\*.dll"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "C:\Users\Mark\Desktop\SleepyHead-0.9.6-testing-Qt5.2.1-MingW-OpenGL-32bit\Translations\*.qm"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent + diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index 787abbaf..9ad942fc 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -246,19 +246,28 @@ mac { QMAKE_BUNDLE_DATA += TransFiles } -win32|mac { +bundlelibs = $$cat($$PWD/../Bundle3rdParty) + +#QExtSerialPort will be replaced soon with Qt5's QSerialPort +include($$PWD/../3rdparty/qextserialport/src/qextserialport.pri) +INCLUDEPATH += $$PWD/../3rdparty/qextserialport/src +DEPENDPATH += $$PWD/../3rdparty/qextserialport/src + +contains(bundlelibs, true) { include(../3rdparty/quazip/quazip/quazip.pri) INCLUDEPATH += $$PWD/../3rdparty/quazip DEPENDPATH += $$PWD/../3rdparty/quazip -} else:unix { - QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib - INCLUDEPATH += /usr/local/include - INCLUDEPATH += /usr/include - DEPENDPATH += /usr/local/include/quazip - DEPENDPATH += /usr/include/quazip +} else { + unix { + message("Attempting to build with system quazip."); + QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib + INCLUDEPATH += /usr/local/include + INCLUDEPATH += /usr/include + DEPENDPATH += /usr/local/include/quazip + DEPENDPATH += /usr/include/quazip + } else { + #Configure it if you need it... + warning("Building with externally linked quazip is unsupported on this platform"); + } LIBS += -lquazip } - -# Most Linux distros can use "CONFIG += extserialport", -# but Fedora does not yet provide qextserialport for Qt5. -include(../3rdparty/qextserialport/src/qextserialport.pri)