Re: pgsql: Derived files that are shipped in the distribution used to be

Log Message:
-----------
Derived files that are shipped in the distribution used to be built in the
source directory even for out-of-tree builds. They are now alsl built in
the build tree. This should be more convenient for certain developers'
workflows, and shouldn't really break anything else.

Modified Files:
--------------
pgsql/contrib/cube:
Makefile (r1.22 -> r1.23)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/contrib/cube/Makefile?r1=1.22&r2=1.23)
pgsql/contrib/seg:
Makefile (r1.21 -> r1.22)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/contrib/seg/Makefile?r1=1.21&r2=1.22)
pgsql/doc/src/sgml:
Makefile (r1.128 -> r1.129)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/doc/src/sgml/Makefile?r1=1.128&r2=1.129)
pgsql/src:
Makefile.shlib (r1.122 -> r1.123)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/Makefile.shlib?r1=1.122&r2=1.123)
pgsql/src/backend:
Makefile (r1.133 -> r1.134)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/Makefile?r1=1.133&r2=1.134)
pgsql/src/backend/bootstrap:
Makefile (r1.37 -> r1.38)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/bootstrap/Makefile?r1=1.37&r2=1.38)
pgsql/src/backend/parser:
Makefile (r1.50 -> r1.51)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/parser/Makefile?r1=1.50&r2=1.51)
pgsql/src/backend/snowball:
Makefile (r1.7 -> r1.8)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/snowball/Makefile?r1=1.7&r2=1.8)
pgsql/src/backend/utils/misc:
Makefile (r1.28 -> r1.29)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/backend/utils/misc/Makefile?r1=1.28&r2=1.29)
pgsql/src/bin/psql:
Makefile (r1.64 -> r1.65)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/bin/psql/Makefile?r1=1.64&r2=1.65)
pgsql/src/interfaces/ecpg/preproc:
Makefile (r1.144 -> r1.145)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/interfaces/ecpg/preproc/Makefile?r1=1.144&r2=1.145)
pgsql/src/interfaces/libpq:
Makefile (r1.175 -> r1.176)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/interfaces/libpq/Makefile?r1=1.175&r2=1.176)
pgsql/src/pl/plpgsql/src:
Makefile (r1.33 -> r1.34)
(http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/pl/plpgsql/src/Makefile?r1=1.33&r2=1.34)

petere(at)postgresql(dot)org (Peter Eisentraut) writes:
> Log Message:
> -----------
> Derived files that are shipped in the distribution used to be built in the
> source directory even for out-of-tree builds. They are now alsl built in
> the build tree. This should be more convenient for certain developers'
> workflows, and shouldn't really break anything else.

Seems to have broken the MSVC build ...

regards, tom lane

On Sat, Aug 29, 2009 at 05:26, Tom Lane<tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
> petere(at)postgresql(dot)org (Peter Eisentraut) writes:
>> Log Message:
>> -----------
>> Derived files that are shipped in the distribution used to be built in the
>> source directory even for out-of-tree builds.  They are now alsl built in
>> the build tree.  This should be more convenient for certain developers'
>> workflows, and shouldn't really break anything else.
>
> Seems to have broken the MSVC build ...

This is the part that broke it:
diff --git a/src/interfaces/ecpg/preproc/Makefile
b/src/interfaces/ecpg/preproc/Makefile
index fc7dcf5..f14a833 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -57,7 +57,7 @@ preproc.y: ../../../backend/parser/gram.y parse.pl
ecpg.addons ecpg.header ecpg.

ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.h

-kwlookup.c: % : ../../../backend/parser/%
+kwlookup.c: % : $(top_srcdir)/src/backend/parser/%
rm -f $@ && $(LN_S) $< .

distprep: preproc.y preproc.c preproc.h pgc.c

Should I revert this, or are you planning a proper fix?

(I notice this construct is only used here, the working kind is still
used in bin/scripts and bin/psql)

--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/

On ons, 2009-09-02 at 19:24 +0200, Magnus Hagander wrote:
> On Sat, Aug 29, 2009 at 05:26, Tom Lane<tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
> > petere(at)postgresql(dot)org (Peter Eisentraut) writes:
> >> Log Message:
> >> -----------
> >> Derived files that are shipped in the distribution used to be built in the
> >> source directory even for out-of-tree builds. They are now alsl built in
> >> the build tree. This should be more convenient for certain developers'
> >> workflows, and shouldn't really break anything else.
> >
> > Seems to have broken the MSVC build ...
>
> This is the part that broke it:
> diff --git a/src/interfaces/ecpg/preproc/Makefile
> b/src/interfaces/ecpg/preproc/Makefile
> index fc7dcf5..f14a833 100644
> --- a/src/interfaces/ecpg/preproc/Makefile
> +++ b/src/interfaces/ecpg/preproc/Makefile
> @@ -57,7 +57,7 @@ preproc.y: ../../../backend/parser/gram.y parse.pl
> ecpg.addons ecpg.header ecpg.
>
> ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.h
>
> -kwlookup.c: % : ../../../backend/parser/%
> +kwlookup.c: % : $(top_srcdir)/src/backend/parser/%
> rm -f $@ && $(LN_S) $< .
>
> distprep: preproc.y preproc.c preproc.h pgc.c

I think you can revert this if it helps you, although it's not clear to
me why it would make a difference one way or the other.

Peter Eisentraut <peter_e(at)gmx(dot)net> writes:
> On ons, 2009-09-02 at 19:24 +0200, Magnus Hagander wrote:
>> -kwlookup.c: % : ../../../backend/parser/%
>> +kwlookup.c: % : $(top_srcdir)/src/backend/parser/%
>> rm -f $@ && $(LN_S) $< .

> I think you can revert this if it helps you, although it's not clear to
> me why it would make a difference one way or the other.

It looks to me like Magnus' git tool has gotten the direction of the
change backwards --- $(top_srcdir) was the old coding, which was like
every other place that is symlinking something, and the new ../../ bit
is gratuitously unlike the rest. I imagine the point is that the MSVC
scripts only know how to deal with the $(top_srcdir) form.

regards, tom lane

On Wed, Sep 2, 2009 at 21:05, Tom Lane<tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
> Peter Eisentraut <peter_e(at)gmx(dot)net> writes:
>> On ons, 2009-09-02 at 19:24 +0200, Magnus Hagander wrote:
>>> -kwlookup.c: % : ../../../backend/parser/%
>>> +kwlookup.c: % : $(top_srcdir)/src/backend/parser/%
>>> rm -f $@ && $(LN_S) $< .
>
>> I think you can revert this if it helps you, although it's not clear to
>> me why it would make a difference one way or the other.
>
> It looks to me like Magnus' git tool has gotten the direction of the
> change backwards --- $(top_srcdir) was the old coding, which was like
> every other place that is symlinking something, and the new ../../ bit
> is gratuitously unlike the rest.  I imagine the point is that the MSVC
> scripts only know how to deal with the $(top_srcdir) form.

Um, right, that's the patch that fixes the problem, not that causes it :-) S'ry.

And yes, that's what happened.

--
Magnus Hagander
Me: http://www.hagander.net/
Work: http://www.redpill-linpro.com/