[PATCH] build: fix out-of-tree builds

[PATCH] build: fix out-of-tree builds

[Jani Nikula]

Support for out-of-tree builds was added in
commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
Author: Carl Worth <cworth@cworth.org>
Date:   Wed Mar 9 15:02:42 2011 -0800

    build: Add support for non-source-directory builds.

and broken in
commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228
Author: David Bremner <bremner@debian.org>
Date:   Sat Nov 17 12:28:15 2012 -0400

    test: initial performance testing infrastructure

Fix the build breakage. Out-of-tree 'make test' has been broken since
earlier than the above, and remains broken, but at least the build now
works.

---

David, does the perf test still work for you with these changes?
---
 Makefile                        |    3 +--
 performance-test/Makefile.local |   10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 73a8554..3301d30 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@
 all:
 
 # List all subdirectories here. Each contains its own Makefile.local
-subdirs := compat completion emacs lib man parse-time-string
-subdirs += performance-test util test
+subdirs = compat completion emacs lib man parse-time-string performance-test util test
 
 # We make all targets depend on the Makefiles themselves.
 global_deps = Makefile Makefile.config Makefile.local \
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 73aa963..d9623d7 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -2,13 +2,13 @@
 
 dir := performance-test
 
-include $(dir)/version.sh
+include $(srcdir)/$(dir)/version.sh
 
-TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
-MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
+TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test
+MEMORY_TEST_SCRIPT := $(srcdir)/$(dir)/notmuch-memory-test
 
 CORPUS_NAME := notmuch-email-corpus-$(PERFTEST_VERSION).tar.xz
-TXZFILE := ${dir}/download/${CORPUS_NAME}
+TXZFILE := $(srcdir)/$(dir)/download/${CORPUS_NAME}
 SIGFILE := ${TXZFILE}.asc
 DEFAULT_URL :=  http://notmuchmail.org/releases/${CORPUS_NAME}
 
@@ -39,4 +39,4 @@ $(TXZFILE):
 download-corpus:
 	wget -O ${TXZFILE} ${DEFAULT_URL}
 
-CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.* $(dir)/corpus $(dir)/notmuch.cache.*
+CLEAN := $(CLEAN) $(srcdir)/$(dir)/tmp.* $(srcdir)/$(dir)/log.* $(srcdir)/$(dir)/corpus $(srcdir)/$(dir)/notmuch.cache.*
-- 
1.7.10.4

Re: [PATCH] build: fix out-of-tree builds

[David Bremner]

Jani Nikula <jani@nikula.org> writes:
> ---
>
> David, does the perf test still work for you with these changes?

 make perf-test OPTIONS=--medium

runs the time tests, but then fails with

./performance-test/notmuch-memory-test --medium
make[1]: ./performance-test/notmuch-memory-test: Command not found
make[1]: *** [memory-test] Error 127
make[1]: Leaving directory `/home/bremner/software/upstream/notmuch'
make: *** [perf-test] Error 2

To be honest, the line 

TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test

looks pretty strange to me, but that seems to be the one that is working

Re: [PATCH] build: fix out-of-tree builds

[Jani Nikula]

On Fri, 08 Mar 2013, David Bremner <david@tethera.net> wrote:
> Jani Nikula <jani@nikula.org> writes:
>> ---
>>
>> David, does the perf test still work for you with these changes?
>
>  make perf-test OPTIONS=--medium
>
> runs the time tests, but then fails with
>
> ./performance-test/notmuch-memory-test --medium
> make[1]: ./performance-test/notmuch-memory-test: Command not found
> make[1]: *** [memory-test] Error 127
> make[1]: Leaving directory `/home/bremner/software/upstream/notmuch'
> make: *** [perf-test] Error 2
>
> To be honest, the line 
>
> TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test
>
> looks pretty strange to me, but that seems to be the one that is working

Oof, to be honest, that was a typo. The minimal change required to
*build* is:

-include $(dir)/version.sh
+include $(srcdir)/$(dir)/version.sh

and the rest was just a poor attempt at making perf test work too. I'll
look into it.

Jani.

[PATCH] build: fix out-of-tree builds

[Jani Nikula]

Support for out-of-tree builds was added in
commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
Author: Carl Worth <cworth@cworth.org>
Date:   Wed Mar 9 15:02:42 2011 -0800

    build: Add support for non-source-directory builds.

and broken in
commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228
Author: David Bremner <bremner@debian.org>
Date:   Sat Nov 17 12:28:15 2012 -0400

    test: initial performance testing infrastructure

Fix the build breakage.

Out-of-tree 'make test' has been broken since earlier than the above,
and remains broken, as does out-of-tree perf test, but at least the
build now works.

---

I didn't have the time to dig into the test and perf test breakage.
---
 Makefile                        |    3 +--
 performance-test/Makefile.local |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 73a8554..3301d30 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@
 all:
 
 # List all subdirectories here. Each contains its own Makefile.local
-subdirs := compat completion emacs lib man parse-time-string
-subdirs += performance-test util test
+subdirs = compat completion emacs lib man parse-time-string performance-test util test
 
 # We make all targets depend on the Makefiles themselves.
 global_deps = Makefile Makefile.config Makefile.local \
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 73aa963..e47219a 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -2,7 +2,7 @@
 
 dir := performance-test
 
-include $(dir)/version.sh
+include $(srcdir)/$(dir)/version.sh
 
 TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
 MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
-- 
1.7.2.5

Re: [PATCH] build: fix out-of-tree builds

[David Bremner]

Jani Nikula <jani@nikula.org> writes:
>  # List all subdirectories here. Each contains its own Makefile.local
> -subdirs := compat completion emacs lib man parse-time-string
> -subdirs += performance-test util test
> +subdirs = compat completion emacs lib man parse-time-string performance-test util test

Is this a functional change or a cosmetic one?

d

Re: [PATCH] build: fix out-of-tree builds

[Jani Nikula]

On Wed, 15 May 2013, David Bremner <david@tethera.net> wrote:
> Jani Nikula <jani@nikula.org> writes:
>>  # List all subdirectories here. Each contains its own Makefile.local
>> -subdirs := compat completion emacs lib man parse-time-string
>> -subdirs += performance-test util test
>> +subdirs = compat completion emacs lib man parse-time-string performance-test util test
>
> Is this a functional change or a cosmetic one?

Functional. All of it seems to be required for out-of-tree builds (*) to
work. I'm afraid I've forgotten exactly why both := and += make it fail
(I wrote the patch a few months ago).

Jani.


(*) For example:

$ cd /some/empty/dir
$ /path/to/notmuch/configure
$ make

Re: [PATCH] build: fix out-of-tree builds

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> On Wed, 15 May 2013, David Bremner <david@tethera.net> wrote:
>> Jani Nikula <jani@nikula.org> writes:
>>>  # List all subdirectories here. Each contains its own Makefile.local
>>> -subdirs := compat completion emacs lib man parse-time-string
>>> -subdirs += performance-test util test
>>> +subdirs = compat completion emacs lib man parse-time-string performance-test util test
>>
>> Is this a functional change or a cosmetic one?
>
> Functional. All of it seems to be required for out-of-tree builds (*) to
> work. I'm afraid I've forgotten exactly why both := and += make it fail
> (I wrote the patch a few months ago).
>

Still I guess it deserves a comment so we don't break it again?

d

Re: [PATCH] build: fix out-of-tree builds

[Tomi Ollila]

On Thu, May 16 2013, David Bremner <david@tethera.net> wrote:

> Jani Nikula <jani@nikula.org> writes:
>
>> On Wed, 15 May 2013, David Bremner <david@tethera.net> wrote:
>>> Jani Nikula <jani@nikula.org> writes:
>>>>  # List all subdirectories here. Each contains its own Makefile.local
>>>> -subdirs := compat completion emacs lib man parse-time-string
>>>> -subdirs += performance-test util test
>>>> +subdirs = compat completion emacs lib man parse-time-string performance-test util test
>>>
>>> Is this a functional change or a cosmetic one?
>>
>> Functional. All of it seems to be required for out-of-tree builds (*) to
>> work. I'm afraid I've forgotten exactly why both := and += make it fail
>> (I wrote the patch a few months ago).
>>
>
> Still I guess it deserves a comment so we don't break it again?

The following options could be tested (some day in (distant?) future):

subdirs = compat completion emacs lib man parse-time-string
subdirs += performance-test util test

or 

SUBDIRS := compat completion emacs lib man parse-time-string
SUBDIRS += performance-test util test
subdirs = $(SUBDIRS)

but as Jani has already tested his version works just adding that
comment David asked is the least labor-intensive thing to do --
and therefore IMHO the best thing to do for this case
(for sure I'm not going to spend more time on this now :D).

> d

Tomi