changeset 1570:fa34c7141af5

jar command used to pack reproducers is called windows friendly * Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) TMP_MANIFEST is now exported so it can reach subshell of cygpath. If cygpath is in on PATH, TMP_MANIFEST path is cygpathed
author Jiri Vanek <jvanek@redhat.com>
date Wed, 27 Feb 2019 17:52:20 +0100
parents 120ed7532028
children 49cb60f2ad77
files ChangeLog Makefile.am
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 27 17:47:29 2019 +0100
+++ b/ChangeLog	Wed Feb 27 17:52:20 2019 +0100
@@ -1,3 +1,9 @@
+2019-02-27  Jiri Vanek <jvanek@redhat.com>
+
+	jar command used to pack reproducers is called windows friendly
+	* Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) TMP_MANIFEST is now exported so it can reach 
+	subshell of cygpath. If cygpath is in on PATH, TMP_MANIFEST path is cygpathed
+
 2019-02-27  Jiri Vanek <jvanek@redhat.com>
 
 	shell launcher got support for JAVA_HOME
--- a/Makefile.am	Wed Feb 27 17:47:29 2019 +0100
+++ b/Makefile.am	Wed Feb 27 17:52:20 2019 +0100
@@ -1272,8 +1272,11 @@
 	      GREP_R=$$?; \
 	      if [ ! -f $(META_MANIFEST) -o  $$GREP_R -ne 0  ]; \
 	      then \
-	       TMP_MANIFEST=`mktemp` ; \
+	       export TMP_MANIFEST=`mktemp` ; \
 	       echo "$$AN $$dir" > $$TMP_MANIFEST ; \
+	       if [ which cygpath ] ; then \
+	         export TMP_MANIFEST=$(shell cygpath -p -m "$$TMP_MANIFEST") ; \
+	       fi ; \
 	       $(SYSTEM_JDK_DIR)/bin/jar ufm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar"  $$TMP_MANIFEST ; \
 	       rm -f $$TMP_MANIFEST ; \
 	      fi ; \