[icedtea-web] RFC: add a new autoconf macro IT_FIND_OPTIONAL_JAR
Dr Andrew John Hughes
ahughes at redhat.com
Tue Mar 8 13:05:06 PST 2011
On 13:30 Tue 08 Mar , Omair Majid wrote:
> On 03/08/2011 12:33 PM, Dr Andrew John Hughes wrote:
> > On 10:44 Tue 08 Mar , Omair Majid wrote:
> >> Hi,
> >>
> >> The attached patch adds a new autoconf macro IT_FIND_OPTIONAL_JAR. This
> >> macro can be used to find jars that enable optional features in
> >> icedtea-web. I will be removing IT_FIND_RHINO_JAR in a separate patch.
> >>
> >> I will be using this to add support for junit.jar (for running unit
> >> tests) as well as tagsoup.jar (for parsing malformed jnlp file).
> >>
> >> Any thoughts or comments?
> >>
> >> ChangeLog:
> >>
> >> 2011-03-08 Omair Majid<omajid at redhat.com>
> >>
> >> * acinclude.m4 (IT_FIND_OPTIONAL_JAR): New macro.
> >> * configure.ac: Do not call IT_FIND_RHINO. Use IT_FIND_OPTIONAL_JAR
> >> instead.
> >>
> >> Cheers,
> >> Omair
> >
> > Good idea. I assume this is based on IT_FIND_RHINO. Comments inline.
> >
>
> Updated patch attached.
>
> Yes, this is based on IT_FIND_RHINO. I made slight tweaks to it though.
> IT_FIND_RHINO isnt really happy when you say --with-rhino and rhino is
> not found (it works properly though if you say --with-rhino=no and rhino
> is not found)
>
'not happy' in what way? If there's a bug in IcedTea6's macro, it needs fixing.
If this macro does the job, then it can replace the one in IcedTea6/7 as well.
> >> diff -r 07924a054c63 acinclude.m4
> >> --- a/acinclude.m4 Mon Mar 07 17:09:22 2011 -0500
> >> +++ b/acinclude.m4 Tue Mar 08 10:38:44 2011 -0500
> >> @@ -250,6 +250,72 @@
> >> AC_SUBST(ECJ_JAR)
> >> ])
> >>
> >> +#
> >> +# IT_FIND_OPTIONAL_JAR
> >> +# --------------------
> >> +# Find an optional jar required for building and running
> >> +#
> >> +# $1 : jar/feature name
> >> +# $2 : used to set $2_JAR and WITH_$2
> >> +# $3 (optional) : used to specify extra file paths for searching
> >> +#
> >> +# Sets $2_JAR to the jar location (or blank if not found)
> >> +# Defines WITH_$2 if jar is found
> >> +#
> >> +AC_DEFUN([IT_FIND_OPTIONAL_JAR],
> >> +[
> >> + AC_MSG_CHECKING([for $1 jar])
> >> + AC_ARG_WITH([$1],
> >> + [AS_HELP_STRING(--with-$1,specify location of the $1 jar)],
> >> + [
> >> + case "${withval}" in
> >> + yes)
> >> + $2_JAR=yes
> >> + ;;
> >> + no)
> >> + $2_JAR=no
> >> + ;;
> >> + *)
> >> + if test -f "${withval}"; then
> >> + $2_JAR="${withval}"
> >> + elif test -z "${withval}"; then
> >> + $2_JAR=yes
> >> + else
> >> + AC_MSG_RESULT([not found])
> >> + AC_MSG_ERROR("The $1 jar ${withval} was not found.")
> >> + fi
> >> + ;;
> >> + esac
> >> + ],
> >> + [
> >> + $2_JAR=yes
> >> + ])
> >> + it_extra_paths_$1="$3"
> >> + if test "x${$2_JAR}" = "xyes"; then
> >> + for path in ${it_extra_paths_$1}; do
> >> + if test -f ${path}; then
> >> + $2_JAR=${path}
> >> + break;
> >> + fi
> >> + done
> >> + if test x"${$2_JAR}" = "xyes"; then
> >> + if test -f "/usr/share/java/$1.jar"; then
> >> + $2_JAR=/usr/share/java/$1.jar
> >> + fi
> >> + if test x"${$2_JAR}" = "xyes"; then
> >> + $2_JAR=no
> >> + fi
> >> + fi
> >> + fi
> >> + AC_MSG_RESULT(${$2_JAR})
> >> + AM_CONDITIONAL(WITH_$2, test x"${$2_JAR}" != "xno")
> >> +dnl Clear RHINO_JAR if it doesn't contain a valid filename
> >
> > Comment needs fixing to say $2_JAR.
> >
>
> Whoops.
>
> >> + if test x"${$2_JAR}" = "xno"; then
> >> + $2_JAR=
> >> + fi
> >> + AC_SUBST($2_JAR)
> >> +])
> >> +
> >> AC_DEFUN([IT_FIND_RHINO_JAR],
> >> [
> >> AC_MSG_CHECKING([whether to include Javascript support via Rhino])
> >> diff -r 07924a054c63 configure.ac
> >> --- a/configure.ac Mon Mar 07 17:09:22 2011 -0500
> >> +++ b/configure.ac Tue Mar 08 10:38:44 2011 -0500
> >> @@ -33,7 +33,6 @@
> >> FIND_JAR
> >> FIND_ECJ_JAR
> >> IT_FIND_JAVADOC
> >> -IT_FIND_RHINO_JAR
> >> AC_CONFIG_FILES([javac], [chmod +x javac])
> >>
> >> IT_SET_VERSION
> >> @@ -50,6 +49,14 @@
> >> AC_SUBST(X11_CFLAGS)
> >> AC_SUBST(X11_LIBS)
> >>
> >> +IT_FIND_OPTIONAL_JAR([rhino], RHINO, [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar])
> >
> > Split this after 'RHINO,'.
> >
>
> Done. Not sure of the indentation; I have used 4 spaces. I have also
> moved the detection for optional jars to happen after the detection of
> required classes.
>
> >> +if test -n "${RHINO_JAR}" ; then
> >> + RHINO_AVAILABLE=true
> >> +else
> >> + RHINO_AVAILABLE=false
> >> +fi
> >> +AC_SUBST(RHINO_AVAILABLE)
> >> +
> >
> > Maybe a general version of this should also be in the macro.
> >
>
> Yes, if all optional jars will require entries in the build.properties
> file then they will need similar macros. Done.
>
> Okay to commit?
>
> Thanks,
> Omair
Looks fine now.
> diff -r 07924a054c63 acinclude.m4
> --- a/acinclude.m4 Mon Mar 07 17:09:22 2011 -0500
> +++ b/acinclude.m4 Tue Mar 08 13:24:54 2011 -0500
> @@ -250,6 +250,79 @@
> AC_SUBST(ECJ_JAR)
> ])
>
> +#
> +# IT_FIND_OPTIONAL_JAR
> +# --------------------
> +# Find an optional jar required for building and running
> +#
> +# $1 : jar/feature name
> +# $2 : used to set $2_JAR and WITH_$2
> +# $3 (optional) : used to specify additional file paths for searching
> +#
> +# Sets $2_JAR to the jar location (or blank if not found)
> +# Defines WITH_$2 if jar is found
> +# Sets $2_AVAILABLE to "true" if jar is found (or "false" if not)
> +#
> +AC_DEFUN([IT_FIND_OPTIONAL_JAR],
> +[
> + AC_MSG_CHECKING([for $1 jar])
> + AC_ARG_WITH([$1],
> + [AS_HELP_STRING(--with-$1,specify location of the $1 jar)],
> + [
> + case "${withval}" in
> + yes)
> + $2_JAR=yes
> + ;;
> + no)
> + $2_JAR=no
> + ;;
> + *)
> + if test -f "${withval}"; then
> + $2_JAR="${withval}"
> + elif test -z "${withval}"; then
> + $2_JAR=yes
> + else
> + AC_MSG_RESULT([not found])
> + AC_MSG_ERROR("The $1 jar ${withval} was not found.")
> + fi
> + ;;
> + esac
> + ],
> + [
> + $2_JAR=yes
> + ])
> + it_extra_paths_$1="$3"
> + if test "x${$2_JAR}" = "xyes"; then
> + for path in ${it_extra_paths_$1}; do
> + if test -f ${path}; then
> + $2_JAR=${path}
> + break
> + fi
> + done
> + fi
> + if test x"${$2_JAR}" = "xyes"; then
> + if test -f "/usr/share/java/$1.jar"; then
> + $2_JAR=/usr/share/java/$1.jar
> + fi
> + fi
> + if test x"${$2_JAR}" = "xyes"; then
> + $2_JAR=no
> + fi
> + AC_MSG_RESULT(${$2_JAR})
> + AM_CONDITIONAL(WITH_$2, test x"${$2_JAR}" != "xno")
> + # Clear $2_JAR if it doesn't contain a valid filename
> + if test x"${$2_JAR}" = "xno"; then
> + $2_JAR=
> + fi
> + if test -n "${$2_JAR}" ; then
> + $2_AVAILABLE=true
> + else
> + $2_AVAILABLE=false
> + fi
> + AC_SUBST($2_JAR)
> + AC_SUBST($2_AVAILABLE)
> +])
> +
> AC_DEFUN([IT_FIND_RHINO_JAR],
> [
> AC_MSG_CHECKING([whether to include Javascript support via Rhino])
> diff -r 07924a054c63 configure.ac
> --- a/configure.ac Mon Mar 07 17:09:22 2011 -0500
> +++ b/configure.ac Tue Mar 08 13:24:54 2011 -0500
> @@ -33,7 +33,6 @@
> FIND_JAR
> FIND_ECJ_JAR
> IT_FIND_JAVADOC
> -IT_FIND_RHINO_JAR
> AC_CONFIG_FILES([javac], [chmod +x javac])
>
> IT_SET_VERSION
> @@ -80,6 +79,13 @@
> IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
> IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
>
> +#
> +# Find optional depedencies
> +#
> +
> +IT_FIND_OPTIONAL_JAR([rhino], RHINO,
> + [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar])
> +
> AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])
> AC_CONFIG_FILES([build.properties])
>
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
More information about the distro-pkg-dev
mailing list