Mercurial > hg > release > icedtea-web-1.7
changeset 1529:358be410039d
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 | Mon, 04 Mar 2019 16:15:37 +0100 |
| parents | c49a02a87fab |
| children | 9b54fcdec9bc |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 04 16:14:56 2019 +0100 +++ b/ChangeLog Mon Mar 04 16:15:37 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 Mon Mar 04 16:14:56 2019 +0100 +++ b/Makefile.am Mon Mar 04 16:15:37 2019 +0100 @@ -1187,7 +1187,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 ; \ @@ -1243,7 +1246,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 \ @@ -1262,7 +1268,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 \ @@ -1277,7 +1286,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 \