[icedtea-web] RFE: Fix for broken JRE dir install
Dr Andrew John Hughes
ahughes at redhat.com
Thu Jan 20 17:32:28 PST 2011
On 20:10 Thu 20 Jan , Deepak Bhole wrote:
> * Dr Andrew John Hughes <ahughes at redhat.com> [2011-01-20 19:46]:
snip...
> >
> > I don't follow. If the user specifies --prefix=/usr, your patch will be looking
> > in completely the wrong place. You shouldn't let the user specify the install
> > directory and then just completely ignore it and assume something else.
> >
> > I gather that /usr installation is broken in the code at present too,
> > but I don't see why we want to create even more breakage.
> >
>
> Fair enough. However in it's current incarnation, the JDK is relocatable
> just by copying the tree. Until we can support /usr installation, we
> need to install in the JDK tree, and while we are installation there, I
> would like icedtea-web to not be the reason why relocatability is
> broken...
>
Ok, I approve reverting to java.home and the rest of this patch, bar
the copying changes, on the 1.0 branch only. It needs fixing properly
on the main tree and should not be reverted there. 1.1 should support
installing anywhere.
> Cheers,
> Deepak
>
> > > > * Typo: whether not weather.
> > > >
> > >
> > > Doh! Thanks.
> > >
> > > Cheers,
> > > Deepak
> > >
> > > > > diff -r 06940cdcfef8 Makefile.am
> > > > > --- a/Makefile.am Thu Jan 20 11:06:41 2011 -0500
> > > > > +++ b/Makefile.am Thu Jan 20 18:47:48 2011 -0500
> > > > > @@ -103,37 +103,37 @@
> > > > > clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs
> > > > >
> > > > > install-exec-local:
> > > > > - ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)
> > > > > + ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)
> > > > > if ENABLE_PLUGIN
> > > > > - ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)/
> > > > > + ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)/
> > > > > ${INSTALL_PROGRAM} $(PLUGIN_DIR)/launcher/pluginappletviewer $(DESTDIR)$(bindir)
> > > > > - ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/plugin.jar
> > > > > + ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/plugin.jar
> > > > > endif
> > > > > - ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/netx.jar
> > > > > + ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/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 \
> > > > > + if [ -e $(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 ; \
> > > > > + cp -a $(DESTDIR)$(bindir)/javaws $(DESTDIR)$(prefix)/jre/bin ; \
> > > > > fi ; \
> > > > > fi
> > > > > - ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
> > > > > + ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/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 \
> > > > > + if [ -e $(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 ; \
> > > > > + cp -a $(DESTDIR)$(bindir)/itweb-settings $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/bin ; \
> > > > > fi ; \
> > > > > fi
> > > > >
> > > > > install-data-local:
> > > > > ${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
> > > > > ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(prefix)/man/man1
> > > > > - ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)/jre/lib
> > > > > + ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
> > > > > if ENABLE_DOCS
> > > > > ${mkinstalldirs} $(DESTDIR)$(htmldir)
> > > > > (cd ${abs_top_builddir}/docs/netx; \
> > > > > @@ -151,23 +151,25 @@
> > > > > endif
> > > > >
> > > > > uninstall-local:
> > > > > - rm -f $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
> > > > > - rm -f $(DESTDIR)$(prefix)/jre/lib/plugin.jar
> > > > > - rm -f $(DESTDIR)$(prefix)/jre/lib/netx.jar
> > > > > - rm -f $(DESTDIR)$(prefix)/jre/lib/about.jnlp
> > > > > - rm -f $(DESTDIR)$(prefix)/jre/lib/about.jar
> > > > > + rm -f $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so
> > > > > + rm -f $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/plugin.jar
> > > > > + rm -f $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/netx.jar
> > > > > + rm -f $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/about.jnlp
> > > > > + rm -f $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/about.jar
> > > > > 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)
> > > > > + rm -rf $(DESTDIR)$(htmldir)/*
> > > > > + if [ -d $(DESTDIR)$(htmldir) ] ; then \
> > > > > + rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(htmldir) ; \
> > > > > + fi
> > > > >
> > > > > # Plugin
> > > > >
> > > > > @@ -350,7 +352,7 @@
> > > > > $(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", }' \
> > > > > + -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot", }' \
> > > > > -DPROGNAME='"javaws"' -c -o $@ $<
> > > > >
> > > > > $(NETX_DIR)/launcher/controlpanel/%.o: $(LAUNCHER_SRCDIR)/%.c
> > > > > diff -r 06940cdcfef8 configure.ac
> > > > > --- a/configure.ac Thu Jan 20 11:06:41 2011 -0500
> > > > > +++ b/configure.ac Thu Jan 20 18:47:48 2011 -0500
> > > > > @@ -80,4 +80,12 @@
> > > > > IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
> > > > > IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
> > > > >
> > > > > +# Set JRE prefix based on weather to-level prefix is a JDK dir or a JRE dir
> > > > > +if test -d ${prefix}/jre ; then
> > > > > + JRE_DIR_PREFIX="/jre" ;
> > > > > +else
> > > > > + JRE_DIR_PREFIX="" ;
> > > > > +fi ;
> > > > > +AC_SUBST([JRE_DIR_PREFIX])
> > > > > +
> > > > > AC_OUTPUT
> > > > > diff -r 06940cdcfef8 netx/net/sourceforge/jnlp/Launcher.java
> > > > > --- a/netx/net/sourceforge/jnlp/Launcher.java Thu Jan 20 11:06:41 2011 -0500
> > > > > +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Jan 20 18:47:48 2011 -0500
> > > > > @@ -327,7 +327,12 @@
> > > > > List<String> commands = new LinkedList<String>();
> > > > >
> > > > > // this property is set by the javaws launcher to point to the javaws binary
> > > > > - String pathToWebstartBinary = System.getProperty("java.icedtea-web.bin");
> > > > > + String pathToWebstartBinary = System.getProperty("java.home") +
> > > > > + File.separatorChar +
> > > > > + "bin" +
> > > > > + File.separatorChar +
> > > > > + "javaws";
> > > > > +
> > > > > commands.add(pathToWebstartBinary);
> > > > > // use -Jargument format to pass arguments to the JVM through the launcher
> > > > > for (String arg : vmArgs) {
> > > >
> > > >
> > > > --
> > > > 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: 94EFD9D8 (http://subkeys.pgp.net)
> > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
> >
> > --
> > 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: 94EFD9D8 (http://subkeys.pgp.net)
> > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
--
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: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list