[icedtea-web] RFC: add javaws and itweb-settings to jre/bin as well

[Dr Andrew John Hughes]

On 16:55 Mon 13 Dec     , Omair Majid wrote:
> Hi Andrew,
> 
> On 12/13/2010 04:23 PM, Dr Andrew John Hughes wrote:
> > On 15:55 Mon 13 Dec     , Omair Majid wrote:
> >> Hi,
> >>
> >> IcedTea-Web does not add either the javaws or itweb-settings binary to
> >> jre/bin. The attached patch addresses that by creating symlinks under
> >> jre/bin/ to the actual javaws and itweb-settings binaries.
> >>
> >
> > Until I read this, I wasn't even aware there was a jre/bin.  I looked
> > under bin, saw the files and wondered what you were on about.
> >
> > One problem I see is you are assuming jre/bin exists (i.e. that the
> > prefix being used is a jdk install).  This may not be the case.
> > You should probably only create these symlinks if jre/bin exists in
> > prefix.
> >
> 
> The attached patch first creates $(DESTDIR)$(prefix)/jre/bin before 
> creating the symlinks.
> 

Sorry, missed that.

> 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).

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.

> >
> > Are you sure these aren't hard links?
> > If not, maybe that would be the better option, though it assumes bin and
> > jre/bin are on the same disk.
> >
> 
> I dont think these are hardlinks. From a recent icedtea6 build, I see:
> 
> [omajid at localhost j2sdk-image]$ pwd
> /home/omajid/code/icedtea6-hacking/openjdk.build/j2sdk-image
> [omajid at localhost j2sdk-image]$ ./bin/java -version
> java version "1.6.0_20"
> OpenJDK Runtime Environment (IcedTea6 1.10pre+r6bc8c41e508f) (Fedora 
> build 1.6.0_20-b20)
> OpenJDK 64-Bit Server VM (build 19.0-b09, mixed mode)
> [omajid at localhost j2sdk-image]$ find -iname java | xargs ls -li
> 7865750 -rwxrwxr-x. 1 omajid omajid 150563 Dec 13 14:43 ./bin/java
> 7865711 -rwxrwxr-x. 1 omajid omajid 150563 Dec 13 14:43 ./jre/bin/java
> 
> These really seem to be identical but duplicate files.
> 

Yeah I checked this with ls and cmp too and they aren't.  Can't see in the
OpenJDK log where they are created though :-(

> >> On a separate note, should we not create symlinks named jcontrol and
> >> ControlPanel (under jre/bin) that link to itweb-settings?
> >>
> >
> > Why would you want these?  ControlPanel especially is very ugly.  We
> > already agreed on the name being itweb-settings.
> >
> 
> Yeah, and I dont have a problem with that. I was just thinking about 
> compatibility (just like this jre/bin/javaws thing that tripped me up). 
> The proprietary JDK, for example, symlinks ControlPanel to jcontrol.
> 

Do we really want to be compatible to the level?  It's a different control
panel with different options anyway.

> > You may also want to fix the installation of plugin.jar in the same
> > patch.  It's being installed using INSTALL_PROGRAM rather than
> > INSTALL_DATA and is thus executable.
> >
> 
> Done.
> 
> Thanks,
> Omair

> diff -r 0f2fddf76a78 Makefile.am
> --- a/Makefile.am	Mon Dec 13 16:12:06 2010 -0500
> +++ b/Makefile.am	Mon Dec 13 16:40:17 2010 -0500
> @@ -103,16 +103,19 @@
>   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/lib/$(INSTALL_ARCH_DIR) \
> +	  $(DESTDIR)$(prefix)/jre/bin/
>  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)
> +	ln -s $(DESTDIR)$(bindir)/javaws $(DESTDIR)$(prefix)/jre/bin/
>  	${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
>  	${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
> +	ln -s $(DESTDIR)$(bindir)/itweb-settings $(DESTDIR)$(prefix)/jre/bin/
>  
>  install-data-local:
>  	${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
> @@ -143,7 +146,9 @@
>  	rm -f $(DESTDIR)$(prefix)/man/man1/javaws.1
>  	rm -f $(DESTDIR)$(bindir)/pluginappletviewer
>  	rm -f $(DESTDIR)$(bindir)/javaws
> +	rm -f $(DESTDIR)$(prefix)/jre/bin/javaws
>  	rm -f $(DESTDIR)$(bindir)/itweb-settings
> +	rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings
>  	rm -rf $(DESTDIR)$(htmldir)
>  
>  # Plugin


-- 
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