/hg/release/icedtea-web-1.0: 2 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Fri Jan 28 12:51:03 PST 2011
changeset ef24043734ee in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=ef24043734ee
author: Omair Majid <omajid at redhat.com>
date: Wed Dec 15 10:17:51 2010 -0500
add symlinks under JDK_HOME/jre/bin and make javaws work without
them too
2010-12-15 Omair Majid <omajid at redhat.com>
* Makefile.am (install-exec-local): Install plugin.jar as
data. If $(prefix)/jre/bin exists, then install symlinks to real
javaws and itweb-settings binaries under it.
($(NETX_DIR)/launcher/%.o): Set system property java.icedtea-web.bin
to point to the installed location of the javaws binary.
* netx/net/sourceforge/jnlp/Launcher.java (launchExternal): Use the
system property java.icedtea-web.bin to locate javaws binary.
changeset e84432bca9a3 in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=e84432bca9a3
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Jan 28 15:51:03 2011 -0500
Fixed installation problems that occur when the prefix is a jre dir.
diffstat:
4 files changed, 82 insertions(+), 18 deletions(-)
ChangeLog | 28 ++++++++++++++
Makefile.am | 62 ++++++++++++++++++++++---------
configure.ac | 8 ++++
netx/net/sourceforge/jnlp/Launcher.java | 2 +
diffs (163 lines):
diff -r a1ed62aa5f98 -r e84432bca9a3 ChangeLog
--- a/ChangeLog Mon Jan 24 10:13:01 2011 -0500
+++ b/ChangeLog Fri Jan 28 15:51:03 2011 -0500
@@ -1,3 +1,31 @@ 2011-01-24 Omair Majid <omajid at redhat.
+2011-01-28 Deepak Bhole <dbhole at redhat.com>
+
+ * Makefile.am
+ ($(NETX_DIR)/launcher/%.o): Build javaws without the
+ "-J-Djava.icedtea-web.bin=..." arg.
+ (install-exec-local): Use new JRE_DIR_PREFIX variables rather than
+ hardcoded '/jre' in pathname. Create relative links in jre/bin rather than
+ absolute ones.
+ (install-data-local): Use new JRE_DIR_PREFIX variables rather than
+ hardcoded '/jre' in pathname.
+ (uninstall-local): Same. Also, remove all parent dirs of $(htmldir) until
+ a non-empty one is encountered.
+ * configure.ac: Set JRE_DIR_PREFIX to jre/ if prefix is a JDK dir and set
+ it to empty if prefix apears to be a JRE dir.
+ * netx/net/sourceforge/jnlp/Launcher.java (launchExternal): Revert back to
+ using java.home when selecting javaws binary to execute for fork.
+
+2010-12-15 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am
+ (install-exec-local): Install plugin.jar as data. If $(prefix)/jre/bin
+ exists, then install symlinks to real javaws and itweb-settings binaries
+ under it.
+ ($(NETX_DIR)/launcher/%.o): Set system property java.icedtea-web.bin to
+ point to the installed location of the javaws binary.
+ * netx/net/sourceforge/jnlp/Launcher.java (launchExternal): Use the system
+ property java.icedtea-web.bin to locate javaws binary.
+
2011-01-24 Omair Majid <omajid at redhat.com>
* NEWS: Change format again.
diff -r a1ed62aa5f98 -r e84432bca9a3 Makefile.am
--- a/Makefile.am Mon Jan 24 10:13:01 2011 -0500
+++ b/Makefile.am Fri Jan 28 15:51:03 2011 -0500
@@ -102,21 +102,37 @@ clean-local: clean-netx clean-plugin cle
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)$(prefix)/bin $(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_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_DIR_PREFIX)/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)
- ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)/jre/lib
- ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
+ ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib/netx.jar
+ ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/javaws $(DESTDIR)$(prefix)/bin
+ 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 ../../bin/javaws $(DESTDIR)$(prefix)/jre/bin ; \
+ fi ; \
+ fi
+ ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib
+ ${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(prefix)/bin
+ 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 ../../bin/itweb-settings $(DESTDIR)$(prefix)/jre/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; \
@@ -134,16 +150,25 @@ endif
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
- rm -f $(DESTDIR)$(bindir)/itweb-settings
- rm -rf $(DESTDIR)$(htmldir)
+ rm -f $(DESTDIR)$(prefix)/bin/javaws
+ if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
+ rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
+ fi
+ rm -f $(DESTDIR)$(prefix)/bin/itweb-settings
+ if [ -L $(DESTDIR)$(prefix)/jre/bin/itweb-settings ] ; then \
+ rm -f $(DESTDIR)$(prefix)/jre/bin/itweb-settings ; \
+ fi
+ rm -rf $(DESTDIR)$(htmldir)/*
+ if [ -d $(DESTDIR)$(htmldir) ] ; then \
+ rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(htmldir) ; \
+ fi
# Plugin
@@ -325,8 +350,9 @@ extra-lib/about.jar: stamps/extra-class-
$(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"' \
- -c -o $@ $<
+ $(CC) $(LAUNCHER_FLAGS) \
+ -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot", }' \
+ -DPROGNAME='"javaws"' -c -o $@ $<
$(NETX_DIR)/launcher/controlpanel/%.o: $(LAUNCHER_SRCDIR)/%.c
mkdir -p $(NETX_DIR)/launcher/controlpanel && \
diff -r a1ed62aa5f98 -r e84432bca9a3 configure.ac
--- a/configure.ac Mon Jan 24 10:13:01 2011 -0500
+++ b/configure.ac Fri Jan 28 15:51:03 2011 -0500
@@ -78,4 +78,12 @@ IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAG
IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
+# Set JRE prefix based on whether 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 a1ed62aa5f98 -r e84432bca9a3 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Mon Jan 24 10:13:01 2011 -0500
+++ b/netx/net/sourceforge/jnlp/Launcher.java Fri Jan 28 15:51:03 2011 -0500
@@ -329,11 +329,13 @@ public class Launcher {
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.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) {
More information about the distro-pkg-dev
mailing list