Win32 VERSIONINFO fix

Started by Dave Pagealmost 22 years ago4 messagespatches
Jump to latest
#1Dave Page
dpage@pgadmin.org

Unfortunately some re-jigging of Magnus' Win32 version patch broke the
build by introducing some un-escaped double quotes into sed commands.
The attached patch escapes those quotes without removing the re-jigging
that was done.

Regards, Dave.

Attachments:

filedesc.diffapplication/octet-stream; name=filedesc.diffDownload+20-20
#2Magnus Hagander
magnus@hagander.net
In reply to: Dave Page (#1)
Re: Win32 VERSIONINFO fix

Unfortunately some re-jigging of Magnus' Win32 version patch
broke the build by introducing some un-escaped double quotes
into sed commands.
The attached patch escapes those quotes without removing the
re-jigging that was done.

Hmm, this approach seems to make it even less readable :-)

If I understood it right Bruce added the double quotes to the Makefiles
because he thought having a text string there without quotes was bad.
But having to escape them there is surely worse!

The original patch added the quotes in the sed rule. If we want to keep
the quotes in the Makefile:s, we should proably try to fix this problem
at the sed rule, not in every Makefile. If we can't, then my vote is to
go back to the orignial patch and remove the quotes from the Makefiles
completely.

I'm busy with other stuff right now, but I'll take a look at it as soon
as i can unless someone has already fixed it. This being
sed-and-makefile stuff I'm sure there are others who are more fluent in
it than me :-)

//Magnus

#3Dave Page
dpage@pgadmin.org
In reply to: Magnus Hagander (#2)
Re: Win32 VERSIONINFO fix

-----Original Message-----
From: Magnus Hagander [mailto:mha@sollentuna.net]
Sent: 06 October 2004 15:27
To: Dave Page; PostgreSQL-patches
Subject: RE: [PATCHES] Win32 VERSIONINFO fix

Unfortunately some re-jigging of Magnus' Win32 version

patch broke the

build by introducing some un-escaped double quotes into sed

commands.

The attached patch escapes those quotes without removing the
re-jigging that was done.

Hmm, this approach seems to make it even less readable :-)

If I understood it right Bruce added the double quotes to the
Makefiles because he thought having a text string there
without quotes was bad.
But having to escape them there is surely worse!

I never said it was pretty, and as you didn't tell me why Bruce added
the quotes when we spoke before... :-)

The original patch added the quotes in the sed rule. If we
want to keep the quotes in the Makefile:s, we should proably
try to fix this problem at the sed rule, not in every
Makefile. If we can't, then my vote is to go back to the
orignial patch and remove the quotes from the Makefiles completely.

I can do the latter if that's what ppl want. Like you though I'd need
some sed help to leave the quotes in the Makefiles without escaping
them.

/D

#4Bruce Momjian
bruce@momjian.us
In reply to: Dave Page (#3)
Re: Win32 VERSIONINFO fix

OK, I adjusted the sed script in CVS and Dave tested it. I also updated
the win32ver.rc file to 8,0,000,000.

---------------------------------------------------------------------------

Dave Page wrote:

-----Original Message-----
From: Magnus Hagander [mailto:mha@sollentuna.net]
Sent: 06 October 2004 15:27
To: Dave Page; PostgreSQL-patches
Subject: RE: [PATCHES] Win32 VERSIONINFO fix

Unfortunately some re-jigging of Magnus' Win32 version

patch broke the

build by introducing some un-escaped double quotes into sed

commands.

The attached patch escapes those quotes without removing the
re-jigging that was done.

Hmm, this approach seems to make it even less readable :-)

If I understood it right Bruce added the double quotes to the
Makefiles because he thought having a text string there
without quotes was bad.
But having to escape them there is surely worse!

I never said it was pretty, and as you didn't tell me why Bruce added
the quotes when we spoke before... :-)

The original patch added the quotes in the sed rule. If we
want to keep the quotes in the Makefile:s, we should proably
try to fix this problem at the sed rule, not in every
Makefile. If we can't, then my vote is to go back to the
orignial patch and remove the quotes from the Makefiles completely.

I can do the latter if that's what ppl want. Like you though I'd need
some sed help to leave the quotes in the Makefiles without escaping
them.

/D

---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073