* Re: [PATCH lttng-tool] Fix: out-of-tree build: missing xsd file for mi tests and save-load tests
[not found] <1422481529-5558-1-git-send-email-jonathan.rajotte-julien@efficios.com>
@ 2015-01-28 21:57 ` Jérémie Galarneau
[not found] ` <CA+jJMxtm72VU_nymzrqmr4rJ4bQ0Uc8je7KjaaTnHqbCVRXc1A@mail.gmail.com>
1 sibling, 0 replies; 4+ messages in thread
From: Jérémie Galarneau @ 2015-01-28 21:57 UTC (permalink / raw)
To: Jonathan Rajotte; +Cc: lttng-dev
On Wed, Jan 28, 2015 at 4:45 PM, Jonathan Rajotte
<jonathan.rajotte-julien@efficios.com> wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> ---
> src/common/Makefile.am | 14 ++++++++++++++
> src/common/config/Makefile.am | 14 ++++++++++++++
> 2 files changed, 28 insertions(+)
>
> diff --git a/src/common/Makefile.am b/src/common/Makefile.am
> index 3a2f4f0..97d0ecc 100644
> --- a/src/common/Makefile.am
> +++ b/src/common/Makefile.am
> @@ -41,3 +41,17 @@ if HAVE_LIBLTTNG_UST_CTL
> libconsumer_la_LIBADD += \
> $(top_builddir)/src/common/ust-consumer/libust-consumer.la
> endif
> +
> +all-local:
> + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> + for script in $(EXTRA_DIST); do \
Just curious, why name this variable "script"?
Jérémie
> + cp -f $(srcdir)/$$script $(builddir); \
> + done; \
> + fi
> +
> +clean-local:
> + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> + for script in $(EXTRA_DIST); do \
> + rm -f $(builddir)/$$script; \
> + done; \
> + fi
> diff --git a/src/common/config/Makefile.am b/src/common/config/Makefile.am
> index 5acc89d..e36b42f 100644
> --- a/src/common/config/Makefile.am
> +++ b/src/common/config/Makefile.am
> @@ -9,3 +9,17 @@ libconfig_la_LIBADD = $(XML_LIBS)
> xmldir = $(datadir)/xml/lttng
> dist_xml_DATA = session.xsd
> EXTRA_DIST = session.xsd
> +
> +all-local:
> + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> + for script in $(EXTRA_DIST); do \
> + cp -f $(srcdir)/$$script $(builddir); \
> + done; \
> + fi
> +
> +clean-local:
> + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> + for script in $(EXTRA_DIST); do \
> + rm -f $(builddir)/$$script; \
> + done; \
> + fi
> --
> 1.9.1
>
--
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 4+ messages in thread[parent not found: <CA+jJMxtm72VU_nymzrqmr4rJ4bQ0Uc8je7KjaaTnHqbCVRXc1A@mail.gmail.com>]
* Re: [PATCH lttng-tool] Fix: out-of-tree build: missing xsd file for mi tests and save-load tests
[not found] ` <CA+jJMxtm72VU_nymzrqmr4rJ4bQ0Uc8je7KjaaTnHqbCVRXc1A@mail.gmail.com>
@ 2015-01-28 22:08 ` Jonathan Rajotte
[not found] ` <CAF4oYfEmqYYyE02d9+dZeXZkXs0j1kQBwWR8Dp8ry6GMdbuV7g@mail.gmail.com>
1 sibling, 0 replies; 4+ messages in thread
From: Jonathan Rajotte @ 2015-01-28 22:08 UTC (permalink / raw)
To: Jérémie Galarneau; +Cc: lttng-dev
[-- Attachment #1.1: Type: text/plain, Size: 2839 bytes --]
On Wed, Jan 28, 2015 at 4:57 PM, Jérémie Galarneau <
jeremie.galarneau@efficios.com> wrote:
> On Wed, Jan 28, 2015 at 4:45 PM, Jonathan Rajotte
> <jonathan.rajotte-julien@efficios.com> wrote:
> > Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> > ---
> > src/common/Makefile.am | 14 ++++++++++++++
> > src/common/config/Makefile.am | 14 ++++++++++++++
> > 2 files changed, 28 insertions(+)
> >
> > diff --git a/src/common/Makefile.am b/src/common/Makefile.am
> > index 3a2f4f0..97d0ecc 100644
> > --- a/src/common/Makefile.am
> > +++ b/src/common/Makefile.am
> > @@ -41,3 +41,17 @@ if HAVE_LIBLTTNG_UST_CTL
> > libconsumer_la_LIBADD += \
> > $(top_builddir)/src/common/ust-consumer/
> libust-consumer.la
> > endif
> > +
> > +all-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
>
> Just curious, why name this variable "script"?
>
Mostly to be consistent across all makefile concerning the copy of
EXTRA_DIST to the $build_dir when doing out of tree build and distribution
build.
You can run grep -rnw ./ -e " EXTRA_DIST" in tools directory to see the
current trend of using script for naming the temp file variable.
I don't mind renaming it if you find it ambiguous.
Cheers!
Jonathan
>
> Jérémie
>
> > + cp -f $(srcdir)/$$script $(builddir); \
> > + done; \
> > + fi
> > +
> > +clean-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
> > + rm -f $(builddir)/$$script; \
> > + done; \
> > + fi
> > diff --git a/src/common/config/Makefile.am
> b/src/common/config/Makefile.am
> > index 5acc89d..e36b42f 100644
> > --- a/src/common/config/Makefile.am
> > +++ b/src/common/config/Makefile.am
> > @@ -9,3 +9,17 @@ libconfig_la_LIBADD = $(XML_LIBS)
> > xmldir = $(datadir)/xml/lttng
> > dist_xml_DATA = session.xsd
> > EXTRA_DIST = session.xsd
> > +
> > +all-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
> > + cp -f $(srcdir)/$$script $(builddir); \
> > + done; \
> > + fi
> > +
> > +clean-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
> > + rm -f $(builddir)/$$script; \
> > + done; \
> > + fi
> > --
> > 1.9.1
> >
>
>
>
> --
> Jérémie Galarneau
> EfficiOS Inc.
> http://www.efficios.com
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
>
[-- Attachment #1.2: Type: text/html, Size: 4527 bytes --]
[-- Attachment #2: Type: text/plain, Size: 155 bytes --]
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 4+ messages in thread[parent not found: <CAF4oYfEmqYYyE02d9+dZeXZkXs0j1kQBwWR8Dp8ry6GMdbuV7g@mail.gmail.com>]
* Re: [PATCH lttng-tool] Fix: out-of-tree build: missing xsd file for mi tests and save-load tests
[not found] ` <CAF4oYfEmqYYyE02d9+dZeXZkXs0j1kQBwWR8Dp8ry6GMdbuV7g@mail.gmail.com>
@ 2015-01-29 22:53 ` Jonathan Rajotte Julien
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Rajotte Julien @ 2015-01-29 22:53 UTC (permalink / raw)
To: Jonathan Rajotte; +Cc: lttng-dev
[-- Attachment #1.1: Type: text/plain, Size: 3555 bytes --]
This patch need to be split to backport the save-load fix part up to 2.5.
Patch set incoming shortly
Cheers!
On 15-01-28 05:08 PM, Jonathan Rajotte wrote:
>
>
> On Wed, Jan 28, 2015 at 4:57 PM, Jérémie Galarneau
> <jeremie.galarneau@efficios.com
> <mailto:jeremie.galarneau@efficios.com>> wrote:
>
> On Wed, Jan 28, 2015 at 4:45 PM, Jonathan Rajotte
> <jonathan.rajotte-julien@efficios.com
> <mailto:jonathan.rajotte-julien@efficios.com>> wrote:
> > Signed-off-by: Jonathan Rajotte
> <jonathan.rajotte-julien@efficios.com
> <mailto:jonathan.rajotte-julien@efficios.com>>
> > ---
> > src/common/Makefile.am | 14 ++++++++++++++
> > src/common/config/Makefile.am | 14 ++++++++++++++
> > 2 files changed, 28 insertions(+)
> >
> > diff --git a/src/common/Makefile.am b/src/common/Makefile.am
> > index 3a2f4f0..97d0ecc 100644
> > --- a/src/common/Makefile.am
> > +++ b/src/common/Makefile.am
> > @@ -41,3 +41,17 @@ if HAVE_LIBLTTNG_UST_CTL
> > libconsumer_la_LIBADD += \
> > $(top_builddir)/src/common/ust-consumer/libust-consumer.la
> <http://libust-consumer.la>
> > endif
> > +
> > +all-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
>
> Just curious, why name this variable "script"?
>
>
> Mostly to be consistent across all makefile concerning the copy of
> EXTRA_DIST to the $build_dir when doing out of tree build and
> distribution build.
>
> You can run grep -rnw ./ -e " EXTRA_DIST" in tools directory to see
> the current trend of using script for naming the temp file variable.
>
> I don't mind renaming it if you find it ambiguous.
>
> Cheers!
>
> Jonathan
>
>
> Jérémie
>
> > + cp -f $(srcdir)/$$script $(builddir); \
> > + done; \
> > + fi
> > +
> > +clean-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
> > + rm -f $(builddir)/$$script; \
> > + done; \
> > + fi
> > diff --git a/src/common/config/Makefile.am
> b/src/common/config/Makefile.am
> > index 5acc89d..e36b42f 100644
> > --- a/src/common/config/Makefile.am
> > +++ b/src/common/config/Makefile.am
> > @@ -9,3 +9,17 @@ libconfig_la_LIBADD = $(XML_LIBS)
> > xmldir = $(datadir)/xml/lttng
> > dist_xml_DATA = session.xsd
> > EXTRA_DIST = session.xsd
> > +
> > +all-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
> > + cp -f $(srcdir)/$$script $(builddir); \
> > + done; \
> > + fi
> > +
> > +clean-local:
> > + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> > + for script in $(EXTRA_DIST); do \
> > + rm -f $(builddir)/$$script; \
> > + done; \
> > + fi
> > --
> > 1.9.1
> >
>
>
>
> --
> Jérémie Galarneau
> EfficiOS Inc.
> http://www.efficios.com
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org <mailto:lttng-dev@lists.lttng.org>
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
>
>
--
Jonathan R. Julien
Efficios
[-- Attachment #1.2: Type: text/html, Size: 7619 bytes --]
[-- Attachment #2: Type: text/plain, Size: 155 bytes --]
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH lttng-tool] Fix: out-of-tree build: missing xsd file for mi tests and save-load tests
@ 2015-01-28 21:45 Jonathan Rajotte
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Rajotte @ 2015-01-28 21:45 UTC (permalink / raw)
To: lttng-dev
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
src/common/Makefile.am | 14 ++++++++++++++
src/common/config/Makefile.am | 14 ++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 3a2f4f0..97d0ecc 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -41,3 +41,17 @@ if HAVE_LIBLTTNG_UST_CTL
libconsumer_la_LIBADD += \
$(top_builddir)/src/common/ust-consumer/libust-consumer.la
endif
+
+all-local:
+ @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+ for script in $(EXTRA_DIST); do \
+ cp -f $(srcdir)/$$script $(builddir); \
+ done; \
+ fi
+
+clean-local:
+ @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+ for script in $(EXTRA_DIST); do \
+ rm -f $(builddir)/$$script; \
+ done; \
+ fi
diff --git a/src/common/config/Makefile.am b/src/common/config/Makefile.am
index 5acc89d..e36b42f 100644
--- a/src/common/config/Makefile.am
+++ b/src/common/config/Makefile.am
@@ -9,3 +9,17 @@ libconfig_la_LIBADD = $(XML_LIBS)
xmldir = $(datadir)/xml/lttng
dist_xml_DATA = session.xsd
EXTRA_DIST = session.xsd
+
+all-local:
+ @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+ for script in $(EXTRA_DIST); do \
+ cp -f $(srcdir)/$$script $(builddir); \
+ done; \
+ fi
+
+clean-local:
+ @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+ for script in $(EXTRA_DIST); do \
+ rm -f $(builddir)/$$script; \
+ done; \
+ fi
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-29 22:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1422481529-5558-1-git-send-email-jonathan.rajotte-julien@efficios.com>
2015-01-28 21:57 ` [PATCH lttng-tool] Fix: out-of-tree build: missing xsd file for mi tests and save-load tests Jérémie Galarneau
[not found] ` <CA+jJMxtm72VU_nymzrqmr4rJ4bQ0Uc8je7KjaaTnHqbCVRXc1A@mail.gmail.com>
2015-01-28 22:08 ` Jonathan Rajotte
[not found] ` <CAF4oYfEmqYYyE02d9+dZeXZkXs0j1kQBwWR8Dp8ry6GMdbuV7g@mail.gmail.com>
2015-01-29 22:53 ` Jonathan Rajotte Julien
2015-01-28 21:45 Jonathan Rajotte
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.