diff options
| author | Jiri Vanek <[email protected]> | 2012-09-24 16:57:08 +0200 |
|---|---|---|
| committer | Jiri Vanek <[email protected]> | 2012-09-24 16:57:08 +0200 |
| commit | fc1ee10f943727271803fd3d4b33265175faa703 (patch) | |
| tree | dba020f2cae940d77f9b45bbe134266c7e484511 | |
| parent | 213d115df151044458968274cca3352d81e6da93 (diff) | |
Reproducers are now correctly compiled against liveconect(plugin.jar)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2012-09-24 Jiri Vanek <[email protected]> + Jana Fabrikova <[email protected]> + + 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 <[email protected]> PR1161: X509VariableTrustManager does not work correctly with OpenJDK7 diff --git a/Makefile.am b/Makefile.am index 37324ac..16337c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -535,7 +535,7 @@ stamps/junit-jnlp-dist-signed.stamp: 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 @@ stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs 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 ; \ |