From b04607a7d97d59c09ac563fd257930d7ce406ad5 Mon Sep 17 00:00:00 2001
From: kali <kali@win>
Date: Fri, 30 Oct 2020 21:48:11 +0100
Subject: [PATCH] [pkg] add windows release target
Also, install the tap driver silently.
- Resolves: #366
---
Makefile | 8 ++++++--
.../qtinstaller/packages/bitmaskvpn/meta/install.js | 6 +++---
docs/build.windows.rst | 4 ++++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 90b0b1eb..eff630b6 100644
--- a/Makefile
+++ b/Makefile
@@ -119,14 +119,14 @@ ifeq (${PLATFORM}, windows)
"c:\windows\system32\rcedit.exe" ${QTBUILD}/release/${TARGET}.exe --set-file-version ${VERSION}
"c:\windows\system32\rcedit.exe" ${QTBUILD}/release/${TARGET}.exe --set-product-version ${VERSION}
"c:\windows\system32\rcedit.exe" ${QTBUILD}/release/${TARGET}.exe --set-version-string CompanyName "LEAP Encryption Access Project"
- "c:\windows\system32\rcedit.exe" ${QTBUILD}/release/${TARGET}.exe --set-version-string FileDescription "VPN Application provided by ${PROVIDER}"
+ "c:\windows\system32\rcedit.exe" ${QTBUILD}/release/${TARGET}.exe --set-version-string FileDescription "${APPNAME}"
"c:\windows\system32\signtool.exe" sign -debug -f "z:\leap\LEAP.pfx" -p ${WINCERTPASS} ${QTBUILD}/release/${TARGET}.exe
cp build/bin/${PLATFORM}/bitmask-helper build/bin/${PLATFORM}/bitmask-helper.exe
"c:\windows\system32\rcedit.exe" build/bin/${PLATFORM}/bitmask-helper.exe --set-file-version ${VERSION}
"c:\windows\system32\rcedit.exe" build/bin/${PLATFORM}/bitmask-helper.exe --set-product-version ${VERSION}
"c:\windows\system32\rcedit.exe" build/bin/${PLATFORM}/bitmask-helper.exe --set-version-string ProductName "bitmask-helper-v2"
"c:\windows\system32\rcedit.exe" build/bin/${PLATFORM}/bitmask-helper.exe --set-version-string CompanyName "LEAP Encryption Access Project"
- "c:\windows\system32\rcedit.exe" build/bin/${PLATFORM}/bitmask-helper.exe --set-version-string FileDescription "Administrative helper for ${TARGET}"
+ "c:\windows\system32\rcedit.exe" build/bin/${PLATFORM}/bitmask-helper.exe --set-version-string FileDescription "Administrative helper for ${APPNAME}"
"c:\windows\system32\signtool.exe" sign -debug -f "z:\leap\LEAP.pfx" -p ${WINCERTPASS} build/bin/${PLATFORM}/bitmask-helper.exe
endif
@@ -289,6 +289,10 @@ builder_image:
packages: package_deb package_snap package_osx package_win
+package_win_release: build dosign installer sign_installer
+
+package_win: build installer
+
package_snap_in_docker:
@make -C docker package_snap
diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
index 63ba10d5..0b065d67 100644
--- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
+++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
@@ -91,9 +91,9 @@ Component.prototype.installationFinished = function()
}
function postInstallWindows() {
- console.log("Trying to install OpenVPN tap driver");
- component.addElevatedOperation("Execute", "@TargetDir@/tap-windows.exe"); /* TODO uninstall? */
- console.log("Now trying to installer our helper");
+ console.log("Installing OpenVPN tap driver");
+ component.addElevatedOperation("Execute", "@TargetDir@/tap-windows.exe", "/S", "/SELECT_UTILITIES=1"); /* TODO uninstall? */
+ console.log("Now trying to install our helper");
component.addElevatedOperation("Execute", "@TargetDir@/helper.exe", "install", "UNDOEXECUTE", "@TargetDir@/helper.exe", "remove");
component.addElevatedOperation("Execute", "@TargetDir@/helper.exe", "start", "UNDOEXECUTE", "@TargetDir@/helper.exe", "stop");
console.log("Adding shortcut entries/...");
diff --git a/docs/build.windows.rst b/docs/build.windows.rst
index 87431265..9ea13602 100644
--- a/docs/build.windows.rst
+++ b/docs/build.windows.rst
@@ -44,6 +44,10 @@ the steps to do release signatures are::
make installer
make sign_installer
+or alltogether as::
+
+ make package_win_release
+
unreviewed notes
----------------
--
GitLab