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

petere@postgresql.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@sss.pgh.pa.us> wrote:

petere@postgresql.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@sss.pgh.pa.us> wrote:

petere@postgresql.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@gmx.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@sss.pgh.pa.us> wrote:

Peter Eisentraut <peter_e@gmx.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/