diff options
| author | Jiri Vanek <[email protected]> | 2012-05-23 10:42:45 +0200 |
|---|---|---|
| committer | Jiri Vanek <[email protected]> | 2012-05-23 10:42:45 +0200 |
| commit | c64bbb3a37a2dfd546707ea1eef37b48e99df49d (patch) | |
| tree | a2c8fec1b7258c32799530f711ea3cbe6b490317 /Makefile.am | |
| parent | 83f9d2e9dd57aac518b2284c9625547cd4f8fd91 (diff) | |
Fixed error in reproducers source preparation
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 5ee18c7..5d14eb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -508,22 +508,24 @@ stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs 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 ; \ |