Re: [Patch] Windows installer: allow manually setting WIXDIR as appropriate.

Hello,

+1
I proposed the same once but had no feedback.

Nikolai, why doesn't the first version work for you? I have it done similar:

if NOT "%WIXDIR%"=="" GOTO WIXDIR_SET
SET WIXDIR="C:\Program Files (x86)\Windows Installer XML v3\bin"
:WIXDIR_SET

Saturday, October 3, 2015, 12:10:30 AM, Nikolai Zhubr wrote:

NZ> Hi again,

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

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

NZ> SET BUILDTREE="../.."

NZ> Thank you,
NZ> Nikolai

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

--
Best regards,
J.F.