IcedTeaWeb: using java 9 run args ?
Jiri Vanek
jvanek at redhat.com
Sun Jan 27 16:47:20 UTC 2019
On 1/25/19 1:36 PM, Laurent Bourgès wrote:
> Hi Jiri,
>
> I finally finished rewriting / unify windows batch script with linux
> shell script.
>
Taht is bat scripting masterpiece. Congratualtions for gaining eternal patience.
> Changes:
> - Xnofork is no more needed on windows because argument parsing is working now
> - use run-args + fix classpaths (portable itw with deps)
> - fix CRLF in bat files
The crlg hack is necessary only for args file. That really have to be another patch for that.
(still we can keep the thread, as many was told here already))
>
> I tested it on windows 7/10 and it works great.
> I noted windows shortcuts work now, except on JDK12 (maybe related to
> jigsaw classloader ?)
No idea. Adding Joel. to CC. Maybe you will be able to look into it?
Alex quite IcedTea recently, so there is no windows guy around. I will try to get help in RH with
windows, otherwise windows "support" of itw will depend purely on community.
>
> I have questions about header variables (too many) and why these need
> to be absolute paths ?
Because in distribution, they ecan be anywhere.
> it could be relative paths if we add ITW_HOME on the top.
> Of course, it depends between DIST or BUNDLE modes ... like for
> dependencies (win/linux_deps folders)
Yes. Bundle mode will be more happy with a bit different setup. Maybe ITW will once grow to be more
standalone then distributions frindly.
>
> Please explain how do you plan to make portable (cross-platform) packages ?
Nothing like that!
I will build (and I already am) linux tarablls on linux, and windows tarballs on windows.
>
> PS: I did not split these patch as I prefer you to have a look and
> merge on your side or I can merge on my side with your Makefile
> changes ...
I had attached my version of crosscompiler bats on linux. Compared to yours, thay are true on
windows. Not sure how you were handluing this case. Otherwise they loks same asyours. I wrote them
in Monday, but then fell down with flue which keeps persisting.
Also i noticed, that *image* as done on linux, with crosscompile on, is useless on windows. Yes,
you have bats, but windows-deps directory is corrupoted from linux build.
Whre I wont to keep this state on 1.7, in head, the only possible solution ois to get rid of
linux/windows*deps*dirs and replace them by singledir deps. WDYT?
In addition, yours patch contains also the arg file. I probably agree that it is way to go. This
will do its job for shell launchers. For rust ones, I will need to add the cp/bootcp and other java
switches customisation properties into deployment.properties. WDYT?
>
> PS2: you can have a look @github to see complete shell scripts (not diff):
> https://github.com/bourgesl/icedtea-web/tree/run-args/shell-launcher
h<t is really splendid work. I\m unable to have nay comment to new bat file, except that it loosk
much better then old one, and that it do not looks malicious:)
I'm for its incorporation to both head and 1.7
Few comments to ther chnegs inline:
...
>
> patch-run-args-win.2.diff
All refactorings/untypos must go as separate patch. Sorry. Feel free topush them without any other
review. They are making reading of this hard.
>
> diff -r 4c5a2c8d2db4 Makefile.am
> --- a/Makefile.am Tue Jan 15 18:08:34 2019 +0100
> +++ b/Makefile.am Fri Jan 25 13:19:34 2019 +0100
> @@ -21,37 +21,41 @@
> export TOP_SRC_DIR := $(shell cygpath -p -m "$(abs_top_srcdir)")
> export prefix := $(shell cygpath -p -m "$(prefix)")
> export CPA="-v"
> - WIN_LAUNCHERS=launcher.build/$(javaws).bat launcher.build/$(itweb_settings).bat launcher.build/$(policyeditor).bat
> else
> export TOP_BUILD_DIR = $(abs_top_builddir)
> export TOP_SRC_DIR = $(abs_top_srcdir)
> export CPA="-av"
> - WIN_LAUNCHERS=
> +endif
> +
> +if ENABLE_WIN_SHELL_LAUNCHERS
> + WIN_LAUNCHERS=launcher.build/$(javaws).bat launcher.build/$(itweb_settings).bat launcher.build/$(policyeditor).bat
> +else
> + WIN_LAUNCHERS=
> endif
>
> if ENABLE_SHELL_LAUNCHERS
> - SHELL_LUNCHERS=$(WIN_LAUNCHERS) launcher.build/$(javaws).sh launcher.build/$(itweb_settings).sh launcher.build/$(policyeditor).sh
> + SHELL_LAUNCHERS=$(WIN_LAUNCHERS) launcher.build/launchers-run.args launcher.build/$(javaws).sh launcher.build/$(itweb_settings).sh launcher.build/$(policyeditor).sh
> else
> - SHELL_LUNCHERS=
> + SHELL_LAUNCHERS=
> endif
>
>
> if ENABLE_NATIVE_LAUNCHERS
> - NATIVE_LUNCHERS=launcher.build/$(javaws) launcher.build/$(itweb_settings) launcher.build/$(policyeditor)
> + NATIVE_LAUNCHERS=launcher.build/launchers-run.args launcher.build/$(javaws) launcher.build/$(itweb_settings) launcher.build/$(policyeditor)
> DESKTOP_SUFFIX=
> else
> - NATIVE_LUNCHERS=
> + NATIVE_LAUNCHERS=
> DESKTOP_SUFFIX=.sh
> endif
>
> # javaws is program name, JAVAWS is used executable name. in 99.9% those are equals.
> -# in unsupported case (no rust, and enforced shell lunchers), it will become javaws.sh.
> +# in unsupported case (no rust, and enforced shell launchers), it will become javaws.sh.
> # similar case is for other two binaries.
> JAVAWS=$(javaws)$(DESKTOP_SUFFIX)
> ITWEB_SETTINGS=$(itweb_settings)$(DESKTOP_SUFFIX)
> POLICYEDITOR=$(policyeditor)$(DESKTOP_SUFFIX)
>
> -LAUNCHERS=$(NATIVE_LUNCHERS) $(SHELL_LUNCHERS)
> +LAUNCHERS=$(NATIVE_LAUNCHERS) $(SHELL_LAUNCHERS)
> DESKTOP_FILES=javaws.desktop itweb-settings.desktop policyeditor.desktop
> DESKTOP_IN_FILES=javaws.desktop.in itweb-settings.desktop.in policyeditor.desktop.in
>
> @@ -164,8 +168,11 @@
> PLUGIN_JAR=$(datadir)/$(PACKAGE_NAME)/plugin.jar
> JSOBJECT_JAR=$(datadir)/$(PACKAGE_NAME)/jsobject.jar
> endif
> - NETX_JAR=$(datadir)/$(PACKAGE_NAME)/javaws.jar
> - SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
> +
> +NETX_JAR=$(datadir)/$(PACKAGE_NAME)/javaws.jar
> +SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
> +RUN_ARGS_LOCATION=$(bindir)/launchers-run.args
> +
>
> # Conditional defintions
> if HAVE_TAGSOUP
> @@ -320,6 +327,13 @@
> itweb_settings:= $(shell echo itweb-settings | sed '@program_transform_name@')
> policyeditor:= $(shell echo policyeditor | sed '@program_transform_name@')
>
> +if ENABLE_WIN_SHELL_LAUNCHERS
> +# convert Unix newlines (LF) to DOS format:
> + line_end_edit_launcher_script=-e "s/\$$/\r/"
> +else
> + line_end_edit_launcher_script=
> +endif
Only for args file path, right?
> +
> # the launcher needs to know $(bindir) and $(datadir) which can be different at
> # make-time from configure-time
> edit_launcher_script = sed \
> @@ -335,7 +349,9 @@
> -e "s|[@]MSLINKS_JAR[@]|$(MSLINKS_JAR)|g" \
> -e "s|[@]TAGSOUP_JAR[@]|$(TAGSOUP_JAR)|g" \
> -e "s|[@]RHINO_JAR[@]|$(RHINO_JAR)|g" \
> - -e "s|[@]PROGRAM_NAME[@]|$${PROGRAM_NAME}|g"
> + -e "s|[@]PROGRAM_NAME[@]|$${PROGRAM_NAME}|g" \
> + -e "s|[@]RUN_ARGS_LOCATION[@]|$(RUN_ARGS_LOCATION)|g" $(line_end_edit_launcher_script)
> +
>
...
> +if "%MODULAR_JDK%" == "YES" (
> + rem warning extra escaping
> + set "MODULAR_ARGS=--patch-module "java.desktop=%NETX_JAR%;%PLUGIN_JAR%""
why NETX.JAR?
> + rem jsobject must be patched separately from plugin
> + rem otherwise netscape pkg would be shared by two modules, which is forbiden
> + rem plugin jar may not be built
> + if not "%JSOBJECT_JAR%" == "" (
> + set "MODULAR_ARGS=!MODULAR_ARGS! --patch-module "jdk.jsobject=%JSOBJECT_JAR%""
> )
> -) else (
> - set SPLASH_LOCATION=%ITW_HOME%/share/icedtea-web/javaws_splash.png
> - set BINARY_LOCATION=%ITW_HOME%/bin/@PROGRAM_NAME at .bat
> - set LAUNCHER_BOOTCLASSPATH=-Xbootclasspath/a:%ITW_HOME%/share/icedtea-web/netx.jar;%ITW_HOME%/share/icedtea-web/plugin.jar;%ITW_HOME%/share/icedtea-web/jsobject.jar;%ITW_HOME%/win-deps-runtime/js.jar;%ITW_HOME%/win-deps-runtime/tagsoup.jar;%ITW_HOME%/win-deps-runtime/mslinks.jar;%NASHORN%
> + rem add JDK9+ arg file:
> + set "MODULAR_ARGS=!MODULAR_ARGS! "@%RUN_ARGS_LOCATION%""
> )
>
>
> +rem Filter script args:
> +set "SPLASH=false"
> +if "%ICEDTEA_WEB_SPLASH%" == "" (
> + set "SPLASH=true"
> +)
>
> -rem TODO use "exec -a %PROGRAM_NAME% ..." idiom
> -"%JAVA%" "-splash:%SPLASH_LOCATION%" "%LAUNCHER_BOOTCLASSPATH%" %LAUNCHER_FLAGS% %JAVAWS_J_OPTIONS% "-classpath" "%CP%" "-Dicedtea-web.bin.name=%PROGRAM_NAME%" "-Dicedtea-web.bin.location=%BINARY_LOCATION%" "%CLASSNAME%" %ITW_WIN_SPECIALS% %*
> +set "JAVA_ARGS="
> +set "ARGS="
>
> -SET errno=%ERRORLEVEL%
> +for %%a IN (%*) do (
> + set "_arg=%%a"
> + set "_beg=!_arg:~0,2!"
> + if "!_beg!" == "-J" (
> + set "JAVA_ARGS=!JAVA_ARGS! !_arg:~2!"
> + ) else (
> + set "ARGS=!ARGS! !_arg!"
> + if "!_arg:~0,1!" == "-" if not "x!_arg:headless=!" == "x!_arg!" (
> + set "SPLASH=false"
> + )
> + )
> +)
> +set "_arg=" & set "_beg="
>
>
> +rem Build Java command line:
> +
> +if "%SPLASH%" == "true" (
> + set "SPLASH="-splash:%SPLASH_LOCATION%""
> +) else (
> + set "SPLASH="
> +)
> +
> +rem @echo "%JAVA%" %SPLASH% "%LAUNCHER_BOOTCLASSPATH%" %LAUNCHER_FLAGS% %MODULAR_ARGS% %JAVAWS_J_OPTIONS% %JAVA_ARGS% -classpath "%CP%" "-Dicedtea-web.bin.name=%PROGRAM_NAME%" "-Dicedtea-web.bin.location=%BINARY_LOCATION%" "%CLASSNAME%" %ARGS%
> +
> +"%JAVA%" %SPLASH% "%LAUNCHER_BOOTCLASSPATH%" %LAUNCHER_FLAGS% %MODULAR_ARGS% %JAVAWS_J_OPTIONS% %JAVA_ARGS% -classpath "%CP%" "-Dicedtea-web.bin.name=%PROGRAM_NAME%" "-Dicedtea-web.bin.location=%BINARY_LOCATION%" "%CLASSNAME%" %ARGS%
> +
> +SET "errno=%ERRORLEVEL%"
> +
> echo Please press any key to close this window/get back prompt
> pause > nul
> EXIT /B %errno%
> +
> diff -r 4c5a2c8d2db4 shell-launcher/launchers.sh.in
> --- a/shell-launcher/launchers.sh.in Tue Jan 15 18:08:34 2019 +0100
> +++ b/shell-launcher/launchers.sh.in Fri Jan 25 13:19:34 2019 +0100
> @@ -1,23 +1,28 @@
> #!/bin/bash
>
> NASHORN=lib/ext/nashorn.jar
> -JAVA=@JAVA@
> +JRE=@JRE@
> +JAVA=$JRE/bin/java
> LAUNCHER_BOOTCLASSPATH='@LAUNCHER_BOOTCLASSPATH@'
> LAUNCHER_FLAGS=-Xms8m
> CLASSNAME=@MAIN_CLASS@
> BINARY_LOCATION=@BIN_LOCATION@
> SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
> +RUN_ARGS_LOCATION=@RUN_ARGS_LOCATION@
> PROGRAM_NAME=@PROGRAM_NAME@
> -CP=@JRE@/lib/rt.jar:@JRE@/lib/jfxrt.jar
> +CP=$JRE/lib/rt.jar:$JRE/lib/jfxrt.jar
> +
> # individual parts of bootclasspath for more easy processing
> NETX_JAR=@NETX_JAR@
> PLUGIN_JAR=@PLUGIN_JAR@
> JSOBJECT_JAR=@JSOBJECT_JAR@
> TAGSOUP_JAR=@TAGSOUP_JAR@
> RHINO_JAR=@RHINO_JAR@
> -MSLINKS_JAR=@MSLINKS_JAR@
> +# windows only:
> +#MSLINKS_JAR=@MSLINKS_JAR@
>
> -## resolve folder of this script, following all symlinks,
> +
> +## resolve folder of this script, following all symlinks:
> ## http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
> SCRIPT_SOURCE="${BASH_SOURCE[0]}"
> while [ -h "$SCRIPT_SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
> @@ -29,6 +34,8 @@
> readonly SCRIPT_DIR="$( cd -P "$( dirname "$SCRIPT_SOURCE" )" && pwd )"
> readonly PORTABLE_ITW_HOME="`dirname $SCRIPT_DIR`"
>
> +
> +## resolve custom JRE:
> CONFIG_HOME=$XDG_CONFIG_HOME
> if [ "x$CONFIG_HOME" = "x" ] ; then
> CONFIG_HOME=~/.config
> @@ -45,7 +52,8 @@
> CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"`
> fi;
>
> -# as used in windows lunchers, supporting portable ITW
> +
> +# Support portable ITW:
> # note, that this is temporary, experimental solution, moreover for 1.7 and will likely change since 1.8
> # by this, sh launchers can be again a bit more portable then win ones, thats why we moved to native ones since 1.8
> # still this is very dummy
> @@ -54,20 +62,22 @@
> fi
> if [ "x$ITW_LIBS" == "xBUNDLED" -o ! "x$ITW_HOME" = "x" ] ; then
> if [ "x$ITW_HOME" = "x" ] ; then
> - LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$PORTABLE_ITW_HOME/share/icedtea-web/`basename \"$NETX_JAR\"`:$PORTABLE_ITW_HOME/share/icedtea-web/`basename \"$PLUGIN_JAR\"`:$PORTABLE_ITW_HOME/share/icedtea-web/`basename \"$JSOBJECT_JAR\"`:$PORTABLE_ITW_HOME/linux-deps-runtime/`basename \"$TAGSOUP_JAR\"`:$PORTABLE_ITW_HOME/linux-deps-runtime/`basename \"$RHINO_JAR\"`"
> -BINARY_LOCATION="$PORTABLE_ITW_HOME/bin/`basename \"$BINARY_LOCATION \"`"
> -SPLASH_LOCATION="$PORTABLE_ITW_HOME/share/icedtea-web/`basename \"$SPLASH_LOCATION \"`"
> -echo "warning, using portable itw from $PORTABLE_ITW_HOME: $LAUNCHER_BOOTCLASSPATH $BINARY_LOCATION $SPLASH_LOCATION"
> - else
> - LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$ITW_HOME/share/icedtea-web/`basename \"$NETX_JAR\"`:$ITW_HOME/share/icedtea-web/`basename \"$PLUGIN_JAR\"`:$ITW_HOME/share/icedtea-web/`basename \"$JSOBJECT_JAR\"`:$ITW_HOME/linux-deps-runtime/`basename \"$TAGSOUP_JAR\"`:$ITW_HOME/linux-deps-runtime/`basename \"$RHINO_JAR\"`"
> -BINARY_LOCATION="$ITW_HOME/bin/`basename \"$BINARY_LOCATION \"`"
> -SPLASH_LOCATION="$ITW_HOME/share/icedtea-web/`basename \"$SPLASH_LOCATION\"`"
> -echo "warning, using portable itw from $ITW_HOME: $LAUNCHER_BOOTCLASSPATH $BINARY_LOCATION $SPLASH_LOCATION"
> + ITW_HOME=$PORTABLE_ITW_HOME
> fi
> + BINARY_LOCATION="$ITW_HOME/bin/`basename \"$BINARY_LOCATION\"`"
> + SPLASH_LOCATION="$ITW_HOME/share/icedtea-web/`basename \"$SPLASH_LOCATION\"`"
> + RUN_ARGS_LOCATION="$ITW_HOME/bin/`basename \"$RUN_ARGS_LOCATION\"`"
> + NETX_JAR="$ITW_HOME/share/icedtea-web/`basename \"$NETX_JAR\"`"
> + PLUGIN_JAR="$ITW_HOME/share/icedtea-web/`basename \"$PLUGIN_JAR\"`"
> + JSOBJECT_JAR="$ITW_HOME/share/icedtea-web/`basename \"$JSOBJECT_JAR\"`"
> + LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$NETX_JAR:$PLUGIN_JAR:$JSOBJECT_JAR:$ITW_HOME/linux-deps-runtime/`basename \"$TAGSOUP_JAR\"`:$ITW_HOME/linux-deps-runtime/`basename \"$RHINO_JAR\"`"
> + echo "warning, using portable itw from $ITW_HOME: $LAUNCHER_BOOTCLASSPATH $BINARY_LOCATION $SPLASH_LOCATION"
> fi
>
> +
> +# Fix classpaths for custom JRE:
> if [ "x$CUSTOM_JRE" != "x" ] ; then
> - if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then
> + if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then
> JAVA=$CUSTOM_JRE/bin/java
> CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/jfxrt.jar
> LAUNCHER_BOOTCLASSPATH=$LAUNCHER_BOOTCLASSPATH:$CUSTOM_JRE/$NASHORN
> @@ -75,18 +85,24 @@
> echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in attempt to start. Please fix this."
> fi
> else
> - LAUNCHER_BOOTCLASSPATH="$LAUNCHER_BOOTCLASSPATH:@JRE@/$NASHORN"
> + LAUNCHER_BOOTCLASSPATH="$LAUNCHER_BOOTCLASSPATH:$JRE/$NASHORN"
> fi;
>
> +
> +# Support Modular JDK (jigsaw):
> MODULAR_JDK="NO"
> -version=`${JAVA} -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1`
> +fullversion=`${JAVA} -version 2>&1`
> +echo "fullversion: $fullversion"
I would skipp the fullversion: string, and printed $fullversion to stderr as are people used from
jdk/ (?)
> +version=`echo $fullversion | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1`
> if [ $version -eq "1" ]; then
> - version=`${JAVA} -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2`
> + version=`echo $fullversion | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2`
> fi
What about your idea to call jvm to get this value?-)
> if [ $version -ge "9" ]; then
> MODULAR_JDK="YES"
> fi
>
...
> - COMMAND[k]="jdk.jsobject=$JSOBJECT_JAR"
> + COMMAND[k]="java.desktop=$NETX_JAR:$PLUGIN_JAR"
aain. why next.jar?
> k=$((k+1))
> -fi
> -
> -COMMAND[k]="--add-reads"
> -k=$((k+1))
> -COMMAND[k]="java.base=ALL-UNNAMED,java.desktop"
> -k=$((k+1))
> -COMMAND[k]="--add-reads"
> -k=$((k+1))
> -COMMAND[k]="java.desktop=ALL-UNNAMED,java.naming"
> -k=$((k+1))
> -COMMAND[k]="--add-reads"
> -k=$((k+1))
> -COMMAND[k]="java.naming=ALL-UNNAMED,java.desktop"
> -k=$((k+1))
> + # jsobject must be patched separately from plugin
> + # otherwise netscape pkg would be shared by two modules, which is forbiden
> + # plugin jar may not be built
> + if [ ! "x$JSOBJECT_JAR" == "x" ] ; then
> + COMMAND[k]="--patch-module"
> + k=$((k+1))
> + COMMAND[k]="jdk.jsobject=$JSOBJECT_JAR"
> + k=$((k+1))
> + fi
>
...
>
> +#echo "CMD: ${COMMAND[@]}"
The commented echo is weird. One is usually running this in -x subshell to see details.
> exec -a "$PROGRAM_NAME" "${COMMAND[@]}"
>
> exit $?
> +
>
Thanx!
--
Jiri Vanek
Senior QE engineer, OpenJDK QE lead, Mgr.
Red Hat Czech
jvanek at redhat.com M: +420775390109
-------------- next part --------------
A non-text attachment was scrubbed...
Name: crossBuildBatLaunchers.patch
Type: text/x-patch
Size: 3372 bytes
Desc: not available
URL: <https://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20190127/bd8eb4be/crossBuildBatLaunchers.patch>
More information about the distro-pkg-dev
mailing list