From 7b15426c5a1e8ce1f17cf7fe01f8594ab75f98e9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 15 Sep 2013 05:13:51 +0200 Subject: Add innosetup-based installer script --- installer/opentrack-installer.iss | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 installer/opentrack-installer.iss (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss new file mode 100644 index 00000000..4e43b587 --- /dev/null +++ b/installer/opentrack-installer.iss @@ -0,0 +1,48 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "opentrack" +#define MyAppVersion "2.0a1" +#define MyAppPublisher "opentrack" +#define MyAppURL "http://github.com/opentrack/opentrack" +#define MyAppExeName "opentrack.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={{E454805B-11A6-469F-9FA9-865BEAD787D0} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +AllowNoIcons=yes +OutputBaseFilename=opentrack-setup +SetupIconFile=C:\Users\Administrator\Projects\opentrack\facetracknoir\facetracknoir.ico +Compression=lzma +SolidCompression=yes +DisableWelcomePage=True +DisableReadyPage=True +DisableReadyMemo=True + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "C:\Users\Administrator\Projects\opentrack\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\redist\vc80redist_x86.exe"; Parameters: "/q:a"; Flags: postinstall waituntilterminated; Description: "Install MSVC 8.0 runtime for FaceAPI" +Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}" \ No newline at end of file -- cgit v1.2.3 From 3734ab61a6f0d4d8aad32a17a2eb5fc49245626e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 15 Sep 2013 05:19:34 +0200 Subject: Finish installer script --- installer/opentrack-installer.iss | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 4e43b587..d0567a14 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -24,11 +24,15 @@ DefaultGroupName={#MyAppName} AllowNoIcons=yes OutputBaseFilename=opentrack-setup SetupIconFile=C:\Users\Administrator\Projects\opentrack\facetracknoir\facetracknoir.ico -Compression=lzma +Compression=lzma/ultra64 SolidCompression=yes DisableWelcomePage=True DisableReadyPage=True DisableReadyMemo=True +RestartIfNeededByRun=False +InternalCompressLevel=ultra +CompressionThreads=2 +MinVersion=0,5.01sp2 [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -44,5 +48,5 @@ Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon [Run] -Filename: "{app}\redist\vc80redist_x86.exe"; Parameters: "/q:a"; Flags: postinstall waituntilterminated; Description: "Install MSVC 8.0 runtime for FaceAPI" -Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}" \ No newline at end of file +Filename: "{app}\redist\vc80redist_x86.exe"; Parameters: "/q:a"; Flags: waituntilterminated; Description: "Install MSVC 8.0 runtime for FaceAPI" +Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}" -- cgit v1.2.3 From d2dfb776907ec0513fa0647b9d4dd89b11a7ad34 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 18 Sep 2013 19:45:02 +0200 Subject: installer: accomodate new build machine --- installer/opentrack-installer.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index d0567a14..1e64b8c3 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -23,7 +23,7 @@ DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes OutputBaseFilename=opentrack-setup -SetupIconFile=C:\Users\Administrator\Projects\opentrack\facetracknoir\facetracknoir.ico +SetupIconFile=C:\Users\Administrator\SDK\opentrack\facetracknoir\facetracknoir.ico Compression=lzma/ultra64 SolidCompression=yes DisableWelcomePage=True @@ -41,7 +41,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\Users\Administrator\Projects\opentrack\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "C:\Users\Administrator\SDK\opentrack\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -- cgit v1.2.3 From e0c2456c61f0d9054aca8649bff7c5aa59935607 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 19 Sep 2013 14:40:00 +0200 Subject: installer: untested, auto-version installer --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 1e64b8c3..740eec94 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -22,7 +22,7 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -OutputBaseFilename=opentrack-setup +OutputBaseFilename=opentrack-setup-{#AppVersion} SetupIconFile=C:\Users\Administrator\SDK\opentrack\facetracknoir\facetracknoir.ico Compression=lzma/ultra64 SolidCompression=yes -- cgit v1.2.3 From 93a6f3ba19998e7590c263d5673c8f26cd6a4b1e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 19 Sep 2013 15:50:55 +0200 Subject: installer: bump version for the next alpha --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 740eec94..3b2a2d50 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "opentrack" -#define MyAppVersion "2.0a1" +#define MyAppVersion "2.0a3" #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" -- cgit v1.2.3 From 2ae4c7ef3243e10f10edbb0a7cfe13a8d4eb990b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 9 Oct 2013 18:44:34 +0200 Subject: fix installer, build inbound Let's expend the ordnance with extreme prejudice. War is bad. Signed-off-by: Stanislaw Halik --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 3b2a2d50..dc6e624b 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -22,7 +22,7 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -OutputBaseFilename=opentrack-setup-{#AppVersion} +OutputBaseFilename=opentrack-setup-{#MyAppVersion} SetupIconFile=C:\Users\Administrator\SDK\opentrack\facetracknoir\facetracknoir.ico Compression=lzma/ultra64 SolidCompression=yes -- cgit v1.2.3 From ac6d76a7c6a7ff924684609a73ac54d95fa5c9b1 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 20 Oct 2013 16:50:06 +0200 Subject: in preparation for a4 Waiting for mm0zct's okay Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.cpp | 2 +- installer/opentrack-installer.iss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index e53f414a..1d531229 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -415,7 +415,7 @@ void FaceTrackNoIR::loadSettings() { // Put the filename in the window-title. // QFileInfo pathInfo ( currentFile ); - setWindowTitle ( "opentrack 2.0a3 - " + pathInfo.fileName() ); + setWindowTitle ( "opentrack 2.0a4 - " + pathInfo.fileName() ); // // Get a List of all the INI-files in the (currently active) Settings-folder. diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index dc6e624b..5ff42ea5 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "opentrack" -#define MyAppVersion "2.0a3" +#define MyAppVersion "2.0a4" #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" -- cgit v1.2.3 From 5186144127a0ec24f50d5c73a9515906787b2568 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 20 Oct 2013 17:20:02 +0200 Subject: update buildbot Signed-off-by: Stanislaw Halik --- installer/opentrack-installer.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 5ff42ea5..60d9963b 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -23,7 +23,7 @@ DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes OutputBaseFilename=opentrack-setup-{#MyAppVersion} -SetupIconFile=C:\Users\Administrator\SDK\opentrack\facetracknoir\facetracknoir.ico +SetupIconFile=d:\opentrack-win32-sdk\opentrack\facetracknoir\facetracknoir.ico Compression=lzma/ultra64 SolidCompression=yes DisableWelcomePage=True @@ -41,7 +41,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\Users\Administrator\SDK\opentrack\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "d:\opentrack-win32-sdk\opentrack\build\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -- cgit v1.2.3 From 49bc9a8550a8ab1fd037da31260bb38d80b6da15 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 21 Oct 2013 23:57:17 +0200 Subject: bump version --- facetracknoir/facetracknoir.cpp | 2 +- installer/opentrack-installer.iss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index 1d531229..c1d4bc85 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -415,7 +415,7 @@ void FaceTrackNoIR::loadSettings() { // Put the filename in the window-title. // QFileInfo pathInfo ( currentFile ); - setWindowTitle ( "opentrack 2.0a4 - " + pathInfo.fileName() ); + setWindowTitle ( "opentrack 2.0a5 - " + pathInfo.fileName() ); // // Get a List of all the INI-files in the (currently active) Settings-folder. diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 60d9963b..47bafe7a 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "opentrack" -#define MyAppVersion "2.0a4" +#define MyAppVersion "2.0a5" #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" -- cgit v1.2.3 From 5bf0964212f2210e9a454e1bcf24b1f96b479922 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 22 Oct 2013 02:32:15 +0200 Subject: bump --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 47bafe7a..f7b2c272 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "opentrack" -#define MyAppVersion "2.0a5" +#define MyAppVersion "2.0a6" #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" -- cgit v1.2.3 From 062cb6be8cf1da609475c128bb5815d7df082f29 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 22 Oct 2013 02:54:51 +0200 Subject: centralize version tracking Signed-off-by: Stanislaw Halik --- facetracknoir/facetracknoir.cpp | 3 ++- installer/opentrack-installer.iss | 3 ++- opentrack-version.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 opentrack-version.h (limited to 'installer/opentrack-installer.iss') diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index f8a1f1f0..f2bb5439 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -25,6 +25,7 @@ #include "shortcuts.h" #include "tracker.h" #include "curve-config.h" +#include "opentrack-version.h" #include #if defined(_WIN32) @@ -419,7 +420,7 @@ void FaceTrackNoIR::loadSettings() { // Put the filename in the window-title. // QFileInfo pathInfo ( currentFile ); - setWindowTitle ( "opentrack 2.0a6 - " + pathInfo.fileName() ); + setWindowTitle ( ("opentrack " OPENTRACK_VERSION) + pathInfo.fileName() ); // // Get a List of all the INI-files in the (currently active) Settings-folder. diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index f7b2c272..30669ee5 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -1,8 +1,9 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +#include "../opentrack-version.h" #define MyAppName "opentrack" -#define MyAppVersion "2.0a6" +#define MyAppVersion OPENTRACK_VERSION #define MyAppPublisher "opentrack" #define MyAppURL "http://github.com/opentrack/opentrack" #define MyAppExeName "opentrack.exe" diff --git a/opentrack-version.h b/opentrack-version.h new file mode 100644 index 00000000..4a60f25e --- /dev/null +++ b/opentrack-version.h @@ -0,0 +1 @@ +#define OPENTRACK_VERSION "2.0a6" -- cgit v1.2.3 From 61dd97ad85b43c96c4cc81a637f24e8160615438 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 22 Oct 2013 02:57:40 +0200 Subject: installer: use LZMA2 --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 30669ee5..3c97fe46 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -25,7 +25,7 @@ DefaultGroupName={#MyAppName} AllowNoIcons=yes OutputBaseFilename=opentrack-setup-{#MyAppVersion} SetupIconFile=d:\opentrack-win32-sdk\opentrack\facetracknoir\facetracknoir.ico -Compression=lzma/ultra64 +Compression=lzma2/ultra64 SolidCompression=yes DisableWelcomePage=True DisableReadyPage=True -- cgit v1.2.3 From c69134007bc02aefa40e2ff62f8ede0ddcc794fe Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 25 Oct 2013 04:19:18 +0200 Subject: remove faceapi from installer Signed-off-by: Stanislaw Halik --- installer/opentrack-installer.iss | 1 - 1 file changed, 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 3c97fe46..ca04af71 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -49,5 +49,4 @@ Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon [Run] -Filename: "{app}\redist\vc80redist_x86.exe"; Parameters: "/q:a"; Flags: waituntilterminated; Description: "Install MSVC 8.0 runtime for FaceAPI" Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}" -- cgit v1.2.3 From f5d310a7da41456582e85e67376bcda99321a169 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 25 Oct 2013 14:44:15 +0200 Subject: Fix installer version --- CMakeLists.txt | 2 ++ installer/opentrack-installer.iss | 2 +- opentrack-version.h | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d1f64a..2f999144 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -574,6 +574,8 @@ if(UNIX) endif() add_executable(opentrack ${opentrack-win32-executable} ${opentrack-bin-c} ${opentrack-bin-h} ${opentrack-bin-moc} ${opentrack-bin-uih} ${opentrack-bin-rcc}) set_target_properties(opentrack PROPERTIES COMPILE_DEFINITIONS OPENTRACK_VERSION=\"${OPENTRACK__COMMIT}\") +set(OPENTRACK_COMMIT_VERSION \"${OPENTRACK__COMMIT}\") +configure_file("${CMAKE_SOURCE_DIR}/opentrack-version.h" "${CMAKE_BINARY_DIR}/opentrack-version.h" @ONLY NEWLINE_STYLE UNIX) if(UNIX) target_link_libraries(opentrack opentrack-qxt-mini) endif() diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index ca04af71..5e3a547d 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#include "../opentrack-version.h" +#include "../build/opentrack-version.h" #define MyAppName "opentrack" #define MyAppVersion OPENTRACK_VERSION #define MyAppPublisher "opentrack" diff --git a/opentrack-version.h b/opentrack-version.h index 1b941000..f31d5edf 100644 --- a/opentrack-version.h +++ b/opentrack-version.h @@ -1,3 +1,7 @@ #ifndef OPENTRACK_VERSION -# define OPENTRACK_VERSION "Mourns-For-Trees" +# define OPENTRACK_VERSION @OPENTRACK_COMMIT_VERSION@ +#else +# ifndef OPENTRACK_VERSION +# define OPENTRACK_VERSION "Mourns-For-Trees" +# endif #endif -- cgit v1.2.3 From 3c383b2b8215fec0b25244e34a7072bef0482bc9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 25 Oct 2013 23:06:11 +0200 Subject: Fix installer name Signed-off-by: Stanislaw Halik --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 5e3a547d..dda574eb 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -23,7 +23,7 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -OutputBaseFilename=opentrack-setup-{#MyAppVersion} +OutputBaseFilename={#MyAppVersion}-setup.exe SetupIconFile=d:\opentrack-win32-sdk\opentrack\facetracknoir\facetracknoir.ico Compression=lzma2/ultra64 SolidCompression=yes -- cgit v1.2.3 From bb416dbd61c626f6656d9c79aa851a6b3fa6b5d9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 2 Nov 2013 04:51:45 +0100 Subject: Accomodate new build box --- installer/opentrack-installer.iss | 104 +++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index dda574eb..fc0fcc40 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -1,52 +1,52 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#include "../build/opentrack-version.h" -#define MyAppName "opentrack" -#define MyAppVersion OPENTRACK_VERSION -#define MyAppPublisher "opentrack" -#define MyAppURL "http://github.com/opentrack/opentrack" -#define MyAppExeName "opentrack.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={{E454805B-11A6-469F-9FA9-865BEAD787D0} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} -DefaultGroupName={#MyAppName} -AllowNoIcons=yes -OutputBaseFilename={#MyAppVersion}-setup.exe -SetupIconFile=d:\opentrack-win32-sdk\opentrack\facetracknoir\facetracknoir.ico -Compression=lzma2/ultra64 -SolidCompression=yes -DisableWelcomePage=True -DisableReadyPage=True -DisableReadyMemo=True -RestartIfNeededByRun=False -InternalCompressLevel=ultra -CompressionThreads=2 -MinVersion=0,5.01sp2 - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -Source: "d:\opentrack-win32-sdk\opentrack\build\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs - -[Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon - -[Run] -Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}" +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#include "../build/opentrack-version.h" +#define MyAppName "opentrack" +#define MyAppVersion OPENTRACK_VERSION +#define MyAppPublisher "opentrack" +#define MyAppURL "http://github.com/opentrack/opentrack" +#define MyAppExeName "opentrack.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={{E454805B-11A6-469F-9FA9-865BEAD787D0} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +AllowNoIcons=yes +OutputBaseFilename={#MyAppVersion}-setup +SetupIconFile=d:\opentrack\facetracknoir\facetracknoir.ico +Compression=lzma2/ultra64 +SolidCompression=yes +DisableWelcomePage=True +DisableReadyPage=True +DisableReadyMemo=True +RestartIfNeededByRun=False +InternalCompressLevel=ultra +CompressionThreads=2 +MinVersion=0,5.01sp2 + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "d:\opentrack\build-mingw-w64\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}" -- cgit v1.2.3 From b9f44bae6b8364b0d0bd9b965a44a7fa0a8bcb08 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 24 Nov 2013 07:12:07 +0100 Subject: fix installer paths --- installer/opentrack-installer.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index fc0fcc40..9021caf9 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -24,7 +24,7 @@ DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes OutputBaseFilename={#MyAppVersion}-setup -SetupIconFile=d:\opentrack\facetracknoir\facetracknoir.ico +SetupIconFile=..\facetracknoir\facetracknoir.ico Compression=lzma2/ultra64 SolidCompression=yes DisableWelcomePage=True @@ -42,7 +42,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "d:\opentrack\build-mingw-w64\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs +Source: "..\build-mingw-w64\install\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -- cgit v1.2.3 From 27d0ff6e03cce603c5dd47b3fa78581b6a6120d5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 10 Dec 2013 06:23:38 +0100 Subject: fix installer's path to version --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 9021caf9..5f25c917 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#include "../build/opentrack-version.h" +#include "../build-mingw-w64/opentrack-version.h" #define MyAppName "opentrack" #define MyAppVersion OPENTRACK_VERSION #define MyAppPublisher "opentrack" -- cgit v1.2.3 From e3d7246f63b30931d3b1d41a4b036bd0c661d06d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 22 Dec 2013 17:24:59 +0100 Subject: append "win32" to installer filename --- installer/opentrack-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'installer/opentrack-installer.iss') diff --git a/installer/opentrack-installer.iss b/installer/opentrack-installer.iss index 5f25c917..cf0ebec6 100644 --- a/installer/opentrack-installer.iss +++ b/installer/opentrack-installer.iss @@ -23,7 +23,7 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes -OutputBaseFilename={#MyAppVersion}-setup +OutputBaseFilename={#MyAppVersion}-win32-setup SetupIconFile=..\facetracknoir\facetracknoir.ico Compression=lzma2/ultra64 SolidCompression=yes -- cgit v1.2.3