Enhance make dist

Enhance make dist


TEST=Linux desktop

[fujiwara, 2012-03-03 18:11:44]

I fixed several build errors in make dist.

# ./autogen.sh
# make distcheck
make[1]: Enter directory `/root/rpmbuild/BUILD/ibus-head/src'
 CC     ibusobject.lo
ibusobject.c:24:28: fatal error: ibusmarshalers.h: No such file or
directory
compilation terminated.
make[1]: *** [ibusobject.lo] Error 1

make[4]: Enter directory
`/root/rpmbuild/BUILD/ibus-head/docs/reference/ibus'
*** gtk-doc must be installed and enabled in order to make dist
make[4]: *** [dist-check-gtkdoc] Error 1

[Peng, 2012-03-04 01:32:12]

https://codereview.appspot.com/5730046/diff/1/autogen.sh
File autogen.sh (right):

https://codereview.appspot.com/5730046/diff/1/autogen.sh#newcode26
autogen.sh:26: ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="-Wall -Werror $CFLAGS" . gnome-autogen.sh
$@
-Werror is OK? I remember vala generate c code has some build warnings.

https://codereview.appspot.com/5730046/diff/1/bus/Makefile.am
File bus/Makefile.am (right):

https://codereview.appspot.com/5730046/diff/1/bus/Makefile.am#newcode119
bus/Makefile.am:119: noinst_PROGRAMS = $(TESTS)
I think it is better put noinst_PROGRAMS outside of if .. endif block.

https://codereview.appspot.com/5730046/diff/1/configure.ac
File configure.ac (right):

https://codereview.appspot.com/5730046/diff/1/configure.ac#newcode543
configure.ac:543: Enable surrounding-text   $enable_surrounding_text
Could you add a item for test here?

[fujiwara, 2012-03-04 07:41:42]

On 2012/03/04 01:32:12, Peng wrote:
> https://codereview.appspot.com/5730046/diff/1/autogen.sh
> File autogen.sh (right):
> 
> https://codereview.appspot.com/5730046/diff/1/autogen.sh#newcode26
> autogen.sh:26: ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
> REQUIRED_AUTOMAKE_VERSION=1.10 CFLAGS="-Wall -Werror $CFLAGS" .
gnome-autogen.sh
> $@
> -Werror is OK? I remember vala generate c code has some build warnings.

It seems 'make dist' does not build c codes for vala codes but I agree to
enhance it.

I will run:
./autogen.sh --enable-gtk-doc
make distcheck \
  DISTCHECK_CONFIGURE_FLAGS='--disable-tests --enable-gtk-doc
--disable-schemas-install --disable-introspection'

> 
> https://codereview.appspot.com/5730046/diff/1/bus/Makefile.am
> File bus/Makefile.am (right):
> 
> https://codereview.appspot.com/5730046/diff/1/bus/Makefile.am#newcode119
> bus/Makefile.am:119: noinst_PROGRAMS = $(TESTS)
> I think it is better put noinst_PROGRAMS outside of if .. endif block.

Done.

> 
> https://codereview.appspot.com/5730046/diff/1/configure.ac
> File configure.ac (right):
> 
> https://codereview.appspot.com/5730046/diff/1/configure.ac#newcode543
> configure.ac:543: Enable surrounding-text   $enable_surrounding_text
> Could you add a item for test here?

Done.

[Peng, 2012-03-04 15:19:42]

lgtm

[Daiki Ueno, 2012-03-05 01:42:20]

https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am
File ui/gtk3/Makefile.am (right):

https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am#newcode111
ui/gtk3/Makefile.am:111: $(ibus_ui_gtk3_vala_cfiles) \
What's the intention of this?  If you really want to remove all vala generated
*.c files on "make clean", it might make sense.  However, if you just don't want
to include them in tarballs, it won't work, like files generated with
flex/bison:

$ tar tf ibus-1.4.99.20120305.tar.gz | grep "ui/gtk3/.*.c$"
ibus-1.4.99.20120305/ui/gtk3/iconwidget.c
ibus-1.4.99.20120305/ui/gtk3/panel.c
...

I think this part could be reverted because:
* no other projects using vala do that
* developers can simply "make maintainer-clean" to remove *.c files
* packagers can simply "touch ui/gtk3/*vala.stamp" to recompile vala

[fujiwara, 2012-03-05 02:27:53]

On 2012/03/05 01:42:20, Daiki Ueno wrote:
> https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am
> File ui/gtk3/Makefile.am (right):
> 
>
https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am#newcode111
> ui/gtk3/Makefile.am:111: $(ibus_ui_gtk3_vala_cfiles) \
> What's the intention of this?  If you really want to remove all vala generated
> *.c files on "make clean", it might make sense.  However, if you just don't
want
> to include them in tarballs, it won't work, like files generated with
> flex/bison:
> 
> $ tar tf ibus-1.4.99.20120305.tar.gz | grep "ui/gtk3/.*.c$"
> ibus-1.4.99.20120305/ui/gtk3/iconwidget.c
> ibus-1.4.99.20120305/ui/gtk3/panel.c
> ...
> 
> I think this part could be reverted because:
> * no other projects using vala do that
> * developers can simply "make maintainer-clean" to remove *.c files
> * packagers can simply "touch ui/gtk3/*vala.stamp" to recompile vala

I just want to remove *.c filees from vala since grabkeycode.c should not be
removed.

[fujiwara, 2012-03-05 02:28:48]

On 2012/03/05 02:27:53, fujiwara wrote:
> On 2012/03/05 01:42:20, Daiki Ueno wrote:
> > https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am
> > File ui/gtk3/Makefile.am (right):
> > 
> >
>
https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am#newcode111
> > ui/gtk3/Makefile.am:111: $(ibus_ui_gtk3_vala_cfiles) \
> > What's the intention of this?  If you really want to remove all vala
generated
> > *.c files on "make clean", it might make sense.  However, if you just don't
> want
> > to include them in tarballs, it won't work, like files generated with
> > flex/bison:
> > 
> > $ tar tf ibus-1.4.99.20120305.tar.gz | grep "ui/gtk3/.*.c$"
> > ibus-1.4.99.20120305/ui/gtk3/iconwidget.c
> > ibus-1.4.99.20120305/ui/gtk3/panel.c
> > ...
> > 
> > I think this part could be reverted because:
> > * no other projects using vala do that
> > * developers can simply "make maintainer-clean" to remove *.c files
> > * packagers can simply "touch ui/gtk3/*vala.stamp" to recompile vala
> 
> I just want to remove *.c filees from vala since grabkeycode.c should not be
> removed.

I mean 'make clean' only.

[Peng, 2012-03-05 02:58:35]

https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am
File ui/gtk3/Makefile.am (right):

https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am#newcode111
ui/gtk3/Makefile.am:111: $(ibus_ui_gtk3_vala_cfiles) \
On 2012/03/05 01:42:20, Daiki Ueno wrote:
> What's the intention of this?  If you really want to remove all vala generated
> *.c files on "make clean", it might make sense.  However, if you just don't
want
> to include them in tarballs, it won't work, like files generated with
> flex/bison:
> 
> $ tar tf ibus-1.4.99.20120305.tar.gz | grep "ui/gtk3/.*.c$"
> ibus-1.4.99.20120305/ui/gtk3/iconwidget.c
> ibus-1.4.99.20120305/ui/gtk3/panel.c
> ...
> 
> I think this part could be reverted because:
> * no other projects using vala do that
> * developers can simply "make maintainer-clean" to remove *.c files
> * packagers can simply "touch ui/gtk3/*vala.stamp" to recompile vala

Sorry. I didn't notice this change. I think the generated c source files should
be included in release tarball. So Linux distribution maintainers does not need
install vala in their build environments.

[fujiwara, 2012-03-05 03:11:20]

On 2012/03/05 02:58:35, Peng wrote:
> https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am
> File ui/gtk3/Makefile.am (right):
> 
>
https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am#newcode111
> ui/gtk3/Makefile.am:111: $(ibus_ui_gtk3_vala_cfiles) \
> On 2012/03/05 01:42:20, Daiki Ueno wrote:
> > What's the intention of this?  If you really want to remove all vala
generated
> > *.c files on "make clean", it might make sense.  However, if you just don't
> want
> > to include them in tarballs, it won't work, like files generated with
> > flex/bison:
> > 
> > $ tar tf ibus-1.4.99.20120305.tar.gz | grep "ui/gtk3/.*.c$"
> > ibus-1.4.99.20120305/ui/gtk3/iconwidget.c
> > ibus-1.4.99.20120305/ui/gtk3/panel.c
> > ...
> > 
> > I think this part could be reverted because:
> > * no other projects using vala do that
> > * developers can simply "make maintainer-clean" to remove *.c files
> > * packagers can simply "touch ui/gtk3/*vala.stamp" to recompile vala
> 
> Sorry. I didn't notice this change. I think the generated c source files
should
> be included in release tarball. So Linux distribution maintainers does not
need
> install vala in their build environments.

If the C files need to be included in the tarball, probably
'makemaintainer-clean' makes sense.

[fujiwara, 2012-03-05 03:28:11]

On 2012/03/05 03:11:20, fujiwara wrote:
> On 2012/03/05 02:58:35, Peng wrote:
> > https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am
> > File ui/gtk3/Makefile.am (right):
> > 
> >
>
https://codereview.appspot.com/5730046/diff/4005/ui/gtk3/Makefile.am#newcode111
> > ui/gtk3/Makefile.am:111: $(ibus_ui_gtk3_vala_cfiles) \
> > On 2012/03/05 01:42:20, Daiki Ueno wrote:
> > > What's the intention of this?  If you really want to remove all vala
> generated
> > > *.c files on "make clean", it might make sense.  However, if you just
don't
> > want
> > > to include them in tarballs, it won't work, like files generated with
> > > flex/bison:
> > > 
> > > $ tar tf ibus-1.4.99.20120305.tar.gz | grep "ui/gtk3/.*.c$"
> > > ibus-1.4.99.20120305/ui/gtk3/iconwidget.c
> > > ibus-1.4.99.20120305/ui/gtk3/panel.c
> > > ...
> > > 
> > > I think this part could be reverted because:
> > > * no other projects using vala do that
> > > * developers can simply "make maintainer-clean" to remove *.c files
> > > * packagers can simply "touch ui/gtk3/*vala.stamp" to recompile vala
> > 
> > Sorry. I didn't notice this change. I think the generated c source files
> should
> > be included in release tarball. So Linux distribution maintainers does not
> need
> > install vala in their build environments.
> 
> If the C files need to be included in the tarball, probably
> 'makemaintainer-clean' makes sense.

OK, I reverted the change of ui/gtk3/Makefile.am in CL #5731060 .