luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up Makefile dependences. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2020-02-18 18:47:17 -08:00
parent ceb5b2679b
commit 1f22d60160
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -175,20 +175,20 @@ db-extras-artix7-harness:
+source minitests/roi_harness/arty-uart.sh && $(MAKE) -C fuzzers roi_only +source minitests/roi_harness/arty-uart.sh && $(MAKE) -C fuzzers roi_only
+source minitests/roi_harness/basys3-swbut.sh && \ +source minitests/roi_harness/basys3-swbut.sh && \
$(MAKE) -C minitests/roi_harness \ $(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut run HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut copy
+source minitests/roi_harness/basys3-swbut.sh && \ +source minitests/roi_harness/basys3-swbut.sh && \
$(MAKE) -C minitests/roi_harness \ $(MAKE) -C minitests/roi_harness \
XRAY_ROIV=../roi_base_div2.v \ XRAY_ROIV=../roi_base_div2.v \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut_50 run HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut_50 copy
+source minitests/roi_harness/arty-uart.sh && \ +source minitests/roi_harness/arty-uart.sh && \
$(MAKE) -C minitests/roi_harness \ $(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/uart run HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/uart copy
+source minitests/roi_harness/arty-pmod.sh && \ +source minitests/roi_harness/arty-pmod.sh && \
$(MAKE) -C minitests/roi_harness \ $(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/pmod run HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/pmod copy
+source minitests/roi_harness/arty-swbut.sh && \ +source minitests/roi_harness/arty-swbut.sh && \
$(MAKE) -C minitests/roi_harness \ $(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/swbut run HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/swbut copy
db-extras-kintex7-parts: db-extras-kintex7-parts:
@true @true

27
fuzzers/Makefile
View File

@ -19,6 +19,12 @@ clean_locks:
clean_piplists: clean_piplists:
rm -rf $(XRAY_FUZZERS_DIR)/piplist/build rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
fuzzer_ok:
mkdir -p fuzzer_ok
clean_fuzzers::
rm -rf fuzzer_ok
define fuzzer define fuzzer
# $(1) - Fuzzer name/directory # $(1) - Fuzzer name/directory
@ -48,12 +54,12 @@ ifeq ($(VERBOSE),Y)
# When verbose we just call make directory # When verbose we just call make directory
ifeq ($(3),Y) ifeq ($(3),Y)
$(1)/run.$(XRAY_PART).ok: $(addprefix fuzzer_, $(2)) $(1)/run.$(XRAY_PART).ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
$$(MAKE) -C $(1) run $$(MAKE) -C $(1) run
else else
$(1)/run.ok: $(addprefix fuzzer_, $(2)) $(1)/run.ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
$$(MAKE) -C $(1) run $$(MAKE) -C $(1) run
endif endif
@ -64,30 +70,33 @@ else
# to log files. # to log files.
ifeq ($(3),Y) ifeq ($(3),Y)
$(1)/run.$(XRAY_PART).ok: $(addprefix fuzzer_, $(2)) $(1)/run.$(XRAY_PART).ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
+@$(SELF_DIR)/run_fuzzer.py $(1) +@$(SELF_DIR)/run_fuzzer.py $(1)
else else
$(1)/run.ok: $(addprefix fuzzer_, $(2)) $(1)/run.ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
+@$(SELF_DIR)/run_fuzzer.py $(1) +@$(SELF_DIR)/run_fuzzer.py $(1)
endif endif
endif endif
.PHONY:: fuzzer_$(1)
ifeq ($(3),Y) ifeq ($(3),Y)
fuzzer_$(1): $(1)/run.$(XRAY_PART).ok fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok: $(1)/run.$(XRAY_PART).ok fuzzer_ok
touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
else else
fuzzer_$(1): $(1)/run.ok fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok: $(1)/run.ok fuzzer_ok
touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
endif endif
.PHONY: fuzzer_$(1)
fuzzer_$(1): fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
endef endef
@ -177,4 +186,4 @@ roi_only: 000-init-db/run.${XRAY_PART}.ok 001-part-yaml/run.${XRAY_PART}.ok 075-
cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json
cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tileconn.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tileconn.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json
.PHONY:: all clean clean_fuzzers clean_logs quick part_only roi_only .PHONY: all clean clean_fuzzers clean_logs quick part_only roi_only

5
minitests/roi_harness/Makefile
View File

@ -14,9 +14,12 @@ $(BUILD_DIR)/run.ok: runme.sh runme.tcl
./runme.sh ./runme.sh
touch $(BUILD_DIR)/run.ok touch $(BUILD_DIR)/run.ok
copy: $(BUILD_DIR)/run.ok $(BUILD_DIR)/copy.ok: $(BUILD_DIR)/run.ok
mkdir -p $(HARNESS_DIR) mkdir -p $(HARNESS_DIR)
cp $(HARNESS_FILES) $(HARNESS_DIR) cp $(HARNESS_FILES) $(HARNESS_DIR)
touch $(BUILD_DIR)/copy.ok
copy: $(BUILD_DIR)/copy.ok
clean: clean:
rm -rf build_* harness_* rm -rf build_* harness_*