Mercurial > hg > release > icedtea-web-1.6

changeset 1245:7fe258be550a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed last remains of BOOT_DIR * Makefile.am: declared and exported EXPORTED_JAR EXPORTED_KEYTOOL EXPORTED_JARSIGNER EXPORTED_PACK200 * tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile: all of (BOOT_DIR)/bin/keytool (BOOT_DIR)/bin/jarsigner (BOOT_DIR)/bin/javac (BOOT_DIR)/bin/jar (BOOT_DIR)/bin/pack200 replaced by (EXPORTED_KEYTOOL) (EXPORTED_JARSIGNER) (EXPORTED_JAVAC) (EXPORTED_JAR) (EXPORTED_PACK200) * tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile: same * tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same * tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same * tests/reproducers/custom/MixedSigningApplet/srcs/Makefile: same * tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile: same * tests/reproducers/custom/PackGZip/srcs/Makefile: same * tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile: same * tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile: same * tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile: same * tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile: same * tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile: same
author Jiri Vanek <jvanek@redhat.com>
date Thu, 30 Jul 2015 14:06:57 +0200
parents 49b7fb76c152
children 9e24c2ff6b46
files ChangeLog Makefile.am tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile tests/reproducers/custom/MixedSigningApplet/srcs/Makefile tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile tests/reproducers/custom/PackGZip/srcs/Makefile tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile
diffstat 14 files changed, 66 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jul 30 14:01:59 2015 +0200
+++ b/ChangeLog	Thu Jul 30 14:06:57 2015 +0200
@@ -1,3 +1,25 @@
+2015-07-27  Jiri Vanek  <jvanek@redhat.com>
+
+	Removed last remains of BOOT_DIR
+	* Makefile.am: declared and exported EXPORTED_JAR EXPORTED_KEYTOOL
+	EXPORTED_JARSIGNER EXPORTED_PACK200
+	* tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile:
+	all of (BOOT_DIR)/bin/keytool (BOOT_DIR)/bin/jarsigner (BOOT_DIR)/bin/javac
+	(BOOT_DIR)/bin/jar (BOOT_DIR)/bin/pack200 replaced by (EXPORTED_KEYTOOL)
+	(EXPORTED_JARSIGNER) (EXPORTED_JAVAC) (EXPORTED_JAR) (EXPORTED_PACK200)
+	* tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile: same
+	* tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile: same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile: same
+	* tests/reproducers/custom/MixedSigningApplet/srcs/Makefile: same
+	* tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile: same
+	* tests/reproducers/custom/PackGZip/srcs/Makefile: same
+	* tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile:
+	same
+	* tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile: same
+	* tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile: same
+	* tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile: same
+	* tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile: same
+
 2015-07-30  Jiri Vanek  <jvanek@redhat.com>
 
 	replaced Trusted-only by Trusted-Only, cosmetic change in TrustedOnlyAttribute reproducer
@@ -7,9 +29,9 @@
 	* tests/reproducers/custom/TrustedOnlyAttribute/resources/TrustedOnlyAttribute-unsigned-security.jnlp:
 	* tests/reproducers/custom/TrustedOnlyAttribute/srcs/MANIFEST.MF:
 
- 2015-07-29  Jiri Vanek  <jvanek@redhat.com>
+2015-07-29  Jiri Vanek  <jvanek@redhat.com>
  
- 	Initial push for big trusted-only/mixed-permissions reproducer	Enabled and properly tested Entry-Point attribute check
+ 	Enabled and properly tested Entry-Point attribute check
 	* NEWS: mentioned enabling
 	* netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java: enabled
 	call to checkEntryPoint if enabled
--- a/Makefile.am	Thu Jul 30 14:01:59 2015 +0200
+++ b/Makefile.am	Thu Jul 30 14:06:57 2015 +0200
@@ -231,6 +231,10 @@
 
 #exported autoconf copies
 export EXPORTED_JAVAC=$(SYSTEM_JDK_DIR)/bin/javac
+export EXPORTED_JAR=$(SYSTEM_JDK_DIR)/bin/jar
+export EXPORTED_KEYTOOL=$(SYSTEM_JDK_DIR)/bin/keytool
+export EXPORTED_JARSIGNER=$(SYSTEM_JDK_DIR)/bin/jarsigner
+export EXPORTED_PACK200=$(SYSTEM_JDK_DIR)/bin/pack200
 #end of exported autoconf copies
 
 # binary names
--- a/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/AdditionalJarsInMetaInfIndexList/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -2,10 +2,10 @@
 ARCHIVE_TEST_FOLDER=archive_tag_folder_test
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-KEYTOOL=$(BOOT_DIR)/bin/keytool
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+KEYTOOL=$(EXPORTED_KEYTOOL)
+JARSIGNER=$(EXPORTED_JARSIGNER)
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 # File used because the 'jar' command does not accept an empty file
 DUMMY_FILE=jar_dummy_content
@@ -43,7 +43,7 @@
 	# Sign some of the jars for the signed jar test
 	cd $(TMPDIR) ; \
 	for jar_to_sign in $(MAINCLASS_JAR_SIGNED) $(INDEX_JAR_SIGNED); do \
-	   $(BOOT_DIR)/bin/jarsigner -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS)  \
+	   $(EXPORTED_JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS)  \
 	   -keypass $(PRIVATE_KEYSTORE_PASS) "$$jar_to_sign" $(TEST_CERT_ALIAS)_signed   ; \
 	done
 	
--- a/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -5,8 +5,8 @@
 OUTER_FILE=AppletReferenceOutOfJar.class
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 TMPDIR:=$(shell mktemp -d)
 
--- a/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/ExtensionJnlpsInApplet/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -5,8 +5,8 @@
 ENTRYPOINT_CLASSES=ExtensionJnlpHelper ExtensionJnlpTestApplet
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 TMPDIR:=$(shell mktemp -d)
 
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -5,8 +5,8 @@
 ENTRYPOINT_CLASSES=JNLPClassLoaderDeadlock_1 JNLPClassLoaderDeadlock_2
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 TMPDIR:=$(shell mktemp -d)
 
--- a/tests/reproducers/custom/MixedSigningApplet/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/MixedSigningApplet/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -4,9 +4,9 @@
 ENTRYPOINT_CLASSES=MixedSigningApplet
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
+JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
 
 TMPDIR:=$(shell mktemp -d)
--- a/tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/MultipleSignaturesPerJar/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -1,11 +1,11 @@
 TESTNAME=MultipleSignaturesPerJar
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-KEYTOOL=$(BOOT_DIR)/bin/keytool
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
+KEYTOOL=$(EXPORTED_KEYTOOL)
+JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS) 
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 # Index jar causes main class jar to load
 
--- a/tests/reproducers/custom/PackGZip/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/PackGZip/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -1,10 +1,10 @@
 TESTNAME=PackGZip
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
-PACKER=$(BOOT_DIR)/bin/pack200
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
+JARSIGNER=$(EXPORTED_JARSIGNER)
+PACKER=$(EXPORTED_PACK200)
 
 TMPDIR:=$(shell mktemp -d)
 
--- a/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/PartiallySignedAppletManifestSpecifiesSandbox/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -4,9 +4,9 @@
 ENTRYPOINT_CLASSES=PartiallySignedAppletManifestSpecifiesSandboxHelper
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
+JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
 
 TMPDIR:=$(shell mktemp -d)
--- a/tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/SignedAppletCodebaseLoading/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -3,9 +3,9 @@
 SRC_FILES=SignedAppletCodebaseLoading.java SignedAppletCodebaseLoadingHelper.java
 
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
+JARSIGNER=$(EXPORTED_JARSIGNER)
 JARSIGNER_CMD=$(JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)
 
 TMPDIR:=$(shell mktemp -d)
--- a/tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/SignedAppletExternalMainClass/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -1,8 +1,8 @@
 TESTNAME=SignedAppletExternalMainClass
 
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JARSIGNER=$(EXPORTED_JARSIGNER)
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 TMPDIR:=$(shell mktemp -d)
 
@@ -13,7 +13,7 @@
 	
 	cd $(TMPDIR) ; \
 	$(JAR) cvf $(TESTNAME)Helper.jar $(TESTNAME)Helper.class ; \
-	$(BOOT_DIR)/bin/jarsigner -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS)  \
+	$(EXPORTED_JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS)  \
 	-keypass $(PRIVATE_KEYSTORE_PASS) "$(TMPDIR)/$(TESTNAME)Helper.jar" $(TEST_CERT_ALIAS)_signed   ; \
 	
 	cd $(TMPDIR); \
--- a/tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/TrustedOnlyAttribute/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -1,8 +1,8 @@
 TESTNAME=TrustedOnlyAttribute
 
-JARSIGNER=$(BOOT_DIR)/bin/jarsigner
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JARSIGNER=$(EXPORTED_JARSIGNER)
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 
 TMPDIR:=$(shell mktemp -d)
 
@@ -15,7 +15,7 @@
 	cd $(TMPDIR) ; \
 	$(JAR) cvfm $(TESTNAME)Signed.jar MANIFEST.MF $(TESTNAME).class ; \
 	$(JAR) cvfm $(TESTNAME)Unsigned.jar MANIFEST.MF $(TESTNAME).class ; \
-	$(BOOT_DIR)/bin/jarsigner -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS)  \
+	$(EXPORTED_JARSIGNER) -keystore $(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME) -storepass  $(PRIVATE_KEYSTORE_PASS)  \
 	-keypass $(PRIVATE_KEYSTORE_PASS) "$(TMPDIR)/$(TESTNAME)Signed.jar" $(TEST_CERT_ALIAS)_signed ; \
 	
 	cd $(TMPDIR); \
--- a/tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile	Thu Jul 30 14:01:59 2015 +0200
+++ b/tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile	Thu Jul 30 14:06:57 2015 +0200
@@ -1,8 +1,8 @@
 TESTNAME=UnsignedContentInMETAINF
 JAVAC_CLASSPATH=$(TEST_EXTENSIONS_DIR):$(NETX_DIR)/lib/classes.jar
 DEPLOY_DIR=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
-JAVAC=$(BOOT_DIR)/bin/javac
-JAR=$(BOOT_DIR)/bin/jar
+JAVAC=$(EXPORTED_JAVAC)
+JAR=$(EXPORTED_JAR)
 ABS_SRC_PATH=$(REPRODUCERS_TESTS_SRCDIR)/custom/$(TESTNAME)/srcs
 
 prepare-reproducer: