From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Rajotte Julien Subject: Re: [PATCH lttng-tool] Fix: out-of-tree build: missing xsd file for mi tests and save-load tests Date: Thu, 29 Jan 2015 17:53:21 -0500 Message-ID: <54CAB9E1.2080508__18314.0296875083$1422572042$gmane$org@efficios.com> References: <1422481529-5558-1-git-send-email-jonathan.rajotte-julien@efficios.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1303339498==" Return-path: Received: from mail.efficios.com ([78.47.125.74]) by ltt.polymtl.ca with esmtp (Exim 4.80) (envelope-from ) id 1YGxxq-0007HJ-0B for lttng-dev@lists.lttng.org; Thu, 29 Jan 2015 17:53:31 -0500 In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lttng-dev-bounces@lists.lttng.org To: Jonathan Rajotte Cc: "lttng-dev@lists.lttng.org" List-Id: lttng-dev@lists.lttng.org This is a multi-part message in MIME format. --===============1303339498== Content-Type: multipart/alternative; boundary="------------070205010908010702040406" This is a multi-part message in MIME format. --------------070205010908010702040406 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable 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=C3=A9r=C3=A9mie Galarneau=20 > > wrote: > > On Wed, Jan 28, 2015 at 4:45 PM, Jonathan Rajotte > > wrote: > > Signed-off-by: Jonathan Rajotte > > > > --- > > 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 +=3D \ > > $(top_builddir)/src/common/ust-consumer/libust-consumer.la > > > endif > > + > > +all-local: > > + @if [ x"$(srcdir)" !=3D 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=20 > EXTRA_DIST to the $build_dir when doing out of tree build and=20 > distribution build. > > You can run grep -rnw ./ -e " EXTRA_DIST" in tools directory to see=20 > 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=C3=A9r=C3=A9mie > > > + cp -f $(srcdir)/$$script $(builddir); \ > > + done; \ > > + fi > > + > > +clean-local: > > + @if [ x"$(srcdir)" !=3D 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 =3D $(XML_LIBS) > > xmldir =3D $(datadir)/xml/lttng > > dist_xml_DATA =3D session.xsd > > EXTRA_DIST =3D session.xsd > > + > > +all-local: > > + @if [ x"$(srcdir)" !=3D x"$(builddir)" ]; then \ > > + for script in $(EXTRA_DIST); do \ > > + cp -f $(srcdir)/$$script $(builddir); \ > > + done; \ > > + fi > > + > > +clean-local: > > + @if [ x"$(srcdir)" !=3D x"$(builddir)" ]; then \ > > + for script in $(EXTRA_DIST); do \ > > + rm -f $(builddir)/$$script; \ > > + done; \ > > + fi > > -- > > 1.9.1 > > > > > > -- > J=C3=A9r=C3=A9mie 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 > > --=20 Jonathan R. Julien Efficios --------------070205010908010702040406 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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=C3=A9r=C3=A9mie Galarneau <jeremie.galarneau@efficios.com><= /span> wrote:
On Wed, Jan 28, 2015 at 4:45 PM, Jonathan Rajotte
<jo= nathan.rajotte-julien@efficios.com> wrote:
> Signed-off-by: Jonathan Rajotte <jo= nathan.rajotte-julien@efficios.com>
> ---
>=C2=A0 src/common/Makefile.am=C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 14 ++++++++++++++
>=C2=A0 src/common/config/Makefile.am | 14 +++++++++++= +++
>=C2=A0 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
>=C2=A0 libconsumer_la_LIBADD +=3D \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0$(top_builddir)/src/common/ust-consumer/li= bust-consumer.la
>=C2=A0 endif
> +
> +all-local:
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0@if [ x"$(srcdir)" !=3D = x"$(builddir)" ]; then \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0for 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=C2=A0 naming the temp file variable.

I don't mind renaming it if you find it ambiguous.

Cheers!

Jonathan

J=C3=A9r=C3=A9mie

> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0cp -f $(srcdir)/$$script $(builddir); \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0done; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
> +
> +clean-local:
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0@if [ x"$(srcdir)" !=3D= x"$(builddir)" ]; then \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0for script in $(EXTRA_DIST); do \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0rm -f $(builddir)/$$script; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0done; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
> 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 =3D $(XML_LIBS)
>=C2=A0 xmldir =3D $(datadir)/xml/lttng
>=C2=A0 dist_xml_DATA =3D session.xsd
>=C2=A0 EXTRA_DIST =3D session.xsd
> +
> +all-local:
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0@if [ x"$(srcdir)" !=3D= x"$(builddir)" ]; then \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0for script in $(EXTRA_DIST); do \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0cp -f $(srcdir)/$$script $(builddir); \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0done; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
> +
> +clean-local:
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0@if [ x"$(srcdir)" !=3D= x"$(builddir)" ]; then \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0for script in $(EXTRA_DIST); do \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0rm -f $(builddir)/$$script; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0done; \
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0fi
> --
> 1.9.1
>



--
J=C3=A9r=C3=A9mie Galarneau
EfficiOS Inc.
ht= tp://www.efficios.com

_______________________________________________
lttng-dev mailing list
lttng-dev@l= ists.lttng.org
http://lists.lttng.org/cgi-bin/mail= man/listinfo/lttng-dev


--=20
Jonathan R. Julien
Efficios
--------------070205010908010702040406-- --===============1303339498== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev --===============1303339498==--