diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | javaws.desktop.in (renamed from javaws.desktop) | 5 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2 |
4 files changed, 29 insertions, 8 deletions
@@ -1,3 +1,17 @@ +2010-11-19 Omair Majid <[email protected]> + + * Makefile.am (EXTRA_DIST): Replace javaws.desktop with + javaws.desktop.in. (all-local): Add javaws.desktop. (clean-local): + Add dependency on clean-desktop-files. (.PHONY): Add clean-desktop- + files. (clean-desktop-files): New target. (javaws.desktop): New + target. Use the absolute path to javaws binary in the Exec= line to + create the javaws.desktop file. + * javaws.desktop: Renamed to... + * javaws.desktop.in: New file. Does not contain Encoding key. Value + for Icon does not contain extension. + * netx/net/sourceforge/jnlp/util/XDesktopEntry.java + (JAVA_ICON_NAME): Set to icon name without the extension. + 2010-11-18 Omair Majid <[email protected]> * netx/net/sourceforge/jnlp/SecurityDesc.java: Remove window banner diff --git a/Makefile.am b/Makefile.am index 7df4b36..d6f5e7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,17 +66,19 @@ LAUNCHER_LINK = -o $@ -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$ -Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli -ldl -lc -lz PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG) -EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop extra launcher +EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher # Top-Level Targets # ================= -all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws +all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp $(NETX_DIR)/launcher/javaws \ + javaws.desktop -clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory clean-native-ecj +clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \ + clean-native-ecj clean-desktop-files .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \ - clean-bootstrap-directory clean-native-ecj + clean-bootstrap-directory clean-native-ecj clean-desktop-files install-exec-local: mkdir -p $(DESTDIR)$(bindir) @@ -246,6 +248,9 @@ clean-netx: rm -f netx-source-files.txt rm -f stamps/netx.stamp +clean-desktop-files: + rm -f javaws.desktop + # extras -- used to create about.jar for javaws. extra-source-files.txt: find $(abs_top_srcdir)/extra -name '*.java' | sort > $@ @@ -276,6 +281,9 @@ $(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS) mkdir -p launcher $(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS) +javaws.desktop: javaws.desktop.in + sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < javaws.desktop.in > javaws.desktop + # plugin tests if ENABLE_PLUGIN diff --git a/javaws.desktop b/javaws.desktop.in index 18c181d..da0bc7f 100644 --- a/javaws.desktop +++ b/javaws.desktop.in @@ -1,9 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Name=IcedTea Web Start Comment=IcedTea Application Launcher -Exec=/usr/bin/javaws %f -Icon=javaws.png +Exec=PATH_TO_JAVAWS %f +Icon=javaws Terminal=false Type=Application NoDisplay=true diff --git a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java index 5bed221..b4baef7 100644 --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java @@ -46,7 +46,7 @@ import net.sourceforge.jnlp.runtime.JNLPRuntime; */ public class XDesktopEntry { - public static final String JAVA_ICON_NAME = "java.png"; + public static final String JAVA_ICON_NAME = "java"; private JNLPFile file = null; private int iconSize = -1; |