[open-ils-commits] [GIT] Evergreen ILS branch master updated. 63ac5d47710fca0e308b4d3ba87edf73ce8b4ae7
Evergreen Git
git at git.evergreen-ils.org
Thu Mar 29 10:49:36 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 63ac5d47710fca0e308b4d3ba87edf73ce8b4ae7 (commit)
via c2cd2567032c5d43c47c4f9eeb36566cc23c0615 (commit)
from 082bb7963d7c7dec1c0f9859d2ff16dad2221eec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63ac5d47710fca0e308b4d3ba87edf73ce8b4ae7
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Mar 22 16:04:39 2012 -0400
Add Makefile to rebuild targets for generated files
If you rerun ./configure with a different option (such as
--sysconf=foo), the changed Makefile needs to trigger a rebuild of the
generated files. Otherwise, the first generated version of the file is
always newer than its *.in counterpart and a rebuild won't be triggered
on subsequent ./configure runs.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 4a4d9ac..d250f58 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -183,32 +183,32 @@ uninstall-hook:
rm -R $(XSLDIR)
rm -R $(CGIDIR)
- at srcdir@/extras/fast-extract: @srcdir@/extras/fast-extract.in
- $(do_subst) "$<" > "$@"
+ at srcdir@/extras/fast-extract: Makefile @srcdir@/extras/fast-extract.in
+ $(do_subst) @srcdir@/extras/fast-extract.in > "$@"
chmod 755 "$@"
- at srcdir@/extras/import/marc2are.pl: @srcdir@/extras/import/marc2are.pl.in
- $(do_subst) "$<" > "$@"
+ at srcdir@/extras/import/marc2are.pl: Makefile @srcdir@/extras/import/marc2are.pl.in
+ $(do_subst) @srcdir@/extras/import/marc2are.pl.in > "$@"
chmod 755 "$@"
- at srcdir@/extras/import/marc2bre.pl: @srcdir@/extras/import/marc2bre.pl.in
- $(do_subst) "$<" > "$@"
+ at srcdir@/extras/import/marc2bre.pl: Makefile @srcdir@/extras/import/marc2bre.pl.in
+ $(do_subst) @srcdir@/extras/import/marc2bre.pl.in > "$@"
chmod 755 "$@"
- at srcdir@/extras/import/marc2sre.pl: @srcdir@/extras/import/marc2sre.pl.in
- $(do_subst) "$<" > "$@"
+ at srcdir@/extras/import/marc2sre.pl: Makefile @srcdir@/extras/import/marc2sre.pl.in
+ $(do_subst) @srcdir@/extras/import/marc2sre.pl.in > "$@"
chmod 755 "$@"
- at srcdir@/extras/import/parallel_pg_loader.pl: @srcdir@/extras/import/parallel_pg_loader.pl.in
- $(do_subst) "$<" > "$@"
+ at srcdir@/extras/import/parallel_pg_loader.pl: Makefile @srcdir@/extras/import/parallel_pg_loader.pl.in
+ $(do_subst) @srcdir@/extras/import/parallel_pg_loader.pl.in > "$@"
chmod 755 "$@"
-$(supportscr)/authority_control_fields.pl: $(supportscr)/authority_control_fields.pl.in
- $(do_subst) "$<" > "$@"
+$(supportscr)/authority_control_fields.pl: Makefile $(supportscr)/authority_control_fields.pl.in
+ $(do_subst) $(supportscr)/authority_control_fields.pl.in > "$@"
chmod 755 "$@"
-$(supportscr)/marc_export: $(supportscr)/marc_export.in
- $(do_subst) "$<" > "$@"
+$(supportscr)/marc_export: Makefile $(supportscr)/marc_export.in
+ $(do_subst) $(supportscr)/marc_export.in > "$@"
chmod 755 "$@"
#perl-install and string-templates-install
diff --git a/Open-ILS/src/perlmods/Makefile.am b/Open-ILS/src/perlmods/Makefile.am
index 64f350d..ac507d1 100644
--- a/Open-ILS/src/perlmods/Makefile.am
+++ b/Open-ILS/src/perlmods/Makefile.am
@@ -31,8 +31,8 @@ install: build-perl
build-perl: lib/OpenILS/Utils/Cronscript.pm
perl Build.PL --destdir $(DESTDIR) || make -s build-perl-fail
-lib/OpenILS/Utils/Cronscript.pm: lib/OpenILS/Utils/Cronscript.pm.in
- $(do_subst) "$<" > "$@"
+lib/OpenILS/Utils/Cronscript.pm: Makefile lib/OpenILS/Utils/Cronscript.pm.in
+ $(do_subst) lib/OpenILS/Utils/Cronscript.pm.in > "$@"
build-perl-fail:
echo
commit c2cd2567032c5d43c47c4f9eeb36566cc23c0615
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Mar 22 11:09:44 2012 -0400
Move towards build-time configuration of variables
We moved a lot of variable configuration into AC_CONFIG_FILES in
autoconf for the sake of convenience, but that turned out to be
problematic, as James Fournie noted in LP 960552, as the warning in
http://www.gnu.org/software/automake/manual/html_node/Scripts.html
notes: "building scripts this way has one drawback: directory variables
such as $(datadir) are not fully expanded and may refer to other
directory variables".
This was particularly a problem for variables such as @sysconfdir@ in
code that doesn't understand shell syntax - such as Cronscript.pm.
This commit moves towards build-time configuration of those variables.
We still use *.in files, but mark the built versions as dependencies in
build recipes such that we can build and test within the source
directory without having to install the files. We also gain the
advantage of teaching "make clean" to clean up the built versions of the
files.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 9eeb330..4a4d9ac 100644
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -132,14 +132,41 @@ if BUILDEGJAVA
OILSJAVA_DIR = java
endif
-bin_SCRIPTS = $(core_scripts) $(reporter_scripts) $(installautojs) @srcdir@/extras/eg_config @srcdir@/extras/fast-extract @srcdir@/extras/import/marc2are.pl @srcdir@/extras/import/marc2bre.pl @srcdir@/extras/import/marc2sre.pl @srcdir@/extras/import/parallel_pg_loader.pl $(supportscr)/marc_export
+gen_scripts = \
+ @srcdir@/extras/fast-extract \
+ @srcdir@/extras/import/marc2are.pl \
+ @srcdir@/extras/import/marc2bre.pl \
+ @srcdir@/extras/import/marc2sre.pl \
+ @srcdir@/extras/import/parallel_pg_loader.pl \
+ $(supportscr)/authority_control_fields.pl \
+ $(supportscr)/marc_export
+
+bin_SCRIPTS = $(core_scripts) $(gen_scripts) $(reporter_scripts) $(installautojs)
+
+CLEANFILES = $(gen_scripts)
+
data_DATA = $(core_data) $(reporter_data)
# Take care of which subdirectories to build, and which extra files to include in a distribution.
SUBDIRS = $(OILSCORE_DIRS) $(OILSWEB_DIR) $(OILSPYTHON_DIR) $(OILSJAVA_DIR)
-EXTRA_DIST = @srcdir@/perlmods @srcdir@/templates @top_srcdir@/Open-ILS/xsl @srcdir@/cgi-bin
+EXTRA_DIST = @srcdir@/perlmods \
+ @srcdir@/templates \
+ @top_srcdir@/Open-ILS/xsl \
+ @srcdir@/cgi-bin \
+ $(gen_scripts) \
+ @srcdir@/extras/eg_config
+
+do_subst = $(SED) \
+ -e 's,[@]bindir[@],$(bindir),g' \
+ -e 's,[@]datarootdir[@],$(datarootdir),g' \
+ -e 's,[@]docdir[@],$(docdir),g' \
+ -e 's,[@]exec_prefix[@],$(exec_prefix),g' \
+ -e 's,[@]includedir[@],$(includedir),g' \
+ -e 's,[@]libdir[@],$(libdir),g' \
+ -e 's,[@]prefix[@],$(prefix),g' \
+ -e 's,[@]sysconfdir[@],$(sysconfdir),g'
# Install header files
@@ -156,6 +183,33 @@ uninstall-hook:
rm -R $(XSLDIR)
rm -R $(CGIDIR)
+ at srcdir@/extras/fast-extract: @srcdir@/extras/fast-extract.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
+
+ at srcdir@/extras/import/marc2are.pl: @srcdir@/extras/import/marc2are.pl.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
+
+ at srcdir@/extras/import/marc2bre.pl: @srcdir@/extras/import/marc2bre.pl.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
+
+ at srcdir@/extras/import/marc2sre.pl: @srcdir@/extras/import/marc2sre.pl.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
+
+ at srcdir@/extras/import/parallel_pg_loader.pl: @srcdir@/extras/import/parallel_pg_loader.pl.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
+
+$(supportscr)/authority_control_fields.pl: $(supportscr)/authority_control_fields.pl.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
+
+$(supportscr)/marc_export: $(supportscr)/marc_export.in
+ $(do_subst) "$<" > "$@"
+ chmod 755 "$@"
#perl-install and string-templates-install
ilscore-install:
diff --git a/Open-ILS/src/perlmods/Makefile.am b/Open-ILS/src/perlmods/Makefile.am
index 4f49264..64f350d 100644
--- a/Open-ILS/src/perlmods/Makefile.am
+++ b/Open-ILS/src/perlmods/Makefile.am
@@ -11,9 +11,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-CLEANFILES = Build
+bin_SCRIPTS = Build lib/OpenILS/Utils/Cronscript.pm
+
+CLEANFILES = $(bin_SCRIPTS)
+
DISTCLEANFILES = Makefile.in Makefile
+do_subst = $(SED) -e 's,[@]sysconfdir@,$(sysconfdir),g'
+
all: build-perl
./Build || make -s build-perl-fail
@@ -23,9 +28,12 @@ check: build-perl
install: build-perl
./Build install
-build-perl:
+build-perl: lib/OpenILS/Utils/Cronscript.pm
perl Build.PL --destdir $(DESTDIR) || make -s build-perl-fail
+lib/OpenILS/Utils/Cronscript.pm: lib/OpenILS/Utils/Cronscript.pm.in
+ $(do_subst) "$<" > "$@"
+
build-perl-fail:
echo
echo ">>> Build/test of Perl modules has failed. The most likely"
diff --git a/configure.ac b/configure.ac
index dd0b098..1d99e19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -369,28 +369,14 @@ fi
AC_CONFIG_FILES([Makefile
Open-ILS/src/Makefile
+ Open-ILS/src/perlmods/Makefile
Open-ILS/web/Makefile
Open-ILS/updates/Makefile
Open-ILS/xul/staff_client/Makefile
Open-ILS/src/extras/eg_config
- Open-ILS/src/extras/fast-extract
- Open-ILS/src/extras/import/marc2are.pl
- Open-ILS/src/extras/import/marc2bre.pl
- Open-ILS/src/extras/import/marc2sre.pl
- Open-ILS/src/extras/import/parallel_pg_loader.pl
- Open-ILS/src/support-scripts/authority_control_fields.pl
- Open-ILS/src/support-scripts/marc_export
- Open-ILS/src/perlmods/Makefile
- Open-ILS/src/perlmods/lib/OpenILS/Utils/Cronscript.pm],
+ ],
[
if test -e "./Open-ILS/src/extras/eg_config"; then chmod 755 Open-ILS/src/extras/eg_config; fi;
- if test -e "./Open-ILS/src/extras/fast-extract"; then chmod 755 Open-ILS/src/extras/fast-extract; fi;
- if test -e "./Open-ILS/src/extras/import/marc2are.pl"; then chmod 755 Open-ILS/src/extras/import/marc2are.pl; fi;
- if test -e "./Open-ILS/src/extras/import/marc2bre.pl"; then chmod 755 Open-ILS/src/extras/import/marc2bre.pl; fi;
- if test -e "./Open-ILS/src/extras/import/marc2sre.pl"; then chmod 755 Open-ILS/src/extras/import/marc2sre.pl; fi;
- if test -e "./Open-ILS/src/extras/import/parallel_pg_loader.pl"; then chmod 755 Open-ILS/src/extras/import/parallel_pg_loader.pl; fi;
- if test -e "./Open-ILS/src/support-scripts/authority_control_fields.pl"; then chmod 755 Open-ILS/src/support-scripts/authority_control_fields.pl; fi;
- if test -e "./Open-ILS/src/support-scripts/marc_export"; then chmod 755 Open-ILS/src/support-scripts/marc_export; fi;
])
AC_OUTPUT
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/Makefile.am | 58 +++++++++++++++++++++++++++++++++++-
Open-ILS/src/perlmods/Makefile.am | 12 ++++++-
configure.ac | 18 +----------
3 files changed, 68 insertions(+), 20 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list