/hg/icedtea-web: Allow icedtea-web to run with just a JRE

[Jiri Vanek]

Well, I have disagree with this but as explanation was nearly clear then np here :(

J.

On 08/23/2011 04:57 PM, omajid at icedtea.classpath.org wrote:
> changeset 334a44162495 in /hg/icedtea-web
> details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=334a44162495
> author: Omair Majid<omajid at redhat.com>
> date: Tue Aug 23 10:57:14 2011 -0400
>
> 	Allow icedtea-web to run with just a JRE
>
> 	2011-08-23 Omair Majid<omajid at redhat.com>
>
> 	* Makefile.am: Remove JRE. Replace uses with SYSTEM_JRE_DIR
> 	instead. Also replace uses of SYSTEM_JDK_DIR/jre with
> 	SYSTEM_JRE_DIR.
> 	       * acinclude.m4 (IT_CHECK_FOR_JRE): New macro.
> 	(IT_FIND_JAVA): Require IT_CHECK_FOR_JRE. Use java binary from
> 	within the JRE.
>
>
> diffstat:
>
>   ChangeLog    |   9 +++++++++
>   Makefile.am  |  13 ++++++-------
>   acinclude.m4 |  29 ++++++++++++++++++++++++++++-
>   3 files changed, 43 insertions(+), 8 deletions(-)
>
> diffs (116 lines):
>
> diff -r bd59947fa857 -r 334a44162495 ChangeLog
> --- a/ChangeLog	Mon Aug 22 15:09:47 2011 -0400
> +++ b/ChangeLog	Tue Aug 23 10:57:14 2011 -0400
> @@ -1,3 +1,12 @@
> +2011-08-23  Omair Majid<omajid at redhat.com>
> +
> +	* Makefile.am: Remove JRE. Replace uses with SYSTEM_JRE_DIR instead. Also
> +	replace uses of SYSTEM_JDK_DIR/jre with SYSTEM_JRE_DIR.
> +	* acinclude.m4
> +	(IT_CHECK_FOR_JRE): New macro.
> +	(IT_FIND_JAVA): Require IT_CHECK_FOR_JRE. Use java binary from within the
> +	JRE.
> +
>   2011-08-22  Saad Mohammad<smohammad at redhat.com>
>   	* netx/net/sourceforge/jnlp/JNLPFile.java:
>   	(parse): After the file has been parsed, it calls
> diff -r bd59947fa857 -r 334a44162495 Makefile.am
> --- a/Makefile.am	Mon Aug 22 15:09:47 2011 -0400
> +++ b/Makefile.am	Tue Aug 23 10:57:14 2011 -0400
> @@ -51,7 +51,6 @@
>   #    IllegalAccessException
>   #  - we want full privileges
>   #
> -JRE='"$(SYSTEM_JDK_DIR)/jre"'
>   LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
>   PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
>
> @@ -128,7 +127,7 @@
>     -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \
>     -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \
>     -e 's|[@]JAVA[@]|$(JAVA)|g' \
> -  -e 's|[@]JRE[@]|$(JRE)|g'
> +  -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g'
>
>   # Top-Level Targets
>   # =================
> @@ -216,7 +215,7 @@
>   	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
>   	  -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
>   	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
> -	  -DICEDTEA_WEB_JRE=$(JRE) \
> +	  -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
>   	  -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
>   	  $(GLIB_CFLAGS) \
>   	  $(GTK_CFLAGS) \
> @@ -636,13 +635,13 @@
>   	ln -sf $(abs_top_builddir)/javac $(BOOT_DIR)/bin/javac
>   	ln -sf $(JAVADOC) $(BOOT_DIR)/bin/javadoc
>   	mkdir -p $(BOOT_DIR)/jre/lib&&  \
> -	ln -s $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(BOOT_DIR)/jre/lib&&  \
> -	if [ -e $(SYSTEM_JDK_DIR)/jre/lib/jsse.jar ] ; then \
> -	  ln -s $(SYSTEM_JDK_DIR)/jre/lib/jsse.jar $(BOOT_DIR)/jre/lib ; \
> +	ln -s $(SYSTEM_JRE_DIR)/lib/rt.jar $(BOOT_DIR)/jre/lib&&  \
> +	if [ -e $(SYSTEM_JRE_DIR)/lib/jsse.jar ] ; then \
> +	  ln -s $(SYSTEM_JRE_DIR)/lib/jsse.jar $(BOOT_DIR)/jre/lib ; \
>   	else \
>   	  ln -s rt.jar $(BOOT_DIR)/jre/lib/jsse.jar ; \
>   	fi
> -	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
> +	ln -sf $(SYSTEM_JRE_DIR)/lib/$(JRE_ARCH_DIR) \
>   	  $(BOOT_DIR)/jre/lib/&&  \
>   	if ! test -d $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
>   	  then \
> diff -r bd59947fa857 -r 334a44162495 acinclude.m4
> --- a/acinclude.m4	Mon Aug 22 15:09:47 2011 -0400
> +++ b/acinclude.m4	Tue Aug 23 10:57:14 2011 -0400
> @@ -64,6 +64,32 @@
>     AC_SUBST(SYSTEM_JDK_DIR)
>   ])
>
> +AC_DEFUN_ONCE([IT_CHECK_FOR_JRE],
> +[
> +  AC_REQUIRE([IT_CHECK_FOR_JDK])
> +  AC_MSG_CHECKING([for a JRE home directory])
> +  AC_ARG_WITH([jre-home],
> +             [AS_HELP_STRING([--with-jre-home],
> +                              [jre home directory \
> +                               (default is the JRE under the JDK)])],
> +             [
> +               SYSTEM_JRE_DIR=${withval}
> +             ],
> +             [
> +               SYSTEM_JRE_DIR=
> +             ])
> +  if test -z "${SYSTEM_JRE_DIR}" ; then
> +    if test -d "${SYSTEM_JDK_DIR}/jre" ; then
> +      SYSTEM_JRE_DIR="${SYSTEM_JDK_DIR}/jre"
> +    fi
> +  fi
> +  AC_MSG_RESULT(${SYSTEM_JRE_DIR})
> +  if ! test -d "${SYSTEM_JRE_DIR}"; then
> +    AC_MSG_ERROR("A JRE home directory could not be found.")
> +  fi
> +  AC_SUBST(SYSTEM_JRE_DIR)
> +])
> +
>   AC_DEFUN_ONCE([FIND_JAVAC],
>   [
>     AC_REQUIRE([IT_CHECK_FOR_JDK])
> @@ -592,6 +618,7 @@
>
>   AC_DEFUN_ONCE([IT_FIND_JAVA],
>   [
> +  AC_REQUIRE([IT_CHECK_FOR_JRE])
>     AC_MSG_CHECKING([for a Java virtual machine])
>     AC_ARG_WITH([java],
>                 [AS_HELP_STRING(--with-java,specify location of the 1.5 java vm)],
> @@ -599,7 +626,7 @@
>       JAVA="${withval}"
>     ],
>     [
> -    JAVA=${SYSTEM_JDK_DIR}/bin/java
> +    JAVA="${SYSTEM_JRE_DIR}/bin/java"
>     ])
>     if ! test -f "${JAVA}"; then
>       AC_PATH_PROG(JAVA, "${JAVA}")