Mercurial > hg > release > icedtea-web-1.7
changeset 1528:c49a02a87fab
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 | Mon, 04 Mar 2019 16:14:56 +0100 |
| parents | ea6f73e2fe47 |
| children | 358be410039d |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 04 16:09:30 2019 +0100 +++ b/ChangeLog Mon Mar 04 16:14:56 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 Mon Mar 04 16:09:30 2019 +0100 +++ b/Makefile.am Mon Mar 04 16:14:56 2019 +0100 @@ -1171,8 +1171,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 ; \