diff options
| author | kali <kali@win> | 2020-10-09 12:39:27 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2020-10-13 19:08:52 +0200 |
| commit | e4a2efb527fb09b548c14b13d28d0780941ca72d (patch) | |
| tree | 8527fb1678d1f8d4465cb7cee02d32a45a688ae8 /branding/scripts | |
| parent | 4d9d578902aae37d62ea3218efa2b062cb7f893f (diff) | |
[pkg] windows fixes
Several fixes for missing paths. Refactor qt installer; fetch pre-built
binaries from an existing installation on build system (needs to be
automated); add windows icon.
- Resolves: #362
Diffstat (limited to 'branding/scripts')
| -rwxr-xr-x | branding/scripts/gen-qtinstaller | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/branding/scripts/gen-qtinstaller b/branding/scripts/gen-qtinstaller index 419d958..58ab3f9 100755 --- a/branding/scripts/gen-qtinstaller +++ b/branding/scripts/gen-qtinstaller @@ -25,7 +25,7 @@ OS_CONFIG = { <!-- end osx --> """, 'windows': """ - <TargetDir>@ApplicationsDir@/DemoLibVPN</TargetDir> + <TargetDir>@ApplicationsDir@/$APPNAME</TargetDir> <StartMenuDir>$APPNAME</StartMenuDir> <RunProgram>@TargetDir@/$BINNAME.exe</RunProgram> @@ -69,12 +69,23 @@ def generateConfig(data, platform, outDir): data=templateData) def generatePackageMetadata(data, platform, outDir): + appname = 'applicationName' templateData = { - 'APPNAME': data['applicationName'], + 'APPNAME': data[appname], 'BINNAME': data['binaryName'], 'VERSION': getVersion(), 'TIMESTAMP': time.strftime('%Y-%m-%d') } + if platform == "windows": + p = data[appname] + " for Windows" + elif platform == "osx": + p = data[appname] + " for OSX" + elif platform == "linux": + p = data[appname] + " for GNU/Linux" + else: + p = data[appname] + templateData['APPNAME_PLATFORM'] = p + renderTemplate( templatePath='../templates/qtinstaller/packages/bitmaskvpn/meta/package.xml', outPath=os.path.join(outDir, 'packages/bitmaskvpn/meta/package.xml'), |