Mercurial > hg > release > icedtea-web-1.8
changeset 1571:49cb60f2ad77
keytool command used to create test keystores is called windows friendly
* Makefile.am: path to keystore or PUBLIC_KEYSTORE is preprocessed via cygapth on windows
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Wed, 27 Feb 2019 19:15:28 +0100 |
parents | fa34c7141af5 |
children | addc4150a4e9 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 27 17:52:20 2019 +0100 +++ b/ChangeLog Wed Feb 27 19:15:28 2019 +0100 @@ -1,3 +1,8 @@ +2019-02-27 Jiri Vanek <jvanek@redhat.com> + + keytool command used to create test keystores is called windows friendly + * Makefile.am: path to keystore or PUBLIC_KEYSTORE is preprocessed via cygapth on windows + 2019-02-27 Jiri Vanek <jvanek@redhat.com> jar command used to pack reproducers is called windows friendly
--- a/Makefile.am Wed Feb 27 17:52:20 2019 +0100 +++ b/Makefile.am Wed Feb 27 19:15:28 2019 +0100 @@ -1288,7 +1288,10 @@ touch $@ stamps/netx-dist-tests-sign-some-reproducers.stamp: stamps/netx-dist-tests-prepare-reproducers.stamp - keystore=$(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME); \ + export keystore=$(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME); \ + if [ which cygpath ] ; then \ + export keystore=$(shell cygpath -p -m "$$keystore") ; \ + fi ; \ types=($(SIGNED_REPRODUCERS)) ; \ for which in "$${types[@]}" ; do \ tcaw=$(TEST_CERT_ALIAS)_$$which ; \ @@ -1344,7 +1347,10 @@ if test "x$$PUBLIC_KEYSTORE" = x; then \ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ - PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + if [ which cygpath ] ; then \ + export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \ + fi ; \ keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \ for which in "$${types[@]}" ; do \ @@ -1363,7 +1369,10 @@ if test "x$$PUBLIC_KEYSTORE" = x; then \ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ - PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + if [ which cygpath ] ; then \ + export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \ + fi ; \ keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \ for which in "$${types[@]}" ; do \ @@ -1378,7 +1387,10 @@ if test "x$$PUBLIC_KEYSTORE" = x; then \ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ - PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + if [ which cygpath ] ; then \ + export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \ + fi ; \ keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \ for which in "$${types[@]}" ; do \