* bootstrap: Invoke extatica/boostrap. * configure.ac: Add option ``--enable-extatica''. Have option ``--enable-all'' trigger ``--enable-extatica''. Update verbose output. * Makefile.am (SUBDIRS) [ENABLE_EXTATICA]: Add extatica. * README: Mention Extatica. --- ChangeLog | 11 +++++++++++ Makefile.am | 6 +++++- README | 28 ++++++++++++++++++++++++++++ bootstrap | 27 +++++++++++++++++++++++++++ configure.ac | 13 +++++++++++++ 5 files changed, 84 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a9d28c..1032849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-11-10 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Bundle Extatica with Olena. + + * bootstrap: Invoke extatica/boostrap. + * configure.ac: Add option ``--enable-extatica''. + Have option ``--enable-all'' trigger ``--enable-extatica''. + Update verbose output. + * Makefile.am (SUBDIRS) [ENABLE_EXTATICA]: Add extatica. + * README: Mention Extatica. + 2009-11-24 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Rename Dyn as Extatica. diff --git a/Makefile.am b/Makefile.am index 87987f1..5c46a51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -23,6 +23,10 @@ if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA +if ENABLE_EXTATICA + SUBDIRS += extatica +endif ENABLE_EXTATICA + #<<lrde if ENABLE_SCRIBO SUBDIRS += scribo diff --git a/README b/README index cc49a02..8d4edd5 100644 --- a/README +++ b/README @@ -244,6 +244,31 @@ To enable the installation of this module use:: ./configure --enable-swilena +Swilena is working, but it is still relatively small and not as mature +as Milena. Therefore it is probably only useful to Olena developers +for the moment. + +Extatica +-------- + +Extatica is another optional component of Olena, enabling the +generation, compilation and dynamic loading of C++ functions and +methods at run time, using JIT compiling techniques. Extatica has +been primarily designed to provide a C++ dynamic-static bridge +allowing Milena users to use its generic routines (templates) without +the need to (re)instantiate and (re)compile them. + +To enable the installation of this module use:: + + ./configure --enable-extatica + +Extatica also provides (optional) SWIG Python bindings, needing both +SWIG_ and Python_ to be built. + +Like Swilena, extatica is working, but is still in early stages of +development. Compiling and installing it is probably not really +useful for the moment. + Tools ----- @@ -368,6 +393,9 @@ build-aux Auxiliary tools used by the GNU Build System during ``configure`` and ``make`` stages. +extatica + The Extatica C++ dynamic-static bridge using JIT compiling. + external Sources of Shipped dependencies. diff --git a/bootstrap b/bootstrap index 6a68272..207183d 100755 --- a/bootstrap +++ b/bootstrap @@ -157,6 +157,9 @@ require doxygen 1.5.6 require convert 6.3.7 require hevea 1.10 -version +## -------- ## +## Milena. ## +## -------- ## # Regen files stored in the repository if asked so. if $regen_p; then @@ -219,6 +222,10 @@ fi # Generate unit test files. run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests mln +## -------- ## +## Scribo. ## +## -------- ## + # Generate unit test files for Scribo. run . ./build-aux/build_unit_test.sh \ scribo/scribo \ @@ -226,5 +233,25 @@ run . ./build-aux/build_unit_test.sh \ scribo/tests/unit_test/disabled_tests \ scribo +## ---------- ## +## Extatica. ## +## ---------- ## + +# Delegate to extatica/boostrap. +run extatica ./bootstrap --no-autoreconf + +## ------------ ## +## Autoreconf. ## +## ------------ ## + # Install the GNU Build System. autoreconf -f -v -i + +# Remove directory `libltdl' installed in Olena's top-level directory by +# autoreconf by mistake (probably because `libtoolize' also installed +# libltdl in `extatica/libltdl'). +if test -d libltdl; then rm -rf libltdl; fi +# Remove useless corresponding installed Autoconf macros as well. +for f in m4/argz.m4 m4/ltdl.m4; do + if test -f "$f"; then rm -f "$f"; fi +done diff --git a/configure.ac b/configure.ac index 1febf2c..61103ff 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,7 @@ AC_ARG_ENABLE([all], [if test "x$enable_all" != xno; then enable_trimesh=yes enable_swilena=yes + enable_extatica=yes dnl<<lrde enable_scribo=yes dnl>> @@ -304,6 +305,17 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], [:swilena/python/sps-local.in]), [chmod +x swilena/python/sps-local]) + +## ---------- ## +## Extatica. ## +## ---------- ## + +AC_ARG_ENABLE([extatica], + [AS_HELP_STRING([--enable-extatica], [enable Extatica])]) +AM_CONDITIONAL([ENABLE_EXTATICA], [test "x$enable_extatica" = xyes]) +AC_CONFIG_SUBDIRS([extatica]) + + dnl<<lrde ## -------- ## ## Scribo. ## @@ -640,6 +652,7 @@ Trimesh --enable-trimesh $enable_trimesh ------------------------------------------------------------------------------- Scribo --enable-scribo $enable_scribo Swilena --enable-swilena $enable_swilena +Extatica --enable-extatica $enable_extatica ------------------------------------------------------------------------------- -- 1.5.6.5