diff ui/mainwindow.cpp @ 885:1cc85fd3daa5

(issue70) Handle i386 and amd64 packages
author Andre Heinecke <andre.heinecke@intevation.de>
date Fri, 08 Aug 2014 10:56:24 +0200
parents 4efd6378c001
children b61d5a289d8f
line wrap: on
line diff
--- a/ui/mainwindow.cpp	Fri Aug 08 10:49:16 2014 +0200
+++ b/ui/mainwindow.cpp	Fri Aug 08 10:56:24 2014 +0200
@@ -55,14 +55,20 @@
 
 #define SERVER_URL "https://files.intevation.de:443"
 
+#if defined(_X86_) || defined(__i386__)
+#define TB_ARCH_STRING "-i386"
+#else
+#define TB_ARCH_STRING "-amd64"
+#endif
+
 #ifdef RELEASE_BUILD
 # define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt"
 # ifdef Q_OS_WIN
 #  define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.exe"
 #  define SW_RESOURCE "/users/aheinecke/TrustBridge.exe"
 # else
-#  define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.sh"
-#  define SW_RESOURCE "/users/aheinecke/TrustBridge.sh"
+#  define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1" TB_ARCH_STRING ".sh"
+#  define SW_RESOURCE "/users/aheinecke/TrustBridge" TB_ARCH_STRING ".sh"
 # endif
 #else // RELEASE_BUILD
 # define LIST_RESOURCE "/users/aheinecke/development/zertifikatsliste.txt"
@@ -70,8 +76,8 @@
 #  define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.exe"
 #  define SW_RESOURCE "/users/aheinecke/development/TrustBridge.exe"
 # else
-#  define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.sh"
-#  define SW_RESOURCE "/users/aheinecke/development/TrustBridge.sh"
+#  define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development" TB_ARCH_STRING ".sh"
+#  define SW_RESOURCE "/users/aheinecke/development/TrustBridge" TB_ARCH_STRING ".sh"
 # endif
 #endif
 

http://wald.intevation.org/projects/trustbridge/