Don't clobber other parts build directories on run target.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2020-02-18 11:53:01 -08:00
parent d6e4c28323
commit 850d16fa02
8 changed files with 12 additions and 11 deletions

View File

@ -91,7 +91,7 @@ pushdb: $(DB_FILES_PATH) ${XRAY_FAMILY_DIR}/${XRAY_PART}
@true
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) pushdb
touch run.${XRAY_PART}.ok

View File

@ -1,7 +1,6 @@
N := 1
SPECIMENS := $(addprefix build_${XRAY_PART}/specimen_,$(shell seq -f '%03.0f' $(N)))
BUILD_DIR = build_${XRAY_PART}
SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
database: $(SPECIMENS)
mkdir -p $(BUILD_DIR)
@ -21,7 +20,7 @@ pushdb:
cp $(BUILD_DIR)/${XRAY_PART}_required_features.fasm ${XRAY_FAMILY_DIR}/${XRAY_PART}/required_features.fasm 2>/dev/null || true
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) database
$(MAKE) pushdb
touch run.${XRAY_PART}.ok

View File

@ -133,7 +133,8 @@ $(BUILD_FOLDER)/tilegrid.json: generate_full.py $(BUILD_FOLDER)/tilegrid_tdb.jso
cd $(BUILD_FOLDER) && python3 ${FUZDIR}/generate_full.py \
--json-in tilegrid_tdb.json --json-out ${BUILD_DIR}/tilegrid.json
run:
$(MAKE) clean
find -name $(BUILD_FOLDER) -exec rm -rf {} \;
find -name run.${XRAY_PART}.ok -delete
$(MAKE) database
$(MAKE) pushdb
touch run.${XRAY_PART}.ok

View File

@ -14,7 +14,7 @@ $(SPECIMENS_OK):
touch $@
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) database
$(MAKE) pushdb
touch run.${XRAY_PART}.ok

View File

@ -1,6 +1,7 @@
N := 1
SPECIMENS := $(addprefix build_${XRAY_PART}/specimen_,$(shell seq -f '%03.0f' $(N)))
BUILD_DIR = build_${XRAY_PART}
SPECIMENS := $(addprefix $(BUILD_DIR)/specimen_,$(shell seq -f '%03.0f' $(N)))
SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
MAX_VIVADO_PROCESS ?= 4
MAX_PIPS_INSTANCE ?= 340000
@ -16,7 +17,7 @@ $(SPECIMENS_OK):
touch $@
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) database
$(MAKE) pushdb
touch run.${XRAY_PART}.ok

View File

@ -15,7 +15,7 @@ $(SPECIMENS_OK):
touch $@
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) database
$(MAKE) pushdb
touch run.${XRAY_PART}.ok

View File

@ -21,7 +21,7 @@ $(SPECIMENS_OK):
touch $@
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) database
$(MAKE) pushdb
# Clean up intermediate files after successful pushdb.

View File

@ -14,7 +14,7 @@ $(SPECIMENS_OK):
touch $@
run:
$(MAKE) clean
rm -rf $(BUILD_DIR) run.${XRAY_PART}.ok
$(MAKE) database
$(MAKE) pushdb
touch run.$(XRAY_PART).ok