/hg/release/icedtea-web-1.7: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 5de5c1d74ffb in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=5de5c1d74ffb
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Mar 05 14:17:26 2019 +0100

	* Makefile.am: removed dual slash between destdir and modularjdk, included CPPUNIT_FRAMEWORK_CLEAN_IMPL with, clean-unittest++-impl/plaeholder to avoid fail of unknown target when native plugin is gone.


changeset 5ef482e3aa78 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=5ef482e3aa78
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Mar 05 14:22:47 2019 +0100

	* acinclude.m4: Moved windows specific check for JDK on the begging of  SYSTEM_JDK part of IT_CHECK_FOR_JDK macro to fix search on windows


diffstat:

 ChangeLog    |  10 ++++++++++
 Makefile.am  |  12 +++++++++---
 acinclude.m4 |  17 +++++++++--------
 3 files changed, 28 insertions(+), 11 deletions(-)

diffs (111 lines):

diff -r c081fbf99cc5 -r 5ef482e3aa78 ChangeLog
--- a/ChangeLog	Mon Mar 04 17:59:40 2019 +0100
+++ b/ChangeLog	Tue Mar 05 14:22:47 2019 +0100
@@ -1,3 +1,13 @@
+2019-03-05  Lars Herschke <lhersch at dssgmbh.de>
+
+	* acinclude.m4: Moved windows specific check for JDK on the begging of  SYSTEM_JDK part of IT_CHECK_FOR_JDK macro
+	to fix search on windows
+
+2019-03-05  Lars Herschke <lhersch at dssgmbh.de>
+            
+	* Makefile.am: removed dual slash between destdir and modularjdk, included CPPUNIT_FRAMEWORK_CLEAN_IMPL with
+	clean-unittest++-impl/plaeholder to avoid fail of unknown target when native plugin is gone.
+
 2019-02-28  Jiri Vanek <jvanek at redhat.com>
             Michal Vala <mvala at redhat.com>
 
diff -r c081fbf99cc5 -r 5ef482e3aa78 Makefile.am
--- a/Makefile.am	Mon Mar 04 17:59:40 2019 +0100
+++ b/Makefile.am	Tue Mar 05 14:22:47 2019 +0100
@@ -174,7 +174,7 @@
 
 NETX_JAR=$(datadir)/$(PACKAGE_NAME)/netx.jar
 SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
-MODULARJDK_ARGS_LOCATION=$(DESTDIR)/$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE)
+MODULARJDK_ARGS_LOCATION=$(DESTDIR)$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE)
 
 
 # Conditional defintions
@@ -254,9 +254,11 @@
 if ENABLE_NATIVE_PLUGIN
   CPPUNIT_IMPL = run-cpp-unit-tests-impl
   CPPUNIT_CLEAN_IMPL = clean-cpp-unit-tests-impl
+  CPPUNIT_FRAMEWORK_CLEAN_IMPL = clean-unittest++-impl
 else
   CPPUNIT_IMPL = run-cpp-unit-tests-impl-placeholder
   CPPUNIT_CLEAN_IMPL = clean-cpp-unit-tests-placeholder
+  CPPUNIT_FRAMEWORK_CLEAN_IMPL = clean-unittest++-placeholder
 endif
 
 if CP_SUPPORTS_REFLINK
@@ -389,7 +391,7 @@
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
 	${INSTALL_DATA} $(TOP_SRC_DIR)/javaws.png $(ICONS_DEST_DIR)/
-	mkdir -p $(DESTDIR)/$(MODULARJDK_ARGS_DIR)
+	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
 	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
 if ENABLE_NATIVE_LAUNCHERS
 	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
@@ -625,7 +627,7 @@
 	ar cr $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o ; \
 	popd
 
-clean-unittest++:
+clean-unittest++-impl:
 	rm -f $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o
 	rm -f $(CPP_UNITTEST_FRAMEWORK_LIB)
 	if [ -e $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) ] ; then \
@@ -696,12 +698,16 @@
 	fi
 endif
 
+clean-unittest++-placeholder:
+
 clean-cpp-unit-tests-placeholder:
 	echo "plugin disabled"
 
 run-cpp-unit-tests-impl-placeholder:
 	echo "plugin disabled"
 
+clean-unittest++: $(CPPUNIT_FRAMEWORK_CLEAN_IMPL)
+
 clean-cpp-unit-tests: $(CPPUNIT_CLEAN_IMPL)
 
 run-cpp-unit-tests: $(CPPUNIT_IMPL)
diff -r c081fbf99cc5 -r 5ef482e3aa78 acinclude.m4
--- a/acinclude.m4	Mon Mar 04 17:59:40 2019 +0100
+++ b/acinclude.m4	Tue Mar 05 14:22:47 2019 +0100
@@ -47,6 +47,14 @@
 	        SYSTEM_JDK_DIR=
               ])
   if test -z "${SYSTEM_JDK_DIR}"; then
+    AM_COND_IF([WINDOWS], [
+      # does not work, use which instead
+      # AC_CHECK_PROGS([SYSTEM_JAVA_IN_PATH], [java.exe]) 
+      SYSTEM_JAVA_IN_PATH=$(which javac 2>&AS_MESSAGE_LOG_FD)      
+      if test x"${SYSTEM_JAVA_IN_PATH}" != x ; then
+        SYSTEM_JDK_DIR=$(dirname $(dirname ${SYSTEM_JAVA_IN_PATH}))
+      fi
+    ] , [
     for dir in /etc/alternatives/java_sdk \
                /usr/lib/jvm/java-1.9.0-openjdk \
                /usr/lib/jvm/icedtea9 \
@@ -64,15 +72,8 @@
 	 break
        fi
     done
+  ])
   fi
-  AM_COND_IF([WINDOWS], [
-    # does not work, use which instead
-    # AC_CHECK_PROGS([SYSTEM_JAVA_IN_PATH], [java.exe]) 
-    SYSTEM_JAVA_IN_PATH=$(which java 2>&AS_MESSAGE_LOG_FD)
-    if test x"${SYSTEM_JAVA_IN_PATH}" != x ; then
-      SYSTEM_JDK_DIR=$(dirname $(dirname ${SYSTEM_JAVA_IN_PATH}))
-    fi
-  ])
   if ! test -d "${SYSTEM_JDK_DIR}"; then
     AC_MSG_ERROR("A JDK home directory could not be found. ${SYSTEM_JDK_DIR}")
   else