Mercurial > trustbridge
comparison ui/mainwindow.cpp @ 1088:508c96e72f62
(issue124) Switch server URL and remove some RELEASE_BUILD options
As the test server speaks ECDSA we do not need so much
#ifndef RELEASE_BUILD options anymore.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 12 Sep 2014 15:38:42 +0200 |
| parents | a12e6172d82c |
| children | 0ae3c99b82ee |
comparison
equal
deleted
inserted
replaced
| 1087:7191addd8a53 | 1088:508c96e72f62 |
|---|---|
| 64 #else | 64 #else |
| 65 #define TB_ARCH_STRING "-amd64" | 65 #define TB_ARCH_STRING "-amd64" |
| 66 #endif | 66 #endif |
| 67 | 67 |
| 68 #ifdef RELEASE_BUILD | 68 #ifdef RELEASE_BUILD |
| 69 # define LIST_RESOURCE "/users/aheinecke/zertifikatsliste.txt" | 69 # define LIST_RESOURCE "/zertifikatsliste.txt" |
| 70 # ifdef Q_OS_WIN | 70 # ifdef Q_OS_WIN |
| 71 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1.exe" | 71 # define SW_RESOURCE_VERSION "/TrustBridge-%1.exe" |
| 72 # define SW_RESOURCE "/users/aheinecke/TrustBridge.exe" | 72 # define SW_RESOURCE "/TrustBridge.exe" |
| 73 # else | 73 # else |
| 74 # define SW_RESOURCE_VERSION "/users/aheinecke/TrustBridge-%1" TB_ARCH_STRING ".sh" | 74 # define SW_RESOURCE_VERSION "/TrustBridge-%1" TB_ARCH_STRING ".sh" |
| 75 # define SW_RESOURCE "/users/aheinecke/TrustBridge" TB_ARCH_STRING ".sh" | 75 # define SW_RESOURCE "/TrustBridge" TB_ARCH_STRING ".sh" |
| 76 # endif | 76 # endif |
| 77 #else // RELEASE_BUILD | 77 #else // RELEASE_BUILD |
| 78 # define LIST_RESOURCE "/users/aheinecke/development/zertifikatsliste.txt" | 78 # define LIST_RESOURCE "/zertifikatsliste.txt" |
| 79 # ifdef Q_OS_WIN | 79 # ifdef Q_OS_WIN |
| 80 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development.exe" | 80 # define SW_RESOURCE_VERSION "/development/TrustBridge-development.exe" |
| 81 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge.exe" | 81 # define SW_RESOURCE "/development/TrustBridge.exe" |
| 82 # else | 82 # else |
| 83 # define SW_RESOURCE_VERSION "/users/aheinecke/development/TrustBridge-development" TB_ARCH_STRING ".sh" | 83 # define SW_RESOURCE_VERSION "/development/TrustBridge-development" TB_ARCH_STRING ".sh" |
| 84 # define SW_RESOURCE "/users/aheinecke/development/TrustBridge" TB_ARCH_STRING ".sh" | 84 # define SW_RESOURCE "/development/TrustBridge" TB_ARCH_STRING ".sh" |
| 85 # endif | 85 # endif |
| 86 #endif | 86 #endif |
| 87 | 87 |
| 88 /* Help installation path the path relative to the installation directory where | 88 /* Help installation path the path relative to the installation directory where |
| 89 * the help is placed.*/ | 89 * the help is placed.*/ |
| 419 #ifndef RELEASE_BUILD | 419 #ifndef RELEASE_BUILD |
| 420 /* Use this for testing to specify another file name for updates */ | 420 /* Use this for testing to specify another file name for updates */ |
| 421 listResource = mSettings.value("List/resource", listResource).toString(); | 421 listResource = mSettings.value("List/resource", listResource).toString(); |
| 422 swResource = mSettings.value("Software/resource", swResource).toString(); | 422 swResource = mSettings.value("Software/resource", swResource).toString(); |
| 423 #endif | 423 #endif |
| 424 | |
| 425 | 424 |
| 426 Downloader* downloader = new Downloader(this, | 425 Downloader* downloader = new Downloader(this, |
| 427 QString::fromLatin1(SERVER_URL), | 426 QString::fromLatin1(SERVER_URL), |
| 428 QByteArray(), | 427 QByteArray(), |
| 429 swInstalledLastMod, | 428 swInstalledLastMod, |