summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <[email protected]>2016-06-12 16:00:50 +0200
committerDennis Nienhüser <[email protected]>2017-04-23 11:05:35 +0200
commit6fd0b7820436cf448f25f0b3e80e368bacce4a12 (patch)
tree8401590ad5fcf24871a56d06c065479915ba7ea1
parent32fd8ce26e505fc7dffea33b2ada7f301bfc46f2 (diff)
Move win/mac installation files to common dir. Split iss files.
Inno setup files are now three files: One for each 32 bit and 64 bit, and a generic one included by the other two. This avoids having to toggle 32 vs 64 bit settings each time. (cherry picked from commit 2ae0a9568a5ef4a32958c11d27d32799376a1eac) (cherry picked from commit 71ec55753cdca5fc06120070c899645ea0d08c91)
-rw-r--r--install/INSTALL (renamed from INSTALL)0
-rw-r--r--install/mac/1-release-extra.sh (renamed from install_mac/1-release-extra.sh)0
-rw-r--r--install/mac/2-release-qt.sh (renamed from install_mac/2-release-qt.sh)0
-rwxr-xr-xinstall/mac/3-dmg.sh (renamed from install_mac/3-dmg.sh)0
-rw-r--r--install/mac/marble_mac.jpg (renamed from install_mac/marble_mac.jpg)bin13514 -> 13514 bytes
-rw-r--r--install/windows/marble-32bit.iss11
-rw-r--r--install/windows/marble-64bit.iss10
-rw-r--r--install/windows/marble-common.iss (renamed from marble.iss)10
8 files changed, 25 insertions, 6 deletions
diff --git a/INSTALL b/install/INSTALL
index 4656d03..4656d03 100644
--- a/INSTALL
+++ b/install/INSTALL
diff --git a/install_mac/1-release-extra.sh b/install/mac/1-release-extra.sh
index d9414c5..d9414c5 100644
--- a/install_mac/1-release-extra.sh
+++ b/install/mac/1-release-extra.sh
diff --git a/install_mac/2-release-qt.sh b/install/mac/2-release-qt.sh
index c4e57ce..c4e57ce 100644
--- a/install_mac/2-release-qt.sh
+++ b/install/mac/2-release-qt.sh
diff --git a/install_mac/3-dmg.sh b/install/mac/3-dmg.sh
index 252b9bd..252b9bd 100755
--- a/install_mac/3-dmg.sh
+++ b/install/mac/3-dmg.sh
diff --git a/install_mac/marble_mac.jpg b/install/mac/marble_mac.jpg
index b5415f9..b5415f9 100644
--- a/install_mac/marble_mac.jpg
+++ b/install/mac/marble_mac.jpg
Binary files differ
diff --git a/install/windows/marble-32bit.iss b/install/windows/marble-32bit.iss
new file mode 100644
index 0000000..47ffcfe
--- /dev/null
+++ b/install/windows/marble-32bit.iss
@@ -0,0 +1,11 @@
+; Change this to your Qt installation directory. Make sure to choose
+; the correct compiler and architecture
+#define MyQtDir "C:\Qt\5.5\msvc2013"
+
+; Change this to where you installed Marble to (CMAKE_INSTALL_PREFIX)
+#define MyBuildDir "C:\marble\export-32bit"
+
+#define MyArch "x86"
+
+; Open this file and adjust the version number on top
+#include "marble-common.iss"
diff --git a/install/windows/marble-64bit.iss b/install/windows/marble-64bit.iss
new file mode 100644
index 0000000..38a2ca8
--- /dev/null
+++ b/install/windows/marble-64bit.iss
@@ -0,0 +1,10 @@
+; Change this to your Qt installation directory. Make sure to choose
+; the correct compiler and architecture
+#define MyQtDir "C:\Qt\5.5\msvc2013_64"
+
+; Change this to where you installed Marble to (CMAKE_INSTALL_PREFIX)
+#define MyBuildDir "C:\marble\export-64bit"
+
+#define MyArch "x64"
+; Open this file and adjust the version number on top
+#include "marble-common.iss"
diff --git a/marble.iss b/install/windows/marble-common.iss
index 8d1072c..418d103 100644
--- a/marble.iss
+++ b/install/windows/marble-common.iss
@@ -1,12 +1,10 @@
-#define MyAppName "Marble"
#define MyAppVersion "1.14.1"
+
+#define MySrcDir SourcePath + "\..\..\"
+#define MyAppName "Marble"
#define MyAppPublisher "KDE"
#define MyAppURL "https://marble.kde.org/"
#define MyAppExeName "marble-qt.exe"
-#define MyArch "x64"
-#define MyQtDir "C:\Qt\5.5\msvc2013_64"
-#define MySrcDir "C:\marble\src"
-#define MyBuildDir "C:\marble\export-64bit"
[Setup]
; NOTE: The value of AppId uniquely identifies this application.
@@ -35,7 +33,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
-Source: "marble.kde.org.url"; DestDir: "{app}"
+Source: "{#MySrcDir}\marble.kde.org.url"; DestDir: "{app}"
Source: "{#MyBuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#MyQtDir}\bin\icudt54.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyQtDir}\bin\icuin54.dll"; DestDir: "{app}"; Flags: ignoreversion