Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92) (envelope-from ) id 1jBe72-0001kL-Mu for pgsql-committers@arkaria.postgresql.org; Tue, 10 Mar 2020 12:35:57 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1jBe71-0000bn-3i for pgsql-committers@arkaria.postgresql.org; Tue, 10 Mar 2020 12:35:55 +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_SHA1:256) (Exim 4.89) (envelope-from ) id 1jBe6z-0000bf-Tt for pgsql-committers@lists.postgresql.org; Tue, 10 Mar 2020 12:35:54 +0000 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jBe6v-0007RG-Ve for pgsql-committers@lists.postgresql.org; Tue, 10 Mar 2020 12:35:53 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 4DB73978 for ; Tue, 10 Mar 2020 08:35:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 10 Mar 2020 08:35:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=yukYR8FPPAVAd0DIxkvYFd0e93vutQYt7fgicxYc2 CE=; b=vkJZVHVAQycvJEvCp+kqYPQmVJo0rf4o0sn8xvt8BNNh4VFk3+yTmpdFX 7p5rBgKo3kDUVNMb28yn6oiMhtvV+lcXNMLA9ZnxaqBgcoWkbFZxK5DjHoaWH5xv AWMqfhcly+xj4ZdTaTPIEYvGXuYmm+VNbLp1KWspgJ3qoQ9nN4CsBAujReworBG3 CtngMGJmUoL63d2Ki9TMq4uQF7Ivi2UEKsH8SrdKaFoHd8JDP1auHqu2PgzeovOX 8T+J566hr2S1wbnMBO8Y7SIvxqYfjVKKMa/wvQx32ewzdEkL1l0/+hUaIa3Nfv8E Lv2eP0J8069tok2XbQSSGuphi/p4w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddvtddggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuhffvfhhokffffgggjggtgfesth ejredttdefjeenucfhrhhomheprfgvthgvrhcugfhishgvnhhtrhgruhhtuceophgvthgv rhdrvghishgvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrdgtohhmqeenucffohhmrg hinhepvdhnughquhgrughrrghnthdrtghomhenucfkphepleefrddvgedvrddvudefrddv gedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepph gvthgvrhdrvghishgvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrdgtohhm X-ME-Proxy: Received: from april.pezone.net (p5df2d5f1.dip0.t-ipconnect.de [93.242.213.241]) by mail.messagingengine.com (Postfix) with ESMTPA id 54C283280060 for ; Tue, 10 Mar 2020 08:35:45 -0400 (EDT) Subject: Re: pgsql: Remove win32ver.rc from version_stamp.pl From: Peter Eisentraut To: pgsql-committers@lists.postgresql.org References: Organization: 2ndQuadrant Message-ID: <50ecb345-4dc5-1f7d-64ca-7018195fcc8d@2ndquadrant.com> Date: Tue, 10 Mar 2020 13:35:43 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk On 2020-03-10 11:22, Peter Eisentraut wrote: > What we need for this is having the major version number and the minor > version number as separate integer symbols. Both configure and > Solution.pm already have that logic, because they compute > PG_VERSION_NUM. So we just keep all the logic there now. Put the > minor version number into a new symbol PG_MINORVERSION_NUM. Also, add > a symbol PG_MAJORVERSION_NUM, which is a number, alongside the > existing PG_MAJORVERSION, which is a string. This created some seemingly unrelated build farm failures. I suspect this must have something to do with the new shell code in configure +PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'` +test -n "$PG_MINORVERSION" || PG_MINORVERSION=0 ending up with some nonsense being assigned to PG_MINORVERSION, perhaps due to a not-quite-mainstream Bourne shell being used. Can anyone test this locally? -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services