[Openvpn-devel,PATCH:,tap-windows6] Fix missing PRODUCT_PUBLISHER field in installer

Message ID DM5PR21MB0185C678B00052EFCFF10283B08D0@DM5PR21MB0185.namprd21.prod.outlook.com
State Accepted
Headers show
Series
  • [Openvpn-devel,PATCH:,tap-windows6] Fix missing PRODUCT_PUBLISHER field in installer
Related show

Commit Message

Rolf Fokkens via Openvpn-devel April 27, 2018, 8:26 p.m.
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 <jkunkee@microsoft.com>
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(-)

Comments

Gert Doering May 25, 2018, 2:07 p.m. | #1
Hi,

On Fri, Apr 27, 2018 at 08:26:40PM +0000, Jon Kunkee via Openvpn-devel wrote:
> 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

Patch

diff --git a/buildtap.py b/buildtap.py
index 6f506cd..9154ea7 100644
--- a/buildtap.py
+++ b/buildtap.py
@@ -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,