Olena-patches

Download

olena-patches@lrde.epita.fr

April 2010

5 participants
182 discussions

last-svn-commit-130-g25eca5a Have Make generate the Swilena Python Shell (sps).
by Roland Levillain 01 Apr '10

01 Apr '10

* python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and sps-local.in. (edit): New. (sps, sps-local): New rules. --- swilena/ChangeLog | 9 +++++++++ swilena/python/Makefile.am | 27 ++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index fb854f5..89da33d 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + + Have Make generate the Swilena Python Shell (sps). + + * python/Makefile.am (EXTRA_DIST): Add sps-common.in, sps.in and + sps-local.in. + (edit): New. + (sps, sps-local): New rules. + 2010-02-08 Roland Levillain <roland(a)lrde.epita.fr> Add a Swilena wrapper for mln::image2d<mln::value::rgb8>. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 44b9210..9693c2e 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -260,7 +260,6 @@ image2d_rgb8-wrap.cc: $(top_srcdir)/swilena/println.ixx ## Swilena Python Shell (sps). ## ## ---------------------------- ## -# FIXME: We might want to rename this shell as something else. python_PYTHON += sps.py # The script to be used in installed distributions. @@ -268,6 +267,32 @@ bin_SCRIPTS = sps # The script to be used in non-installed build trees. noinst_SCRIPTS = sps-local +EXTRA_DIST += sps-common.in sps.in sps-local.in + +# Use Make to generate shell scripts (`sps' and `sps-local') instead +# of `configure', as advised by Autoconf's manual (see section +# ``Installation Directory Variables''). +edit = sed \ + -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|@libdir[@]|$(libdir)|g' \ + -e 's|@pythondir[@]|$(pythondir)|g' \ + -e 's|@PYTHON[@]|$(PYTHON)|g' + +sps sps-local: Makefile $(srcdir)/sps-common.in + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + cp $${srcdir}/sps-common.in $@.tmp; \ + $(edit) $${srcdir}$@.in >>$@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +sps: $(srcdir)/sps.in +sps-local: $(srcdir)/sps-local.in + CLEANFILES += $(bin_SCRIPTS) $(noinst_SCRIPTS) -- 1.5.6.5

1 0

last-svn-commit-129-g7b138bf Stop configuring swilena/python/sps and swilena/python/sps-local.
by Roland Levillain 01 Apr '10

01 Apr '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6b6cd..373a6ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-01 Roland Levillain <roland(a)lrde.epita.fr> + + Stop configuring swilena/python/sps and swilena/python/sps-local. + + * configure.ac: Here. + 2010-03-31 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Check for HeVeA instead of TeX4ht. diff --git a/configure.ac b/configure.ac index 9b825a7..a3d319e 100644 --- a/configure.ac +++ b/configure.ac @@ -192,15 +192,6 @@ AC_CONFIG_FILES([swilena/Makefile AC_CONFIG_FILES([swilena/run], [chmod +x swilena/run]) -AC_CONFIG_FILES(m4_do([swilena/python/sps], - [:swilena/python/sps-common.in], - [:swilena/python/sps.in]), - [chmod +x swilena/python/sps]) -AC_CONFIG_FILES(m4_do([swilena/python/sps-local], - [:swilena/python/sps-common.in], - [:swilena/python/sps-local.in]), - [chmod +x swilena/python/sps-local]) - dnl<<lrde ## -------- ## ## Scribo. ## -- 1.5.6.5

1 0

Jump to page: