/hg/icedtea-web: Fixed error in reproducers source preparation

[jvanek at icedtea.classpath.org]

changeset c74bf4aa138c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c74bf4aa138c
author: Jiri Vanek <jvanek at redhat.com>
date: Wed May 23 10:42:45 2012 +0200

	Fixed error in reproducers source preparation


diffstat:

 ChangeLog   |   7 +++++++
 Makefile.am |  32 +++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diffs (57 lines):

diff -r c367faabd08e -r c74bf4aa138c ChangeLog
--- a/ChangeLog	Tue May 22 14:19:50 2012 -0400
+++ b/ChangeLog	Wed May 23 10:42:45 2012 +0200
@@ -1,3 +1,10 @@
+2012-05-23  Jiri Vanek  <jvanek at redhat.com>
+
+	Fixed error in reproducers source preparation
+	* Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) removed
+	inappropriately used quotes when copying notSrcFiles. Source files now
+	copied only if src dir exists in reproducer
+
 2012-05-22  Adam Domurad  <adomurad at redhat.com>
 
         Changed allocation of small, fixed-size buffers to stack-based 
diff -r c367faabd08e -r c74bf4aa138c Makefile.am
--- a/Makefile.am	Tue May 22 14:19:50 2012 -0400
+++ b/Makefile.am	Wed May 23 10:42:45 2012 +0200
@@ -508,22 +508,24 @@
 	  for dir in "$${simpleReproducers[@]}" ; do \
 	    echo "processing: $$dir" ; \
 	    mkdir -p "$(JNLP_TESTS_DIR)/$$dir" ; \
-	    d=`pwd` ; \
-	    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 ; \
-	    if [ -n "$$notSrcFiles" ] ; then \
-	      cp -R --parents "$$notSrcFiles" "$(JNLP_TESTS_DIR)/$$dir/" ; \
-	    fi ; \
-	    cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
-	    if [ -f $(META_MANIFEST) ]; \
-	    then \
-	      $(BOOT_DIR)/bin/jar cfm "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
-	    else \
-	      $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+	    if [ -e "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
+	      d=`pwd` ; \
+	      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 ; \
+	      if [ -n "$$notSrcFiles" ] ; then \
+	        cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \
+	      fi ; \
+	      cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
+	      if [ -f $(META_MANIFEST) ]; \
+	      then \
+	        $(BOOT_DIR)/bin/jar cfm "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
+	      else \
+	        $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+	      fi; \
+	      cd "$$d" ; \
 	    fi; \
-	    cd "$$d" ; \
 	    cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"*  $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
 	  done ; \
 	done ; \