Synchronized launchers to be from one source

4 files changed, 33 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index bdc3523..bb2f353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2013-05-20  Jiri Vanek  <[email protected]>
 
+	Synchronized launchers to be from one source
+	* Makefile.am: (edit_launcher_script) is now accepting variables
+	(launcher.build/$(javaws)) no depends on launcher/launchers.in instead of
+	launcher/javaws.in and is filling the variables for javaws
+	(launcher.build/$(itweb_settings)) no depends on launcher/launchers.in instead of
+	launcher/itweb_settings.in and is filling the variables for itweb_settings
+	* launcher/itweb-settings.in: removed
+	* launcher/javaws.in: removed
+	* launcher/launchers.in: new file, substitution of removed (itweb-settings.in)
+	and javaws.in. Mostly based on javaws.in, just (CLASSNAME) and (PROGRAM_NAME)
+	and (BINARY_LOCATION) were made more general.
+
+2013-05-20  Jiri Vanek  <[email protected]>
+
 	Fixed possible deadlock for applet->js->applet call
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
 	(REQUEST_TIMEOUT) new constant, 60s, to define timeout of  applet->js call
diff --git a/Makefile.am b/Makefile.am
index 0696895..1522903 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,12 +205,13 @@ itweb_settings:= $(shell echo itweb-settings | sed '@program_transform_name@')
 # the launcher needs to know $(bindir) and $(datadir) which can be different at
 # make-time from configure-time
 edit_launcher_script = sed \
-  -e 's|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g' \
-  -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \
-  -e 's|[@]JAVAWS_SPLASH_LOCATION[@]|$(datadir)/$(PACKAGE_NAME)/javaws_splash.png|g' \
-  -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \
-  -e 's|[@]JAVA[@]|$(JAVA)|g' \
-  -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g'
+  -e "s|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g" \
+  -e "s|[@]JAVAWS_SPLASH_LOCATION[@]|$(datadir)/$(PACKAGE_NAME)/javaws_splash.png|g" \
+  -e "s|[@]JAVA[@]|$(JAVA)|g" \
+  -e "s|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g" \
+  -e "s|[@]MAIN_CLASS[@]|$${MAIN_CLASS}|g" \
+  -e "s|[@]BIN_LOCATION[@]|$${BIN_LOCATION}|g" \
+  -e "s|[@]PROGRAM_NAME[@]|$${PROGRAM_NAME}|g"
 
 # Top-Level Targets
 # =================
@@ -519,12 +520,18 @@ clean-extra:
 extra-lib/about.jar: stamps/extra-class-files.stamp
 	$(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
 
-launcher.build/$(javaws): launcher/javaws.in
+launcher.build/$(javaws): launcher/launchers.in
 	mkdir -p launcher.build
+	MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\
+	BIN_LOCATION=$(bindir)/$(javaws) ;\
+	PROGRAM_NAME=$(javaws) ;\
 	$(edit_launcher_script) < $< > $@
 
-launcher.build/$(itweb_settings): launcher/itweb-settings.in
+launcher.build/$(itweb_settings): launcher/launchers.in
 	mkdir -p launcher.build
+	MAIN_CLASS=net.sourceforge.jnlp.controlpanel.CommandLine ;\
+	BIN_LOCATION=$(bindir)/$(itweb_settings) ;\
+	PROGRAM_NAME=$(itweb_settings) ;\
 	$(edit_launcher_script) < $< > $@
 
 clean-launchers:
diff --git a/launcher/itweb-settings.in b/launcher/itweb-settings.in
deleted file mode 100644
index 8b8905d..0000000
--- a/launcher/itweb-settings.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-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
-
-PROPERTY_NAME=deployment.jre.dir
-CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *"
-CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
-if [ "x$CUSTOM_JRE" = "x" ] ; then
-  CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
-fi;
-if [ "x$CUSTOM_JRE" != "x" ] ; then
-  if [ -e  "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then
-    JAVA=$CUSTOM_JRE/bin/java
-  else
-    echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA) in attempt to start. Please fix this."
-  fi
-fi;
-
-${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/launchers.in
index 2f003a9..008a4db 100644
--- a/launcher/javaws.in
+++ b/launcher/launchers.in
@@ -3,10 +3,10 @@
 JAVA=@JAVA@
 LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@
 LAUNCHER_FLAGS=-Xms8m
-CLASSNAME=net.sourceforge.jnlp.runtime.Boot
-BINARY_LOCATION=@JAVAWS_BIN_LOCATION@
+CLASSNAME=@MAIN_CLASS@
+BINARY_LOCATION=@BIN_LOCATION@
 SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
-PROGRAM_NAME=javaws
+PROGRAM_NAME=@PROGRAM_NAME@
 CP=@JRE@/lib/rt.jar
 
 PROPERTY_NAME=deployment.jre.dir
@@ -86,6 +86,6 @@ while [ "$j" -lt "${#ARGS[@]}" ]; do
   k=$((k+1))
 done
 
-exec -a "javaws" "${COMMAND[@]}"
+exec -a "$PROGRAM_NAME" "${COMMAND[@]}"
 
 exit $?