/hg/icedtea-web: Reproducers are now correctly compiled against ...

[jvanek at icedtea.classpath.org]

changeset 97280ecda136 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=97280ecda136
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Sep 24 16:57:08 2012 +0200

	Reproducers are now correctly compiled against liveconect(plugin.jar)


diffstat:

 ChangeLog   |  8 ++++++++
 Makefile.am |  4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 9d46cc3428eb -r 97280ecda136 ChangeLog
--- a/ChangeLog	Mon Sep 17 16:40:25 2012 -0400
+++ b/ChangeLog	Mon Sep 24 16:57:08 2012 +0200
@@ -1,3 +1,11 @@
+2012-09-24  Jiri Vanek <jvanek at redhat.com>
+            Jana Fabrikova <jfabriko at redhat.com>
+
+	Reproducers are now correctly compiled against liveconect(plugin.jar)
+	* Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp)
+	added one more dependency: stamps/liveconnect-dist.stamp
+	added one more directory on cp: $(abs_top_builddir)/liveconnect 
+
 2012-09-17  Deepak Bhole <dbhole at redhat.com>
 
 	PR1161: X509VariableTrustManager does not work correctly with OpenJDK7
diff -r 9d46cc3428eb -r 97280ecda136 Makefile.am
--- a/Makefile.am	Mon Sep 17 16:40:25 2012 -0400
+++ b/Makefile.am	Mon Sep 24 16:57:08 2012 +0200
@@ -535,7 +535,7 @@
 	mkdir -p stamps && \
 	touch $@
 
-stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
+stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp
 	types=($(ALL_NONCUSTOM_REPRODUCERS)); \
 	for which in "$${types[@]}" ; do \
 	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
@@ -549,7 +549,7 @@
 	      cd "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ; \
 	      srcFiles=`find . -mindepth 1 -type f -name "*.java" | sed "s/.\/*//"` ; \
 	      notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
-	      $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \
+	      $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \
 	      if [ -n "$$notSrcFiles" ] ; then \
 	        cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \
 	      fi ; \