November 2010 - Olena-patches

last-svn-commit-560-g92c53da Make Libiberty compatible with Automake.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/local.mk: New helper, containing missing recursive targets. * libiberty/configure.ac: Configure Libiberty's `Makefile' using both `Makefile.in' and `local.mk'. * libiberty/Makefile.in (Makefile): Update the invocation of config.status. --- extatica/ChangeLog | 11 +++ extatica/libiberty/Makefile.in | 4 +- extatica/libiberty/configure.ac | 2 +- extatica/libiberty/local.mk | 151 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 extatica/libiberty/local.mk diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 0070d55..cc98360 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,14 @@ +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + + Make Libiberty compatible with Automake. + + * libiberty/local.mk: New helper, containing missing recursive + targets. + * libiberty/configure.ac: Configure Libiberty's `Makefile' using + both `Makefile.in' and `local.mk'. + * libiberty/Makefile.in (Makefile): Update the invocation of + config.status. + 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> Have Extatica use the embedded GNU Libiberty. diff --git a/extatica/libiberty/Makefile.in b/extatica/libiberty/Makefile.in index 7ea7595..f918fa2 100644 --- a/extatica/libiberty/Makefile.in +++ b/extatica/libiberty/Makefile.in @@ -2,7 +2,7 @@ # Originally written by K. Richard Pixley <rich(a)cygnus.com>. # # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Free Software # Foundation # # This file is part of the libiberty library. @@ -438,7 +438,7 @@ maintainer-clean realclean: maintainer-clean-subdir force: Makefile: $(srcdir)/Makefile.in config.status - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status + $(SHELL) ./config.status Makefile # Depending on Makefile makes sure that config.status has been re-run # if needed. This prevents problems with parallel builds. diff --git a/extatica/libiberty/configure.ac b/extatica/libiberty/configure.ac index f207283..0ff8e1e 100644 --- a/extatica/libiberty/configure.ac +++ b/extatica/libiberty/configure.ac @@ -722,7 +722,7 @@ AC_SUBST(docdir) AC_SUBST(htmldir) # We need multilib support, but only if configuring for the target. -AC_CONFIG_FILES([Makefile testsuite/Makefile]) +AC_CONFIG_FILES([Makefile:Makefile.in:local.mk] [testsuite/Makefile]) AC_CONFIG_COMMANDS([default], [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then diff --git a/extatica/libiberty/local.mk b/extatica/libiberty/local.mk new file mode 100644 index 0000000..3af465f --- /dev/null +++ b/extatica/libiberty/local.mk @@ -0,0 +1,151 @@ +# Provide missing recursive targets required by Automake, so that +# libiberty can be distributed with the hosting project. + +# Have Makefile depend on this helper. +Makefile: $(srcdir)/local.mk + + +# Files to be distributed. +DISTFILES = $(srcdir)/ChangeLog $(srcdir)/README $(srcdir)/COPYING.LIB + +# Source files. +# +# Files listed in `CFILES' are not prefixed by `$(srcdir)/'; use a +# replacement variable. +srcdir_CFILES = \ + $(srcdir)/alloca.c $(srcdir)/argv.c $(srcdir)/asprintf.c \ + $(srcdir)/atexit.c $(srcdir)/basename.c $(srcdir)/bcmp.c \ + $(srcdir)/bcopy.c $(srcdir)/bsearch.c $(srcdir)/bzero.c \ + $(srcdir)/calloc.c $(srcdir)/choose-temp.c $(srcdir)/clock.c \ + $(srcdir)/concat.c $(srcdir)/cp-demangle.c $(srcdir)/cp-demint.c \ + $(srcdir)/cplus-dem.c $(srcdir)/crc32.c $(srcdir)/dyn-string.c \ + $(srcdir)/fdmatch.c $(srcdir)/ffs.c $(srcdir)/fibheap.c \ + $(srcdir)/filename_cmp.c $(srcdir)/floatformat.c $(srcdir)/fnmatch.c \ + $(srcdir)/fopen_unlocked.c $(srcdir)/getcwd.c $(srcdir)/getopt.c \ + $(srcdir)/getopt1.c $(srcdir)/getpagesize.c $(srcdir)/getpwd.c \ + $(srcdir)/getruntime.c $(srcdir)/gettimeofday.c $(srcdir)/hashtab.c \ + $(srcdir)/hex.c $(srcdir)/index.c $(srcdir)/insque.c \ + $(srcdir)/lbasename.c $(srcdir)/lrealpath.c \ + $(srcdir)/make-relative-prefix.c $(srcdir)/make-temp-file.c \ + $(srcdir)/md5.c $(srcdir)/memchr.c $(srcdir)/memcmp.c \ + $(srcdir)/memcpy.c $(srcdir)/memmem.c $(srcdir)/memmove.c \ + $(srcdir)/mempcpy.c $(srcdir)/memset.c $(srcdir)/mkstemps.c \ + $(srcdir)/objalloc.c $(srcdir)/obstack.c $(srcdir)/partition.c \ + $(srcdir)/pexecute.c $(srcdir)/pex-common.c $(srcdir)/pex-djgpp.c \ + $(srcdir)/pex-msdos.c $(srcdir)/pex-one.c $(srcdir)/pex-unix.c \ + $(srcdir)/pex-win32.c $(srcdir)/physmem.c $(srcdir)/putenv.c \ + $(srcdir)/random.c $(srcdir)/regex.c $(srcdir)/rename.c \ + $(srcdir)/rindex.c $(srcdir)/safe-ctype.c $(srcdir)/setenv.c \ + $(srcdir)/setproctitle.c $(srcdir)/sha1.c $(srcdir)/sigsetmask.c \ + $(srcdir)/snprintf.c $(srcdir)/sort.c $(srcdir)/spaces.c \ + $(srcdir)/splay-tree.c $(srcdir)/stpcpy.c $(srcdir)/stpncpy.c \ + $(srcdir)/strcasecmp.c $(srcdir)/strchr.c $(srcdir)/strdup.c \ + $(srcdir)/strerror.c $(srcdir)/strncasecmp.c $(srcdir)/strncmp.c \ + $(srcdir)/strrchr.c $(srcdir)/strsignal.c $(srcdir)/strstr.c \ + $(srcdir)/strtod.c $(srcdir)/strtol.c $(srcdir)/strtoul.c \ + $(srcdir)/strndup.c $(srcdir)/strverscmp.c $(srcdir)/tmpnam.c \ + $(srcdir)/unlink-if-ordinary.c $(srcdir)/vasprintf.c \ + $(srcdir)/vfork.c $(srcdir)/vfprintf.c $(srcdir)/vprintf.c \ + $(srcdir)/vsnprintf.c $(srcdir)/vsprintf.c $(srcdir)/waitpid.c \ + $(srcdir)/xatexit.c $(srcdir)/xexit.c $(srcdir)/xmalloc.c \ + $(srcdir)/xmemdup.c $(srcdir)/xstrdup.c $(srcdir)/xstrerror.c \ + $(srcdir)/xstrndup.c +DISTFILES += $(srcdir_CFILES) $(srcdir)/cp-demangle.h $(srcdir)/pex-common.h + +# Configuration. +DISTFILES += \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/config.h-vms \ + $(srcdir)/config.in \ + $(srcdir)/config/mh-aix \ + $(srcdir)/config/mh-cxux7 \ + $(srcdir)/config/mh-fbsd21 \ + $(srcdir)/config/mh-openedition \ + $(srcdir)/config/mh-windows \ + $(srcdir)/configure \ + $(srcdir)/configure.ac \ + $(srcdir)/configure.com + +# Construction. +DISTFILES += \ + $(srcdir)/Makefile.in \ + $(srcdir)/local.mk \ + $(srcdir)/makefile.vms \ + $(srcdir)/testsuite/Makefile.in + +# Documentation. +# +# Files listed in TEXIFILES are not prefixed by `$(srcdir)/'; use +# a replacement variable. +srcdir_TEXIFILES = $(srcdir)/fnmatch.txh $(srcdir)/pexecute.txh +DISTFILES += $(TEXISRC) $(srcdir_TEXIFILES) $(srcdir)/at-file.texi + +# Scripts. +DISTFILES += $(srcdir)/maint-tool $(srcdir)/gather-docs + +# Tests. +DISTFILES += \ + $(srcdir)/testsuite/demangle-expected \ + $(srcdir)/testsuite/test-demangle.c \ + $(srcdir)/testsuite/test-expandargv.c \ + $(srcdir)/testsuite/test-pexecute.c + + +# The following recursive targets are missing from Libiberty's +# `Makefile.in'. + +# `Makefile.in' defines `mkdir_p', not `MKDIR_P'. +MKDIR_P = $(mkdir_p) + +# Copied from a `Makefile.in' generated by Automake. +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + +installdirs: # FIXME: Write me. +# Use something like this: +# +# for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"; do \ +# test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +# done +# +# ? + +install-dvi: # FIXME: Write me. + +uninstall: # FIXME: Write me. + +.PHONY: distdir installdirs install-dvi uninstall + + +# Targets doing nothing. +EMPTY_AUTOMAKE_TARGETS = ps install-ps install-data install-exec ctags +.PHONY: $(EMPTY_AUTOMAKE_TARGETS) +$(EMPTY_AUTOMAKE_TARGETS): -- 1.5.6.5

1 0

last-svn-commit-548-g7d199c0 Add support for configuration option `--with-milena' in Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* configure.ac: ...here. Adjust paths accordingly. --- extatica/ChangeLog | 7 +++++++ extatica/configure.ac | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index ebffa33..0e17c33 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Add support for configuration option `--with-milena' in Extatica. + + * configure.ac: ...here. + Adjust paths accordingly. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. * config/Makefile.am (ruby.m4): Remove wrong and useless diff --git a/extatica/configure.ac b/extatica/configure.ac index f872d57..a22bf98 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -200,8 +200,35 @@ AC_SUBST([DYN_DATADIR], [$my_abs_builddir/data]) AC_SUBST([DYN_FIXTURES], [$my_abs_srcdir/test/fixtures]) +## -------- ## +## Milena. ## +## -------- ## + +# The current approach to providing Extatica a path to Milena's headers +# is naive: for instance, we cannot provide two paths (source and +# build dirs) in the case of an Olena build using a parallel build +# (where srcdir != builddir). Improve if needed. + +# FIXME: Make Milena an optional dependency of Extatica. + +AC_ARG_WITH([milena], + [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])], + [if test x"$with_milena" = xno; then + AC_MSG_ERROR([Milena is required for Swilena. Try to invoke configure +without `--with-milena=no' nor `--without-milena.']) + fi]) +if test -n "$with_milena" && test x"$with_milena" != xyes; then + MILENA_CPPFLAGS="-I$with_milena" +fi +swl_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS" +AC_CHECK_HEADER([mln/core/essential.hh], [], + AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with +`--with-milena=DIR'.])) +CPPFLAGS=$swl_save_CPPFLAGS # Absolute path to Milena. -AC_SUBST([MILENA_DIR], [$my_abs_srcdir/../milena]) +MILENA_DIR=`cd "$with_milena" && pwd` +AC_SUBST([MILENA_DIR]) ## ------------------- ## ## Ruby Configuration. ## -- 1.5.6.5

1 0

last-svn-commit-548-g5545f9c Add support for configuration option `--with-milena' in Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* configure.ac: ...here. Adjust paths accordingly. --- extatica/ChangeLog | 7 +++++++ extatica/configure.ac | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index b313d0a..911ffdf 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Add support for configuration option `--with-milena' in Extatica. + + * configure.ac: ...here. + Adjust paths accordingly. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. * config/Makefile.am (ruby.m4): Remove wrong and useless diff --git a/extatica/configure.ac b/extatica/configure.ac index f872d57..a22bf98 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -200,8 +200,35 @@ AC_SUBST([DYN_DATADIR], [$my_abs_builddir/data]) AC_SUBST([DYN_FIXTURES], [$my_abs_srcdir/test/fixtures]) +## -------- ## +## Milena. ## +## -------- ## + +# The current approach to providing Extatica a path to Milena's headers +# is naive: for instance, we cannot provide two paths (source and +# build dirs) in the case of an Olena build using a parallel build +# (where srcdir != builddir). Improve if needed. + +# FIXME: Make Milena an optional dependency of Extatica. + +AC_ARG_WITH([milena], + [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])], + [if test x"$with_milena" = xno; then + AC_MSG_ERROR([Milena is required for Swilena. Try to invoke configure +without `--with-milena=no' nor `--without-milena.']) + fi]) +if test -n "$with_milena" && test x"$with_milena" != xyes; then + MILENA_CPPFLAGS="-I$with_milena" +fi +swl_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS" +AC_CHECK_HEADER([mln/core/essential.hh], [], + AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with +`--with-milena=DIR'.])) +CPPFLAGS=$swl_save_CPPFLAGS # Absolute path to Milena. -AC_SUBST([MILENA_DIR], [$my_abs_srcdir/../milena]) +MILENA_DIR=`cd "$with_milena" && pwd` +AC_SUBST([MILENA_DIR]) ## ------------------- ## ## Ruby Configuration. ## -- 1.5.6.5

1 0

last-svn-commit-547-geb3778a Fix the distribution of Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* config/Makefile.am (ruby.m4): Remove wrong and useless target. (dist_noinst_SCRIPTS): Add erbx rbconfig_gen.rb mk_local_config_rb_in.rb. (EXTRA_DIST): Add xtc.m4. * bin/Makefile.am (noinst_SCRIPTS): Rename as... (dist_noinst_SCRIPTS): ...this, so that scripts are distributed. * src/Makefile.am (libdyn_la_SOURCES): Remove config.h, as it is already distributed as a product of `configure'. Move all_methods.hh, all_methods.cc, function.hh and function.cc... (nodist_libdyn_la_SOURCES): ...here (new variables). (EXTRA_DIST): New variable. (dyn-all.hh, dyn-light.hh): Do not use a pipe to filter concatenated files, to be able to catch errors in the call to `cat' (e.g., missing files). * test/Makefile.am (EXTRA_DIST): Add fixtures/my_lib/lib.hh, fixtures/my_lib/damien.hh and fixtures/my_lib/damien.hxx. --- extatica/ChangeLog | 23 +++++++++++++++++++++++ extatica/bin/Makefile.am | 4 ++-- extatica/config/Makefile.am | 7 +++++-- extatica/src/Makefile.am | 35 +++++++++++++++++++++++++++-------- extatica/test/Makefile.am | 5 +++++ 5 files changed, 62 insertions(+), 12 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index a476bda..ebffa33 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,28 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. + + * config/Makefile.am (ruby.m4): Remove wrong and useless + target. + (dist_noinst_SCRIPTS): Add erbx rbconfig_gen.rb + mk_local_config_rb_in.rb. + (EXTRA_DIST): Add xtc.m4. + * bin/Makefile.am (noinst_SCRIPTS): Rename as... + (dist_noinst_SCRIPTS): ...this, so that scripts are distributed. + * src/Makefile.am (libdyn_la_SOURCES): Remove config.h, as it is + already distributed as a product of `configure'. + Move all_methods.hh, all_methods.cc, function.hh and + function.cc... + (nodist_libdyn_la_SOURCES): ...here (new variables). + (EXTRA_DIST): New variable. + (dyn-all.hh, dyn-light.hh): Do not use a pipe to filter + concatenated files, to be able to catch errors in the call to + `cat' (e.g., missing files). + * test/Makefile.am (EXTRA_DIST): Add fixtures/my_lib/lib.hh, + fixtures/my_lib/damien.hh and fixtures/my_lib/damien.hxx. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Extatica. * data/Makefile.am (CLEANFILES): Add Makefile.template and diff --git a/extatica/bin/Makefile.am b/extatica/bin/Makefile.am index 4b0a257..6aa9a50 100644 --- a/extatica/bin/Makefile.am +++ b/extatica/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,5 +16,5 @@ bin_SCRIPTS = dyn-config # FIXME put dyn- before these binaries -noinst_SCRIPTS = mk_swig_input swig_tree_to_yaml yaml_to_dyn_decls +dist_noinst_SCRIPTS = mk_swig_input swig_tree_to_yaml yaml_to_dyn_decls BUILT_SOURCES = dyn-config diff --git a/extatica/config/Makefile.am b/extatica/config/Makefile.am index 5209d05..511ba6b 100644 --- a/extatica/config/Makefile.am +++ b/extatica/config/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,4 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -ruby.m4: rbconfig_gen.rb config/mk_local_config_rb_in.rb +dist_noinst_SCRIPTS = erbx rbconfig_gen.rb mk_local_config_rb_in.rb + +# Used by libiberty/configure.ac. +EXTRA_DIST = xtc.m4 diff --git a/extatica/src/Makefile.am b/extatica/src/Makefile.am index 5f91f40..ab53eb2 100644 --- a/extatica/src/Makefile.am +++ b/extatica/src/Makefile.am @@ -56,13 +56,19 @@ CLEANFILES = \ libdyn_la_SOURCES = \ dyn.hh \ data.hh data.hxx data.cc \ - all_methods.hh all_methods.cc \ - function.hh function.cc \ function_loader.hh function_loader.cc \ name_of.hh name_of.cc \ policy.hh policy.cc \ ruby_stream.hh ruby_stream.cc \ - ansidecl.h demangle.h config.hh + ansidecl.h demangle.h + +nodist_libdyn_la_SOURCES = \ + all_methods.hh all_methods.cc \ + function.hh function.cc + +EXTRA_DIST = \ + all_methods.erb.hh all_methods.erb.cc \ + function.erb.hh function.erb.cc # Provide a dummy `environ' symbol expected by libiberty (from the # MacPorts), but missing on Mac OS X. This is just a workaround. We @@ -102,15 +108,28 @@ cut_local_includes = grep -v '^.[\t ]*include[\t ]*".*"' dyn-all.hh: $(dyn_all_hh_deps) rm -f $@ - echo "// Generated: do not edit by hand!" > $@ - echo "#define DYN_FULL_IMPLEMENTATION" >> $@ - cat $(dyn_all_hh_deps) | $(cut_local_includes) >> $@ + rm -f $@.tmp.1 + rm -f $@.tmp.2 + echo "// Generated by make. Do not edit by hand." >$@.tmp.1 + echo >>$@.tmp.1 + echo "#define DYN_FULL_IMPLEMENTATION" >>$@.tmp.1 + echo >>$@.tmp.1 + cat $(dyn_all_hh_deps) >>$@.tmp.1 + $(cut_local_includes) $@.tmp.1 >>$@.tmp.2 + rm -f $@.tmp.1 + mv $@.tmp.2 $@ chmod -w $@ dyn-light.hh: $(dyn_light_hh_deps) rm -f $@ - echo "// Generated: do not edit by hand!" > $@ - cat $(dyn_light_hh_deps) | $(cut_local_includes) >> $@ + rm -f $@.tmp.1 + rm -f $@.tmp.2 + echo "// Generated by make. Do not edit by hand." >$@.tmp.1 + echo >>$@.tmp.1 + cat $(dyn_light_hh_deps) >>$@.tmp.1 + $(cut_local_includes) $@.tmp.1 >>$@.tmp.2 + rm -f $@.tmp.1 + mv $@.tmp.2 $@ chmod -w $@ %.hh: %.erb.hh diff --git a/extatica/test/Makefile.am b/extatica/test/Makefile.am index a8028d8..3317a26 100644 --- a/extatica/test/Makefile.am +++ b/extatica/test/Makefile.am @@ -75,6 +75,11 @@ milena_test_DEPENDENCIES = $(top_builddir)/src/libdyn.la #erb# =end_generated +# Fixtures. +EXTRA_DIST = \ + fixtures/my_lib/lib.hh \ + fixtures/my_lib/damien.hh fixtures/my_lib/damien.hxx + TESTS = $(check_PROGRAMS) tests: $(check_PROGRAMS) -- 1.5.6.5

1 0

last-svn-commit-547-g4d7c62b Fix the distribution of Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* config/Makefile.am (ruby.m4): Remove wrong and useless target. (dist_noinst_SCRIPTS): Add erbx rbconfig_gen.rb mk_local_config_rb_in.rb. * bin/Makefile.am (noinst_SCRIPTS): Rename as... (dist_noinst_SCRIPTS): ...this, so that scripts are distributed. * src/Makefile.am (libdyn_la_SOURCES): Remove config.h, as it is already distributed as a product of `configure'. Move all_methods.hh, all_methods.cc, function.hh and function.cc... (nodist_libdyn_la_SOURCES): ...here (new variables). (EXTRA_DIST): New variable. (dyn-all.hh, dyn-light.hh): Do not use a pipe to filter concatenated files, to be able to catch errors in the call to `cat' (e.g., missing files). * test/Makefile.am (EXTRA_DIST): Add fixtures/my_lib/lib.hh, fixtures/my_lib/damien.hh and fixtures/my_lib/damien.hxx. --- extatica/ChangeLog | 22 ++++++++++++++++++++++ extatica/bin/Makefile.am | 4 ++-- extatica/config/Makefile.am | 4 ++-- extatica/src/Makefile.am | 35 +++++++++++++++++++++++++++-------- extatica/test/Makefile.am | 5 +++++ 5 files changed, 58 insertions(+), 12 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index a476bda..b313d0a 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,27 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. + + * config/Makefile.am (ruby.m4): Remove wrong and useless + target. + (dist_noinst_SCRIPTS): Add erbx rbconfig_gen.rb + mk_local_config_rb_in.rb. + * bin/Makefile.am (noinst_SCRIPTS): Rename as... + (dist_noinst_SCRIPTS): ...this, so that scripts are distributed. + * src/Makefile.am (libdyn_la_SOURCES): Remove config.h, as it is + already distributed as a product of `configure'. + Move all_methods.hh, all_methods.cc, function.hh and + function.cc... + (nodist_libdyn_la_SOURCES): ...here (new variables). + (EXTRA_DIST): New variable. + (dyn-all.hh, dyn-light.hh): Do not use a pipe to filter + concatenated files, to be able to catch errors in the call to + `cat' (e.g., missing files). + * test/Makefile.am (EXTRA_DIST): Add fixtures/my_lib/lib.hh, + fixtures/my_lib/damien.hh and fixtures/my_lib/damien.hxx. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Extatica. * data/Makefile.am (CLEANFILES): Add Makefile.template and diff --git a/extatica/bin/Makefile.am b/extatica/bin/Makefile.am index 4b0a257..6aa9a50 100644 --- a/extatica/bin/Makefile.am +++ b/extatica/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,5 +16,5 @@ bin_SCRIPTS = dyn-config # FIXME put dyn- before these binaries -noinst_SCRIPTS = mk_swig_input swig_tree_to_yaml yaml_to_dyn_decls +dist_noinst_SCRIPTS = mk_swig_input swig_tree_to_yaml yaml_to_dyn_decls BUILT_SOURCES = dyn-config diff --git a/extatica/config/Makefile.am b/extatica/config/Makefile.am index 5209d05..f11f7d0 100644 --- a/extatica/config/Makefile.am +++ b/extatica/config/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,4 +14,4 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -ruby.m4: rbconfig_gen.rb config/mk_local_config_rb_in.rb +dist_noinst_SCRIPTS = erbx rbconfig_gen.rb mk_local_config_rb_in.rb diff --git a/extatica/src/Makefile.am b/extatica/src/Makefile.am index 5f91f40..ab53eb2 100644 --- a/extatica/src/Makefile.am +++ b/extatica/src/Makefile.am @@ -56,13 +56,19 @@ CLEANFILES = \ libdyn_la_SOURCES = \ dyn.hh \ data.hh data.hxx data.cc \ - all_methods.hh all_methods.cc \ - function.hh function.cc \ function_loader.hh function_loader.cc \ name_of.hh name_of.cc \ policy.hh policy.cc \ ruby_stream.hh ruby_stream.cc \ - ansidecl.h demangle.h config.hh + ansidecl.h demangle.h + +nodist_libdyn_la_SOURCES = \ + all_methods.hh all_methods.cc \ + function.hh function.cc + +EXTRA_DIST = \ + all_methods.erb.hh all_methods.erb.cc \ + function.erb.hh function.erb.cc # Provide a dummy `environ' symbol expected by libiberty (from the # MacPorts), but missing on Mac OS X. This is just a workaround. We @@ -102,15 +108,28 @@ cut_local_includes = grep -v '^.[\t ]*include[\t ]*".*"' dyn-all.hh: $(dyn_all_hh_deps) rm -f $@ - echo "// Generated: do not edit by hand!" > $@ - echo "#define DYN_FULL_IMPLEMENTATION" >> $@ - cat $(dyn_all_hh_deps) | $(cut_local_includes) >> $@ + rm -f $@.tmp.1 + rm -f $@.tmp.2 + echo "// Generated by make. Do not edit by hand." >$@.tmp.1 + echo >>$@.tmp.1 + echo "#define DYN_FULL_IMPLEMENTATION" >>$@.tmp.1 + echo >>$@.tmp.1 + cat $(dyn_all_hh_deps) >>$@.tmp.1 + $(cut_local_includes) $@.tmp.1 >>$@.tmp.2 + rm -f $@.tmp.1 + mv $@.tmp.2 $@ chmod -w $@ dyn-light.hh: $(dyn_light_hh_deps) rm -f $@ - echo "// Generated: do not edit by hand!" > $@ - cat $(dyn_light_hh_deps) | $(cut_local_includes) >> $@ + rm -f $@.tmp.1 + rm -f $@.tmp.2 + echo "// Generated by make. Do not edit by hand." >$@.tmp.1 + echo >>$@.tmp.1 + cat $(dyn_light_hh_deps) >>$@.tmp.1 + $(cut_local_includes) $@.tmp.1 >>$@.tmp.2 + rm -f $@.tmp.1 + mv $@.tmp.2 $@ chmod -w $@ %.hh: %.erb.hh diff --git a/extatica/test/Makefile.am b/extatica/test/Makefile.am index a8028d8..3317a26 100644 --- a/extatica/test/Makefile.am +++ b/extatica/test/Makefile.am @@ -75,6 +75,11 @@ milena_test_DEPENDENCIES = $(top_builddir)/src/libdyn.la #erb# =end_generated +# Fixtures. +EXTRA_DIST = \ + fixtures/my_lib/lib.hh \ + fixtures/my_lib/damien.hh fixtures/my_lib/damien.hxx + TESTS = $(check_PROGRAMS) tests: $(check_PROGRAMS) -- 1.5.6.5

1 0

last-svn-commit-546-gfef2f74 Fix cleaning rules in Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* data/Makefile.am (CLEANFILES): Add Makefile.template and Makefile.repository. * swig/python/Makefile.am (CLEANFILES) * test/Makefile.am (CLEANFILES): Add dyn.log. * test/wrappers/Makefile.am (CLEANFILES): Likewise. (clean-local): Depend on... (clean-repository): ...this new (phony) target. --- extatica/ChangeLog | 13 +++++++++++++ extatica/data/Makefile.am | 5 ++++- extatica/swig/python/Makefile.am | 3 +++ extatica/test/Makefile.am | 6 +++++- extatica/test/wrappers/Makefile.am | 10 +++++++++- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 52020be..a476bda 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,18 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Extatica. + + * data/Makefile.am (CLEANFILES): Add Makefile.template and + Makefile.repository. + * swig/python/Makefile.am (CLEANFILES) + * test/Makefile.am (CLEANFILES): + Add dyn.log. + * test/wrappers/Makefile.am (CLEANFILES): Likewise. + (clean-local): Depend on... + (clean-repository): ...this new (phony) target. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Generate Extatica's swig/python/config.py. * swig/python/config.py: Remove. diff --git a/extatica/data/Makefile.am b/extatica/data/Makefile.am index 698b1f8..a9d9d93 100644 --- a/extatica/data/Makefile.am +++ b/extatica/data/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -48,3 +49,5 @@ Makefile.repository: Makefile -e 's/^SUBDIRS = .*/SUBDIRS = $$(shell ls | grep -v Makefile)/' \ -e 's|^Makefile: |Makefile.old: |' \ -e 's|^VPATH = .*|VPATH = .|' | grep -v '^include ' > $@ + +CLEANFILES = Makefile.template Makefile.repository diff --git a/extatica/swig/python/Makefile.am b/extatica/swig/python/Makefile.am index c96c9e3..bef9788 100644 --- a/extatica/swig/python/Makefile.am +++ b/extatica/swig/python/Makefile.am @@ -149,6 +149,9 @@ TESTS = milena-libdyn.py milena-libdynmilena.py # FIXME: Is this really needed? EXTRA_DIST += $(TESTS) +# Log produced by libdyn. +CLEANFILES += dyn.log + clean-local: clean-repository .PHONY: clean-repository clean-repository: diff --git a/extatica/test/Makefile.am b/extatica/test/Makefile.am index e0301a6..a8028d8 100644 --- a/extatica/test/Makefile.am +++ b/extatica/test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -78,6 +79,9 @@ TESTS = $(check_PROGRAMS) tests: $(check_PROGRAMS) +# Log produced by libdyn. +CLEANFILES = dyn.log + clean-local: clean-repository .PHONY: clean-repository clean-repository: diff --git a/extatica/test/wrappers/Makefile.am b/extatica/test/wrappers/Makefile.am index d947ea2..56097c1 100644 --- a/extatica/test/wrappers/Makefile.am +++ b/extatica/test/wrappers/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -23,3 +23,11 @@ check_PROGRAMS = test-milena test_milena_SOURCES = test-milena.cc TESTS = $(check_PROGRAMS) + +# Log produced by libdyn. +CLEANFILES = dyn.log + +clean-local: clean-repository +.PHONY: clean-repository +clean-repository: + -rm -rf repository -- 1.5.6.5

1 0

last-svn-commit-545-gb698f45 Generate Extatica's swig/python/config.py.
by Roland Levillain 09 Nov '10

09 Nov '10

* swig/python/config.py: Remove. Superseded by... * swig/python/config.py.in: ...this (new) file. * swig/python/Makefile.am (edit): New variable. (all-local): Depend on... (config.py): ...this (new) target. (EXTRA_DIST): s/config.py/config.py.in/. (CLEANFILES) Add config.py and config.py[co]. --- extatica/ChangeLog | 13 ++++++++ extatica/swig/python/Makefile.am | 33 +++++++++++++++++-- extatica/swig/python/config.py | 28 ----------------- .../swig/python/config.py.in | 13 +++---- 4 files changed, 48 insertions(+), 39 deletions(-) delete mode 100644 extatica/swig/python/config.py copy scribo/demo/Makefile.am => extatica/swig/python/config.py.in (84%) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 2a07f08..52020be 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,16 @@ +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + + Generate Extatica's swig/python/config.py. + + * swig/python/config.py: Remove. + Superseded by... + * swig/python/config.py.in: ...this (new) file. + * swig/python/Makefile.am (edit): New variable. + (all-local): Depend on... + (config.py): ...this (new) target. + (EXTRA_DIST): s/config.py/config.py.in/. + (CLEANFILES) Add config.py and config.py[co]. + 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> Use intermediate variables in src/Makefile.am. diff --git a/extatica/swig/python/Makefile.am b/extatica/swig/python/Makefile.am index f704065..c96c9e3 100644 --- a/extatica/swig/python/Makefile.am +++ b/extatica/swig/python/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -23,7 +23,6 @@ ## FIXME: Adjust. -CLEANFILES = AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir)/src -I$(top_srcdir)/src ## FIXME: Define an equivalent to Olena's TOOLS_CXXFLAGS? ##TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ @@ -50,8 +49,34 @@ libdynmilena_la = $(top_builddir)/src/wrappers/libdynmilena.la $(libdyn_la) # ltihooks.py: Python import hooks that understand Libtool libraries. python_PYTHON = ltihooks.py -# config.py: Configuration values of the package. -EXTRA_DIST = config.py +# Use Make to generate `config.py' instead of `configure', as advised +# by Autoconf's manual (see section ``Installation Directory +# Variables''). +edit = sed \ + -e 's|@top_srcdir[@]|$(top_srcdir)|g' \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ + -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ + -e 's|@MILENA_DIR[@]|$(MILENA_DIR)|g' + +# config.py: Access to the data of the distribution (images, meshes, +# etc.). +# +# Use the all-local hook instead of the nodist_noinst_PYTHON variable, +# since ``[...] byte-compilation occurs at install time, any files +# listed in `noinst_PYTHON' will not be compiled'' (and therefore +# generated, in our case), according to Automake's manual, +all-local: config.py +EXTRA_DIST = config.py.in +config.py: config.py.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$< || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$< >>$@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = config.py config.py[co] ## ----------------- ## diff --git a/extatica/swig/python/config.py b/extatica/swig/python/config.py deleted file mode 100644 index 1594f5e..0000000 --- a/extatica/swig/python/config.py +++ /dev/null @@ -1,28 +0,0 @@ -#! /usr/bin/env python - -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# \file -# \brief Configuration values of the package. - -# FIXME: We might want to turn this into a config.py.in file and -# generate it instead of getting variables from the environment. - -import os - -abs_top_srcdir = os.environ["abs_top_srcdir"] -abs_milena_dir = os.path.join(abs_top_srcdir, "..", "milena") diff --git a/scribo/demo/Makefile.am b/extatica/swig/python/config.py.in similarity index 84% copy from scribo/demo/Makefile.am copy to extatica/swig/python/config.py.in index b1d3c5b..969799b 100644 --- a/scribo/demo/Makefile.am +++ b/extatica/swig/python/config.py.in @@ -1,5 +1,6 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +#! /usr/bin/env python + +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -15,9 +16,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -if HAVE_QT - -SUBDIRS = review viewer - -endif HAVE_QT +# \file +# \brief Configuration values of the package. +abs_milena_dir = "@MILENA_DIR@" -- 1.5.6.5

1 0

last-svn-commit-543-gda642d2 INSTALL: New (generated by Automake).
by Roland Levillain 09 Nov '10

09 Nov '10

--- extatica/ChangeLog | 4 ++++ INSTALL => extatica/INSTALL | 0 2 files changed, 4 insertions(+), 0 deletions(-) copy INSTALL => extatica/INSTALL (100%) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 05d53b6..1cdaa81 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,7 @@ +2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> + + * INSTALL: New (generated by Automake). + 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Do not pass option `foreign' to Automake. diff --git a/INSTALL b/extatica/INSTALL similarity index 100% copy from INSTALL copy to extatica/INSTALL -- 1.5.6.5

1 0

last-svn-commit-542-gffe777d configure.ac: Do not pass option `foreign' to Automake.
by Roland Levillain 05 Nov '10

05 Nov '10

--- extatica/ChangeLog | 4 ++++ extatica/configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index f19fb87..05d53b6 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,9 @@ 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Do not pass option `foreign' to Automake. + +2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> + Add a NEWS file to Extatica. * NEWS: New. diff --git a/extatica/configure.ac b/extatica/configure.ac index 8761e82..f872d57 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -34,7 +34,7 @@ AC_INIT([Extatica], [0.1], [olena(a)lrde.epita.fr] [extatica]) AC_CONFIG_AUX_DIR([_config]) # Automake. -AM_INIT_AUTOMAKE([1.10 foreign check-news dist-bzip2 -Wall nostdinc]) +AM_INIT_AUTOMAKE([1.10 check-news dist-bzip2 -Wall nostdinc]) ## --------------------- ## -- 1.5.6.5

1 0

last-svn-commit-541-gbe51d1d Add a NEWS file to Extatica.
by Roland Levillain 05 Nov '10

05 Nov '10

* NEWS: New. --- extatica/ChangeLog | 6 ++++++ extatica/NEWS | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 extatica/NEWS diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 83d5455..f19fb87 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,11 @@ 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> + Add a NEWS file to Extatica. + + * NEWS: New. + +2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> + Add the text of the GNU GPL v2 to Extatica. * COPYING: New. diff --git a/extatica/NEWS b/extatica/NEWS new file mode 100644 index 0000000..8eebf76 --- /dev/null +++ b/extatica/NEWS @@ -0,0 +1,27 @@ +* Extatica 0.1a MONTH DAY, YEAR + + * Initial public release. + + +Local Variables: +mode: outline +ispell-local-dictionary: "american" +End: + +---- + +Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) + +This file is part of Olena. + +Olena is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation, version 2 of the License. + +Olena is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Olena. If not, see <http://www.gnu.org/licenses/>. -- 1.5.6.5

1 0