From 19a93121a6b45a3236eeb2d0445b8b86b771fc85 Mon Sep 17 00:00:00 2001
From: Mehdi Khairy <mehdi.khairy@more-magic.org>
Date: Thu, 10 Jan 2019 23:57:35 +0100
Subject: [PATCH] Bug #171: Fixing build directory for Fuzzers 074

Signed-off-by: Mehdi Khairy <mehdi.khairy@more-magic.org>
---
 fuzzers/074-dump_all/Makefile               | 10 +++++-----
 fuzzers/074-dump_all/generate.sh            |  2 +-
 fuzzers/074-dump_all/generate_after_dump.sh | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fuzzers/074-dump_all/Makefile b/fuzzers/074-dump_all/Makefile
index 6b996115..da907200 100644
--- a/fuzzers/074-dump_all/Makefile
+++ b/fuzzers/074-dump_all/Makefile
@@ -1,16 +1,16 @@
 
 N := 1
-SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
+SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
 	true
 
 pushdb:
-	cp output/tile_type_*.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/
+	cp build/output/tile_type_*.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/
 	rm ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/tile_type_*_site_type_*.json
-	cp output/site_type_*.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/
-	cp output/tileconn.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/
+	cp build/output/site_type_*.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/
+	cp build/output/tileconn.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
@@ -23,7 +23,7 @@ run:
 	touch run.ok
 
 clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ output/ run.ok
+	rm -rf build run.ok
 
 .PHONY: database pushdb run clean
 
diff --git a/fuzzers/074-dump_all/generate.sh b/fuzzers/074-dump_all/generate.sh
index 71912e54..68c43d1f 100644
--- a/fuzzers/074-dump_all/generate.sh
+++ b/fuzzers/074-dump_all/generate.sh
@@ -2,6 +2,6 @@
 
 source ${XRAY_GENHEADER}
 
-${XRAY_VIVADO} -mode batch -source ../generate.tcl
+${XRAY_VIVADO} -mode batch -source $FUZDIR/generate.tcl
 
 cd .. && ./generate_after_dump.sh
diff --git a/fuzzers/074-dump_all/generate_after_dump.sh b/fuzzers/074-dump_all/generate_after_dump.sh
index 88841661..c67a8fb8 100755
--- a/fuzzers/074-dump_all/generate_after_dump.sh
+++ b/fuzzers/074-dump_all/generate_after_dump.sh
@@ -1,14 +1,14 @@
 #!/bin/bash -xe
 
-rm -rf output
-mkdir -p output
+rm -rf build/output
+mkdir -p build/output
 python3 reduce_tile_types.py \
-  --root_dir specimen_001/ \
-  --output_dir output
+  --root_dir build/specimen_001/ \
+  --output_dir build/output
 python3 create_node_tree.py \
-  --dump_all_root_dir specimen_001/ \
-  --ordered_wires_root_dir ../072-ordered_wires/specimen_001/ \
-  --output_dir output
-python3 reduce_site_types.py --output_dir output
-python3 generate_grid.py --root_dir specimen_001/ --output_dir output \
+  --dump_all_root_dir build/specimen_001/ \
+  --ordered_wires_root_dir ../072-ordered_wires/build/specimen_001/ \
+  --output_dir build/output
+python3 reduce_site_types.py --output_dir build/output
+python3 generate_grid.py --root_dir build/specimen_001/ --output_dir build/output \
   --ignored_wires ${XRAY_DATABASE}_ignored_wires.txt