[icedtea-web] RFC: add javaws and itweb-settings to jre/bin as well
Dr Andrew John Hughes
ahughes at redhat.com
Tue Dec 14 15:38:49 PST 2010
On 12:32 Tue 14 Dec , Omair Majid wrote:
> On 12/14/2010 10:39 AM, Dr Andrew John Hughes wrote:
> >>>> One thing that I did notice is that 'make install' will install over
> >>>> existing files but adding ln -s makes this fail. Should I guard ln -s
> >>>> with a check to ensure that the symlink does not exist? Should I rm the
> >>>> symlink location first? Or is there a better thing to do in such cases?
> >>>>
> >>>
> >>> Do we actually need them? Could we not just fix javaws to use $(bindir)?
> >>> I'm not keen on having this non-standard directory (as regards the normal
> >>> /usr layout, not the JDK).
> >>>
> >>
> >> My concern is more towards what users expect. If users expect a javaws
> >> binary under JDK_HOME/jre/bin/ as well as JDK_HOME/bin, then not having
> >> it might cause issues.
> >>
> >> As for fixing javaws, can I hardcode JDK_HOME/bin/javaws for now, or
> >> should I make it use $(bindir) from configure?
> >>
> >
> > It should use $(bindir). It's perfectly possible someone could install in /usr
> > and /usr/jre/bin is going to look quite odd. As such, I'd suggest only creating
> > the symlinks if $(prefix)/jre/bin exists.
> >
>
> Does the attached patch look ok? It only creates or removes links if
> jre/bin exists. The javaws launcher now sets a system propert
> java.javaws.bindir which is set to the bindir where javaws is installed.
> Netx then does System.getProperty("java.javaws.bindir") + "/javaws" to
> build the path to itself.
>
> The launcher already sets the property "application.home" to point to
> the bindir , but it uses some logic that seems inappropriate for the
> general case - it chops off strings like bin/ from the end of the
> executable path :/
>
Generally looks good. I'd move the JAVA_ARGS definition to a new line
to make it easier to read. It also may be worth using the more general
java.icedtea-web.bindir or java.itw.bindir as the property as it's not
specific to javaws.
Ok to commit with the JAVA_ARGS change. Your choice on the property.
> I dont see why/how anyone would install into a prefix that does not
> already contain a JDK. I tried out installing to a prefix without an
> existing /jre/ (i.e. installing to anything other than a jdk) and it
> makes javaws fail on start up. Currently the error is :
> ./javaws: error while loading shared libraries: libjli.so: cannot open
> shared object file: No such file or directory
> But I suppose that even if libjli was found, it would fail complaining
> that it cannot find a VM.
>
My other patch (for IcedTea7) removes the libjli dependency FWIW.
I'm not sure how much of a problem this is. When producing a VisualVM RPM
for Fedora, there was an issue with installing to the JRE tree and it ended
up being moved to /usr. So this consideration is preattempting that happening
again.
Can someone with more packaging experience please comment on this? Is
the jdk location a usable prefix for package installation?
> >>> If we really really do, then they need to be created with a guard as you suggest.
> >>> I can't see an install option for links.
> >>>
> >>
> >> What if the links exist but could be invalid? I would rather do
> >> something like
> >> rm -f old_link
> >> ln -s new_bin new_link
> >> Does that look ok?
> >>
> >
> > You also check that old_link is a link and not a regular file. test -L.
> >
> > So something like:
> >
> > if [ -e $(prefix)/jre/bin ] ; then
> > if [ -L $(prefix)/jre/bin/javaws ] ; then
> > rm -f $(prefix)/jre/bin/javaws ;
> > fi
> > if [ ! -e $(prefix)/jre/bin/javaws ] ; then
> > ln -s $(bindir)/javaws $(prefix)/jre/bin ;
> > fi ;
> > fi
> >
> > and similar cases for the others.
> >
>
> Thanks for the snippet!
>
> >> Right, but again this may cause issues if users expect 'jcontrol' to
> >> work. That said, I personally have no problems with this.
> >>
> >
> > I think it will be more confusing, to be honest, to have a different tool with the
> > same name. I know we have 'javaws' but doing it with the control panel too seems
> > to go a bit far.
> >
>
> Alright. I dont expect any problems either - we didnt have it at all
> before and we didnt get any complaints then.
>
> Cheers,
> Omair
> diff -r adef5d4159ee Makefile.am
> --- a/Makefile.am Mon Dec 13 17:28:01 2010 -0500
> +++ b/Makefile.am Tue Dec 14 12:00:21 2010 -0500
> @@ -107,12 +107,28 @@
> if ENABLE_PLUGIN
> ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)/
> ${INSTALL_PROGRAM} $(PLUGIN_DIR)/launcher/pluginappletviewer $(DESTDIR)$(bindir)
> - ${INSTALL_PROGRAM} $(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/lib/plugin.jar
> endif
> ${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 ; \
> + 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 ; \
> + fi
>
> install-data-local:
> ${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
> @@ -143,7 +159,14 @@
> 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 \
> + 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 \
> + rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
> + fi
> rm -rf $(DESTDIR)$(htmldir)
>
> # Plugin
> @@ -326,7 +349,7 @@
>
> $(NETX_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
> mkdir -p $(NETX_DIR)/launcher && \
> - $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot", }' -DPROGNAME='"javaws"' \
> + $(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "-J-Djava.javaws.bindir=$(DESTDIR)$(bindir)", "net.sourceforge.jnlp.runtime.Boot", }' -DPROGNAME='"javaws"' \
> -c -o $@ $<
>
> $(NETX_DIR)/launcher/controlpanel/%.o: $(LAUNCHER_SRCDIR)/%.c
> diff -r adef5d4159ee netx/net/sourceforge/jnlp/Launcher.java
> --- a/netx/net/sourceforge/jnlp/Launcher.java Mon Dec 13 17:28:01 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/Launcher.java Tue Dec 14 12:00:21 2010 -0500
> @@ -329,9 +329,7 @@
>
> List<String> commands = new LinkedList<String>();
>
> - String pathToWebstartBinary = System.getProperty("java.home") +
> - File.separatorChar +
> - "bin" +
> + String pathToWebstartBinary = System.getProperty("java.javaws.bindir") +
> File.separatorChar +
> "javaws";
> commands.add(pathToWebstartBinary);
--
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