Mercurial > hg > release > icedtea-web-1.2
changeset 321:64979652c3b7
Added check for xsltproc tool
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Thu, 05 Jan 2012 17:33:06 +0100 |
| parents | 95dee11ecb8a |
| children | 0e524d940827 |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Dec 22 16:15:54 2011 -0500 +++ b/ChangeLog Thu Jan 05 17:33:06 2012 +0100 @@ -1,3 +1,10 @@ +2011-12-15 Jiri Vanek <jvanek@redhat.com> + + * configure.ac: added search for xsltproc program and setting + WITH_XSLTPROC variable + * Makefile.am: xsltproc result is no longer ignored, command + itself is in conditional block + 2011-12-22 Thomas Meyer <thomas@m3y3r.de> * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use
--- a/Makefile.am Thu Dec 22 16:15:54 2011 -0500 +++ b/Makefile.am Thu Jan 05 17:33:06 2012 +0100 @@ -564,7 +564,9 @@ > stdout.log 2> stderr.log ; \ cat stdout.log ; \ cat stderr.log >&2 - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html +if WITH_XSLTPROC + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html +endif touch $@ netx-unit-tests-source-files.txt: @@ -609,8 +611,10 @@ $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ > stdout.log 2> stderr.log ; \ cat stdout.log ; \ - cat stderr.log >&2 ; - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html + cat stderr.log >&2 +if WITH_XSLTPROC + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html +endif touch $@ #warning, during this target tests.build/netx/unit/tests-output.xml is backup and rewriten (but not coresponding html file)
--- a/configure.ac Thu Dec 22 16:15:54 2011 -0500 +++ b/configure.ac Thu Jan 05 17:33:06 2012 +0100 @@ -87,6 +87,8 @@ # Find optional depedencies # +AC_CHECK_PROGS([XSLTPROC],[xsltproc],[], []) +AM_CONDITIONAL([WITH_XSLTPROC], [test x"$XSLTPROC" != x ]) IT_FIND_OPTIONAL_JAR([rhino], RHINO, [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar]) IT_FIND_OPTIONAL_JAR([junit], JUNIT,