public inbox for [email protected]  

help / color / mirror / Atom feed

From: Nikolai Zhubr <[email protected]>
To: [email protected]
Subject: Re: [Patch] Windows installer: allow manually setting WIXDIR as appropriate.
Date: Sat, 03 Oct 2015 00:10:30 +0300
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
References: <[email protected]>
List-Unsubscribe:  <mailto:[email protected]?body=unsub%20pgadmin-hackers>

Hi again,

there is some problem in my previous patch, it did not actually work, 
here goes a better one:

--- pkg/win32/Make.bat.orig	Fri Sep 25 13:20:24 2015
+++ pkg/win32/Make.bat	Fri Oct 02 21:55:27 2015
@@ -9,7 +9,9 @@
  SET APPKEYWORDS=PostgreSQL, pgAdmin
  SET APPCOMMENTS=PostgreSQL Tools
  SET APPDESCRIPTION=Management and administration tools for the 
PostgreSQL DBMS
+IF NOT (%WIXDIR%)==() GOTO DONE_WIXDIR
  SET WIXDIR="C:\Program Files (x86)\Windows Installer XML v3\bin"
+:DONE_WIXDIR

  SET BUILDTREE="../.."


Thank you,
Nikolai

02.10.2015 22:33, I wrote:
> Hi all,
>
> How about allowing wix3 to be located in a different path, pointed to by
> setting WIXDIR environment variable _manually_ before building.
>
> The following patch allows doing so, while fully retaining previous
> behaviour in case this variable was not manually set.
>
> (E.g. when building in a 32bit windows, the "Program Files (x86)" is not
> good enough, and I'd rather not modify the scripts for just setting a
> correct path)
>
> --- pkg/win32/Make.bat.orig Fri Sep 25 13:20:24 2015
> +++ pkg/win32/Make.bat Fri Oct 02 21:55:27 2015
> @@ -9,7 +9,9 @@
> SET APPKEYWORDS=PostgreSQL, pgAdmin
> SET APPCOMMENTS=PostgreSQL Tools
> SET APPDESCRIPTION=Management and administration tools for the
> PostgreSQL DBMS
> +IF NOT "%WIXDIR%"=="" GOTO DONE_WIXDIR
> SET WIXDIR="C:\Program Files (x86)\Windows Installer XML v3\bin"
> +:DONE_WIXDIR
>
> SET BUILDTREE="../.."
>
>
> Thank you,
> Nikolai
>
>



-- 
Sent via pgadmin-hackers mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers

view thread (5+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [Patch] Windows installer: allow manually setting WIXDIR as appropriate.
  In-Reply-To: <[email protected]>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox