Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1Zi5pP-00067u-UV for pgadmin-hackers@arkaria.postgresql.org; Fri, 02 Oct 2015 19:17:12 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1Zi5pP-0004ph-Fd for pgadmin-hackers@arkaria.postgresql.org; Fri, 02 Oct 2015 19:17:11 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1Zi5pP-0004pX-1H for pgadmin-hackers@postgresql.org; Fri, 02 Oct 2015 19:17:11 +0000 Received: from forward15h.cmail.yandex.net ([87.250.230.157]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1Zi5pL-0004HO-V6 for pgadmin-hackers@postgresql.org; Fri, 02 Oct 2015 19:17:09 +0000 Received: from smtp4h.mail.yandex.net (smtp4h.mail.yandex.net [IPv6:2a02:6b8:0:f05::118]) by forward15h.cmail.yandex.net (Yandex) with ESMTP id 68CA820E2F for ; Fri, 2 Oct 2015 22:17:04 +0300 (MSK) Received: from smtp4h.mail.yandex.net (localhost [127.0.0.1]) by smtp4h.mail.yandex.net (Yandex) with ESMTP id 26A6A2C011B for ; Fri, 2 Oct 2015 22:17:03 +0300 (MSK) Received: by smtp4h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id rmglZwj11o-H3A4Z8BJ; Fri, 2 Oct 2015 22:17:03 +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=1443813423; bh=Kdrz1WeCRAuQRtHcHbx1MSU/4jDt7lt10+mrnzkf59k=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Content-Transfer-Encoding; b=nKtEJZ6PbUd8wqBnyCsG5MYPVtC370Sd1rnr6KcrzqE4yshTHi68+/aCefh0AB0gx 3sC5Lx7i0O5gEF7yEJ+U5d/bOGzGztZrx5GcUdNQB5bdPyt4vpk8w2ZzdcTfNcuXjM fb10VOk+eftxTsizROoD5A1pmEnFrtoTiZk4GLfc= Authentication-Results: smtp4h.mail.yandex.net; dkim=pass header.i=@yandex.ru X-Yandex-ForeignMX: US Message-ID: <560EDBFF.9020305@yandex.ru> Date: Fri, 02 Oct 2015 22:33:19 +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 Subject: [Patch] Windows installer: allow manually setting WIXDIR as appropriate. Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit X-Pg-Spam-Score: -2.0 (--) 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 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