[icedtea-web] RFC: add binaries to jre/bin as well (was backport changeset 9397074c2c39 to icedtea-web 1.0)
Deepak Bhole
dbhole at redhat.com
Thu Jan 20 15:59:36 PST 2011
* Omair Majid <omajid at redhat.com> [2011-01-20 15:57]:
> On 01/20/2011 02:15 PM, Deepak Bhole wrote:
> >* Omair Majid<omajid at redhat.com> [2011-01-20 13:38]:
> >>On 01/20/2011 01:18 PM, Deepak Bhole wrote:
> >>>* Deepak Bhole<dbhole at redhat.com> [2011-01-20 12:59]:
> >>>>* Omair Majid<omajid at redhat.com> [2011-01-20 12:46]:
> >>>>>I would like to backport changeset 9397074c2c39 from icedtea-web
> >>>>>HEAD to icedtea-web 1.0.
> >>>>
> >>>>The binary in jre/bin should be the actual file, not the one in
> >>>>JAVA_HOME/bin. JAVA_HOME/bin is optional and installed as part of the
> >>>>JDK. However the JRE (and all the components therein) should be
> >>>>independently runnable.
> >>>>
> >>>
> >>>Something else just came to mind... the change to Launcher.java should
> >>>be reverted. The patches changes the code to use java.icedtea-web.bin
> >>>which is defined at build time. This makes the build un-relocatable.
> >>>java.home is the right property to use in this situation.
> >>>
> >>
> >>I didn't realize there were these issues with the patch, thanks for
> >>pointing them out.
> >>
> >> From what I understand, we want two (possibly different) binaries in
> >>two locations such that the two binaries dont depend on each other?
> >>Or can $JDK/bin/javaws assume that $JDK/jre/bin/javaws exists?
> >>
> >
> >Hmm, the JRE is a subset of the JDK (atleast in all RPM installations
> >I've seen). However it seems that files are always duplicated across
> >JAVA_HOME/bin and JAVA_HOME/jre/bin rather than linked. Perhaps this was
> >to maintain consistency with Windows (which doesn't have symlinks) but I
> >am unsure.
> >
> >Either way, perhaps we should maintain consistency and duplicate the
> >files as well.
> >
>
> Done. Please see the attached patch.
>
> >>Also, how does this address the issue where $(prefix) is not a JDK
> >>folder (as pointed out by Andrew Hughes while he was reviewing the
> >>original patch [1]).
> >>
> >
> >I think Andrew's suggestion is correct, that jre/bin/javaws should only
> >be installed if prefix/jre/bin exists.
> >
>
> Right. But he also talks about how $(prefix) may not be a JDK. In
> which case there is no $JAVA_HOME there. But then again, I have no
> clue how our launcher deals with that situation either.
>
> >Btw, we might have to build binaries for JAVA_HOME/jre/bin and for
> >JAVA_HOME/bin separately with different args as the binaries rely on
> >relative paths to find libjvm.so -- I haven't looked into it in detail,
> >but please keep that in mind when re-working the patch.
> >
>
> The attached patch hacks the launcher so it simply passes along
> argv[0] to Netx as the system property "java.icedtea-web.bin". Netx
> can then run itself by running the value of this system property.
>
> Can you please look over the patch to see if it makes sense?
>
I don't think it needs to be that complex (modifying the .c files and
all). Please see the patch I just posted in this thread:
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-January/011814.html
It is against HEAD and mitigates this issue. If approved, I can push it
into 1.0 after 9397074c2c39, otherwise I will post a subset thereof.
Cheers,
Deepak
> Cheers,
> Omair
> diff -r 06940cdcfef8 Makefile.am
> --- a/Makefile.am Thu Jan 20 11:06:41 2011 -0500
> +++ b/Makefile.am Thu Jan 20 15:45:48 2011 -0500
> @@ -112,22 +112,12 @@
> ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/netx.jar
> ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/javaws $(DESTDIR)$(bindir)
> if [ -d $(DESTDIR)$(prefix)/jre/bin ] ; then \
> - if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
> - rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
> - fi ; \
> - if [ ! -e $(prefix)/jre/bin/javaws ] ; then \
> - ln -s $(DESTDIR)$(bindir)/javaws $(DESTDIR)$(prefix)/jre/bin ; \
> - fi ; \
> + ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/javaws $(DESTDIR)$(prefix)/jre/bin ; \
> fi
> ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
> ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
> if [ -d $(DESTDIR)$(prefix)/jre/bin ] ; then \
> - if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
> - rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
> - fi ; \
> - if [ ! -e $(prefix)/jre/bin/itweb-settings ] ; then \
> - ln -s $(DESTDIR)$(bindir)/itweb-settings $(DESTDIR)$(prefix)/jre/bin ; \
> - fi ; \
> + ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(prefix)/jre/bin ; \
> fi
>
> install-data-local:
> @@ -159,12 +149,11 @@
> rm -f $(DESTDIR)$(prefix)/man/man1/javaws.1
> rm -f $(DESTDIR)$(bindir)/pluginappletviewer
> rm -f $(DESTDIR)$(bindir)/javaws
> - if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
> + if [ -e $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
> rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
> fi
> - rm -f $(DESTDIR)$(prefix)/jre/bin/javaws
> rm -f $(DESTDIR)$(bindir)/itweb-settings
> - if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
> + if [ -e $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
> rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
> fi
> rm -rf $(DESTDIR)$(htmldir)
> @@ -350,8 +339,8 @@
> $(NETX_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
> mkdir -p $(NETX_DIR)/launcher && \
> $(CC) $(LAUNCHER_FLAGS) \
> - -DJAVA_ARGS='{ "-J-ms8m", "-J-Djava.icedtea-web.bin=$(DESTDIR)$(bindir)/javaws", "net.sourceforge.jnlp.runtime.Boot", }' \
> - -DPROGNAME='"javaws"' -c -o $@ $<
> + -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot", }' \
> + -DPROGNAME='"javaws"' -DICEDTEA_WEB_BIN -c -o $@ $<
>
> $(NETX_DIR)/launcher/controlpanel/%.o: $(LAUNCHER_SRCDIR)/%.c
> mkdir -p $(NETX_DIR)/launcher/controlpanel && \
> diff -r 06940cdcfef8 launcher/java.c
> --- a/launcher/java.c Thu Jan 20 11:06:41 2011 -0500
> +++ b/launcher/java.c Thu Jan 20 15:45:48 2011 -0500
> @@ -288,6 +288,10 @@
> launchername = progname;
> #endif /* LAUNCHER_NAME */
>
> +#ifdef ICEDTEA_WEB_BIN
> + SetIcedTeaWebProp(argc, argv);
> +#endif
> +
> ++argv;
> --argc;
>
> @@ -1654,6 +1658,21 @@
> }
>
> /*
> + * IcedTea-Web Hack
> + *
> + * This method sets the value of the system property java.icedtea-web.bin to
> + * argv[0] of this process. This allows an icedtea-web app to exec itself by
> + * exec'ing the value of System.getProperty("java.icedtea-web.bin")
> + */
> +void SetIcedTeaWebProp(int argc, char** argv) {
> + char* property = "-Djava.icedtea-web.bin=";
> + char* s = JLI_MemAlloc(strlen(property) + strlen(argv[0]));
> + strcat(s,property);
> + strcat(s,argv[0]);
> + AddOption(s, NULL);
> +}
> +
> +/*
> * Prints the version information from the java.version and other properties.
> */
> static void
More information about the distro-pkg-dev
mailing list