comparison 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
comparison
equal deleted inserted replaced
884:6abf8e77cd5f 885:1cc85fd3daa5
53 #define APPNAME "TrustBridge" 53 #define APPNAME "TrustBridge"
54 #endif 54 #endif
55 55
56 #define SERVER_URL "https://files.intevation.de:443" 56 #define SERVER_URL "https://files.intevation.de:443"
57 57
58 #if defined(_X86_) || defined(__i386__)
59 #define TB_ARCH_STRING "-i386"
60 #else
61 #define TB_ARCH_STRING "-amd64"
62 #endif
63
58 #ifdef RELEASE_BUILD 64 #ifdef RELEASE_BUILD
59 # define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt" 65 # define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt"
60 # ifdef Q_OS_WIN 66 # ifdef Q_OS_WIN
61 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.exe" 67 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.exe"
62 # define SW_RESOURCE "/users/aheinecke/TrustBridge.exe" 68 # define SW_RESOURCE "/users/aheinecke/TrustBridge.exe"
63 # else 69 # else
64 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.sh" 70 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1" TB_ARCH_STRING ".sh"
65 # define SW_RESOURCE "/users/aheinecke/TrustBridge.sh" 71 # define SW_RESOURCE "/users/aheinecke/TrustBridge" TB_ARCH_STRING ".sh"
66 # endif 72 # endif
67 #else // RELEASE_BUILD 73 #else // RELEASE_BUILD
68 # define LIST_RESOURCE "/users/aheinecke/development/zertifikatsliste.txt" 74 # define LIST_RESOURCE "/users/aheinecke/development/zertifikatsliste.txt"
69 # ifdef Q_OS_WIN 75 # ifdef Q_OS_WIN
70 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.exe" 76 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.exe"
71 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge.exe" 77 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge.exe"
72 # else 78 # else
73 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.sh" 79 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development" TB_ARCH_STRING ".sh"
74 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge.sh" 80 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge" TB_ARCH_STRING ".sh"
75 # endif 81 # endif
76 #endif 82 #endif
77 83
78 MainWindow::MainWindow(bool trayMode): 84 MainWindow::MainWindow(bool trayMode):
79 mTrayMode(trayMode) 85 mTrayMode(trayMode)

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