public inbox for [email protected]  

help / color / mirror / Atom feed

From: Dave Page <[email protected]>
To: Nikolai Zhubr <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: [Patch] Windows installer: allow manually setting WIXDIR as appropriate.
Date: Mon, 5 Oct 2015 16:16:58 +0100
Message-ID: <CA+OCxozoNgG0OezUj6UVpzGrzr6pfVAHZ-XdBPJSyUZ24meKwQ@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>
References: <[email protected]>
	<[email protected]>
List-Unsubscribe:  <mailto:[email protected]?body=unsub%20pgadmin-hackers>

Thanks - patch applied.

On Fri, Oct 2, 2015 at 10:10 PM, Nikolai Zhubr <[email protected]> wrote:
> 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



-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


-- 
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)

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], [email protected]
  Subject: Re: [Patch] Windows installer: allow manually setting WIXDIR as appropriate.
  In-Reply-To: <CA+OCxozoNgG0OezUj6UVpzGrzr6pfVAHZ-XdBPJSyUZ24meKwQ@mail.gmail.com>

* 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