[RFC][icedtea-web] made xsltproc to be checked mandatory tool, instead of ignore its failure

Deepak Bhole dbhole at redhat.com
Mon Dec 19 08:47:25 PST 2011


* Jiri Vanek <jvanek at redhat.com> [2011-12-15 11:02]:
> 2011-12-15  Jiri Vanek  <jvanek at redhat.com>
> 
> 	* configure.ac: added search for xsltproc program and setting
> 	WITH_CSLTPROC variable
> 	* makefile.am: xsltproc result is no longer ignored, command
> 	itself is in conditional block
> 
> cc? :)
> 
> 

Missing a changelog entry. After adding, OK for HEAD.

Cheers,
Deepak

> Best regards,
>   J

> diff -r fb5e54f2b97e Makefile.am
> --- a/Makefile.am	Thu Dec 08 16:01:06 2011 -0500
> +++ b/Makefile.am	Thu Dec 15 16:45:38 2011 +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)
> diff -r fb5e54f2b97e configure.ac
> --- a/configure.ac	Thu Dec 08 16:01:06 2011 -0500
> +++ b/configure.ac	Thu Dec 15 16:45:38 2011 +0100
> @@ -86,6 +86,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,




More information about the distro-pkg-dev mailing list