Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1Zi7Ls-000255-3x for pgadmin-hackers@arkaria.postgresql.org; Fri, 02 Oct 2015 20:54:48 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1Zi7Lr-0007Sb-2k for pgadmin-hackers@arkaria.postgresql.org; Fri, 02 Oct 2015 20:54:47 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1Zi7Lq-0007Rm-PC for pgadmin-hackers@postgresql.org; Fri, 02 Oct 2015 20:54:46 +0000 Received: from forward14p.cmail.yandex.net ([87.250.241.142]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1Zi7Lo-0007z3-0x for pgadmin-hackers@postgresql.org; Fri, 02 Oct 2015 20:54:46 +0000 Received: from smtp18.mail.yandex.net (smtp18.mail.yandex.net [IPv6:2a02:6b8:0:1402::119]) by forward14p.cmail.yandex.net (Yandex) with ESMTP id C81B8207B0 for ; Fri, 2 Oct 2015 23:54:14 +0300 (MSK) Received: from smtp18.mail.yandex.net (localhost [127.0.0.1]) by smtp18.mail.yandex.net (Yandex) with ESMTP id 972A918A014F for ; Fri, 2 Oct 2015 23:54:14 +0300 (MSK) Received: by smtp18.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id gJLjqyBKe7-sEi4AXJp; Fri, 2 Oct 2015 23:54:14 +0300 (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1443819254; bh=HywWGBwCnmgzRLF4auow8t7ItW7YiuFbeYqgpnangKc=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=KA459GMxPBRdxOzOtT/mBx62UQwYjgthI2piVrIInSR5IT9wbkJgqzPW2OrO/iV9j wYK13mXqSo2oY/utKT//MYqNoF1eXHMrh8nqo2VrV+GCdchb4t3JaUrQh8Cs8ngacz ER1jEyjJEtZ3JghKXwtQQ4oDQECS+XLEuTXkjCT4= Authentication-Results: smtp18.mail.yandex.net; dkim=pass header.i=@yandex.ru X-Yandex-ForeignMX: SE Message-ID: <560EF2C6.9040402@yandex.ru> Date: Sat, 03 Oct 2015 00:10:30 +0300 From: Nikolai Zhubr User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ru; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 MIME-Version: 1.0 To: pgadmin-hackers@postgresql.org Subject: Re: [Patch] Windows installer: allow manually setting WIXDIR as appropriate. References: <560EDBFF.9020305@yandex.ru> In-Reply-To: <560EDBFF.9020305@yandex.ru> Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit X-Pg-Spam-Score: -2.7 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org 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 (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers