/hg/icedtea-web: Allowed cross-build of bat launchers on linux s...

[jvanek at icedtea.classpath.org]

changeset 889bb8e09dda in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=889bb8e09dda
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Feb 07 17:06:20 2019 +0100

	Allowed cross-build of bat launchers on linux systems

	* .Makefile: some if WINDOWS changed to if WINDOWS_OR_INCLUDE_BATS
	* configure.ac: introduced --enable-bats-on-linux which (or if host is windows) set WINDOWS_OR_INCLUDE_BATS to true


diffstat:

 ChangeLog    |   6 ++++++
 Makefile.am  |  15 ++++++++++-----
 configure.ac |   9 +++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diffs (92 lines):

diff -r daea55188c54 -r 889bb8e09dda ChangeLog
--- a/ChangeLog	Thu Feb 07 16:50:07 2019 +0100
+++ b/ChangeLog	Thu Feb 07 17:06:20 2019 +0100
@@ -1,3 +1,9 @@
+2019-02-07  Jiri Vanek <jvanek at redhat.com>
+
+	Allowed cross-build of bat launchers on linux systems
+	* .Makefile: some if WINDOWS changed to if WINDOWS_OR_INCLUDE_BATS
+	* configure.ac: introduced --enable-bats-on-linux which (or if host is windows) set WINDOWS_OR_INCLUDE_BATS to true
+
 2019-02-07  Jiri Vanek <jvanek at redhat.com>
 
 	Added protection against to small applets. Enhanced understanding of properties like width/height
diff -r daea55188c54 -r 889bb8e09dda Makefile.am
--- a/Makefile.am	Thu Feb 07 16:50:07 2019 +0100
+++ b/Makefile.am	Thu Feb 07 17:06:20 2019 +0100
@@ -21,7 +21,6 @@
 	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)
@@ -29,6 +28,12 @@
 	WIN_LAUNCHERS=
 endif
 
+if WINDOWS_OR_INCLUDE_BATS
+	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
 else
@@ -378,7 +383,7 @@
 	${INSTALL_PROGRAM} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
-if WINDOWS
+if WINDOWS_OR_INCLUDE_BATS
 	${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor).bat $(DESTDIR)$(bindir)
@@ -409,7 +414,7 @@
 	 done)
 endif
 endif
-if WINDOWS
+if WINDOWS_OR_INCLUDE_BATS
 	mkdir -p $(WIN_ALL_DEPS)
 	mkdir -p $(WIN_RUN_DEPS)
 	JARSVARS=` ( set -o posix ; set ) | sed "s/.*=//"  | grep \\.jar$$ | grep \\.jar.exe$$ ` ; \
@@ -533,7 +538,7 @@
 	rm -r $(DESTDIR)$(SPLASH_PNG)
 	rm -r $(ICONS_DEST_DIR)/javaws.png
 	rm -rf $(DESTDIR)$(htmldir)
-if WINDOWS
+if WINDOWS_OR_INCLUDE_BATS
 	rm -rf $(WIN_ALL_DEPS)
 	rm -rf $(WIN_RUN_DEPS)
 	rm -f $(DESTDIR)$(bindir)/$(javaws).bat
@@ -1026,7 +1031,7 @@
 	PROGRAM_NAME=$(policyeditor) ;\
 	$(edit_launcher_script) < $< > $@
 
-if WINDOWS
+if WINDOWS_OR_INCLUDE_BATS
 # TODO get rid of this copypaste
 launcher.build/$(javaws).bat: shell-launcher/launchers.bat.in
 	mkdir -p launcher.build
diff -r daea55188c54 -r 889bb8e09dda configure.ac
--- a/configure.ac	Thu Feb 07 16:50:07 2019 +0100
+++ b/configure.ac	Thu Feb 07 17:06:20 2019 +0100
@@ -82,6 +82,15 @@
 AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
 AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
 
+# the images built with this switch on linux, are not exactly windows friendly (see removed jars in make log, which are made in favor of clean linux build)
+AC_MSG_CHECKING([whether to include also bat lunchers during linux build])
+AC_ARG_ENABLE([bats-on-linux],
+	      [AS_HELP_STRING([--enable-bats-on-linux],
+	      		      [enable generation of windows legacy bat launchers during linux build with legacy shell launchers. This is for subjects, who wish to do an custom build for windows and linuxes/mac users togethrer. Preparation of rest of the ITW then require a bit of love. This switch is not exactly supported option.])],
+	      [WINDOWS_OR_INCLUDE_BATS="${enableval}"], [WINDOWS_OR_INCLUDE_BATS='no'])
+AM_CONDITIONAL([WINDOWS_OR_INCLUDE_BATS], [test "x$WINDOWS_OR_INCLUDE_BATS" = "xyes" -o "$build_windows" = "yes" ])
+AC_MSG_RESULT(${WINDOWS_OR_INCLUDE_BATS})
+
 IT_CHECK_WITH_KCOV
 
 AC_MSG_CHECKING([how to search for libraries in native launchers])