/hg/icedtea-web: keytool command used to create test keystores i...

[jvanek at icedtea.classpath.org]

changeset 49cb60f2ad77 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=49cb60f2ad77
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Feb 27 19:15:28 2019 +0100

	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


diffstat:

 ChangeLog   |   5 +++++
 Makefile.am |  20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diffs (63 lines):

diff -r fa34c7141af5 -r 49cb60f2ad77 ChangeLog
--- 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 at 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 at redhat.com>
 
 	jar command used to pack reproducers is called windows friendly
diff -r fa34c7141af5 -r 49cb60f2ad77 Makefile.am
--- 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 \