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 | |
| 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')
4 files changed, 15 insertions, 9 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'), diff --git a/branding/templates/qtinstaller/config/config.xml b/branding/templates/qtinstaller/config/config.xml index c02b0a6..70ce9f6 100644 --- a/branding/templates/qtinstaller/config/config.xml +++ b/branding/templates/qtinstaller/config/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Installer> - <Name>$APPNAME-$VERSION</Name> + <Name>$APPNAME</Name> <Version>$VERSION</Version> <Title>$APPNAME Installer ($VERSION)</Title> <Publisher>LEAP Encryption Access Project</Publisher> diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js index 361e14d..d69f262 100644 --- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js +++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js @@ -52,13 +52,8 @@ function Component() { cancelInstaller("Installation on " + systemInfo.prettyProductName + " is not supported"); return; } - console.log("CPU Architecture: " + systemInfo.currentCpuArchitecture); - if ( systemInfo.kernelType === "winnt") { - installer.componentByName("root.win_x86_64").setValue("Default", "true"); - installer.componentByName("root.win_x86_64").setValue("Virtual", "false"); - } } Component.prototype.createOperations = function () diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml index 0e56f4f..d54cf56 100644 --- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml +++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Package> <DisplayName>$APPNAME</DisplayName> - <Description>$APPNAME</Description> + <Description>$APPNAME_PLATFORM</Description> <Version>$VERSION</Version> <ReleaseDate>$TIMESTAMP</ReleaseDate> <Default>false</Default> |