Fix missing PRODUCT_PUBLISHER field in installer
PATCH 1/1 Fix missing PRODUCT_PUBLISHER field in installer
Hi all,
While working on ARM64 tap-windows6, I came up with this quick fix for a minor issue recently reported via IRC.
This is also a Github PR:
https://github.com/OpenVPN/tap-windows6/pull/51
(The ARM64 work is still underway; I'll start a separate thread about its current state in a few hours.)
Thanks,
Jon
From 6eee7713363947083e76dbe5cf2ebf8eaf3936df Mon Sep 17 00:00:00 2001
From: Jon Kunkee <[email protected]...>
Date: Fri, 27 Apr 2018 12:01:07 -0700
Subject: [PATCH: tap-windows6] Fix missing PRODUCT_PUBLISHER field in
installer
On Windows, the Product Publisher in Programs and Features is listed as ${PRODUCT_PUBLISHER} instead of "OpenVPN Technologies, Inc." as reported on IRC.
This patch adds the PRODUCT_PUBLISHER variable to the buildtap.py invocation of MakeNSIS. It also allows for MakeNSIS invocations with spaces in them.
--- buildtap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
buildtap.py +2 -1
@@ -328,13 +328,14 @@ class BuildTAPWindows(object): installer_type = "-oas" installer_file=os.path.join(self.top, 'tap-windows'+installer_type+'-'+kv['PRODUCT_VERSION']+'-I'+kv['PRODUCT_TAP_WIN_BUILD']+'.exe') - installer_cmd = "\"%s\" -DDEVCON32=%s -DDEVCON64=%s -DDEVCON_BASENAME=%s -DPRODUCT_TAP_WIN_COMPONENT_ID=%s -DPRODUCT_NAME=%s -DPRODUCT_VERSION=%s -DPRODUCT_TAP_WIN_BUILD=%s -DOUTPUT=%s -DIMAGE=%s %s" % \ + installer_cmd = "\"\"%s\" -DDEVCON32=%s -DDEVCON64=%s -DDEVCON_BASENAME=%s -DPRODUCT_TAP_WIN_COMPONENT_ID=%s -DPRODUCT_NAME=%s -DPRODUCT_PUBLISHER=\"%s\" -DPRODUCT_VERSION=%s -DPRODUCT_TAP_WIN_BUILD=%s -DOUTPUT=%s -DIMAGE=%s %s\"" % \ (self.makensis, self.tifile(x64=False), self.tifile(x64=True), 'tapinstall.exe', kv['PRODUCT_TAP_WIN_COMPONENT_ID'], kv['PRODUCT_NAME'], + kv['PRODUCT_PUBLISHER'], kv['PRODUCT_VERSION'], kv['PRODUCT_TAP_WIN_BUILD'], installer_file,
Signature · 1 line
2.16.1.windows.4
Hi,
Quoted 6 lines · Jon Kunkee via Openvpn-devel
While working on ARM64 tap-windows6, I came up with this quick fix for a minor issue recently reported via IRC.
This is also a Github PR:
https://github.com/OpenVPN/tap-windows6/pull/51(The ARM64 work is still underway; I'll start a separate thread about its current state in a few hours.)
For the record, the github PR has been merged to tap-windows6 repo, so I can close the patch on patchwork.
(No activity required, just for the benefit of the archives)
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...