From 00af9d3f682ce2cde44a4d37b45c97fa8ac441c1 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 10 Mar 2011 15:42:01 -0500 Subject: Replace binary launchers with shell scripts 2011-03-10 Omair Majid Replace native launchers with shell scripts * NEWS: Update. * Makefile.am (LAUNCHER_BOOTCLASSPATH): Remove leading -J. (LAUNCHER_SRCDIR), (LAUNCHER_OBJECTS), (NETX_LAUNCHER_OBJECTS), (CONTROLPANEL_LAUNCHER_OBJECTS), (LAUNCHER_FLAGS), (LAUNCHER_LINK): Remove. (edit_launcher_script): New function. (all-local): Depend on new launcher targets. (clean-local): Depend on clean-launchers. (.PHONY): Add clean-launchers. (install-exec-local): Use new launcher paths. (clean-launchers): New target. ($(NETX_DIR)/launcher/%.o), ($(NETX_DIR)/launcher/controlpanel/%.o), ($(NETX_DIR)/launcher/javaws), ($(NETX_DIR)/launcher/controlpanel/itweb-settings): Remove. (launcher.build/javaws): New launcher. (launcher.build/itweb-settings): Likewise. * launcher/itweb-settings.in, * launcher/javaws.in: New file. * netx/net/sourceforge/jnlp/Launcher.java (launchExternal), * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java (CommandLine): Use new system properties to find paths and program names. --- launcher/itweb-settings.in | 15 +++++++++++++++ launcher/javaws.in | 14 ++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 launcher/itweb-settings.in create mode 100644 launcher/javaws.in (limited to 'launcher') diff --git a/launcher/itweb-settings.in b/launcher/itweb-settings.in new file mode 100644 index 0000000..49d2460 --- /dev/null +++ b/launcher/itweb-settings.in @@ -0,0 +1,15 @@ +#!/bin/bash + +JAVA=@JAVA@ +LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ +LAUNCHER_FLAGS=-Xms8m +CLASSNAME=net.sourceforge.jnlp.controlpanel.CommandLine +BINARY_LOCATION=@ITWEB_SETTINGS_BIN_LOCATION@ +PROGRAM_NAME=itweb-settings + +${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \ + -Dicedtea-web.bin.name=${PROGRAM_NAME} \ + -Dicedtea-web.bin.location=${BINARY_LOCATION} \ + ${CLASSNAME} \ + $@ + diff --git a/launcher/javaws.in b/launcher/javaws.in new file mode 100644 index 0000000..46ea918 --- /dev/null +++ b/launcher/javaws.in @@ -0,0 +1,14 @@ +#!/bin/bash + +JAVA=@JAVA@ +LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ +LAUNCHER_FLAGS=-Xms8m +CLASSNAME=net.sourceforge.jnlp.runtime.Boot +BINARY_LOCATION=@JAVAWS_BIN_LOCATION@ +PROGRAM_NAME=javaws + +${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \ + -Dicedtea-web.bin.name=${PROGRAM_NAME} \ + -Dicedtea-web.bin.location=${BINARY_LOCATION} \ + ${CLASSNAME} \ + $@ -- cgit v1.2.3