rules: separate rule update and source code update

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/util/utils.mk

@@ -33,25 +33,38 @@ update_metadata:
 	cp -f $(REPORTS_DIR)/metadata.json \
 	      $(DESIGN_DIR)/metadata-$(FLOW_VARIANT)-ok.json
 
-.PHONY: update_rules
-update_rules:
+.PHONY: do-update_rules
+do-update_rules:
 	$(UTILS_DIR)/genRuleFile.py \
 	    --rules $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json \
-	    --new-rules $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json \
+	    --new-rules $(RESULTS_DIR)/rules-$(FLOW_VARIANT).json \
 		--reference $(REPORTS_DIR)/metadata.json \
 		--variant $(FLOW_VARIANT) \
 		--failing \
 		--tighten
 
-.PHONY: update_rules_force
-update_rules_force:
+.PHONY: do-copy_update_rules
+do-copy_update_rules:
+	cp -f $(RESULTS_DIR)/rules-$(FLOW_VARIANT).json \
+	      $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json
+
+.PHONY: update_rules
+update_rules: do-update_rules do-copy_update_rules
+
+.PHONY: do-update_rules_force
+do-update_rules_force:
 	$(UTILS_DIR)/genRuleFile.py \
 	    --rules $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json \
 	    --new-rules $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json \
 	    --reference $(REPORTS_DIR)/metadata.json \
 		--variant $(FLOW_VARIANT) \
 		--update
 
+.PHONY: update_rules_force
+update_rules_force: do-update_rules_force
+	cp -f $(RESULTS_DIR)/rules-$(FLOW_VARIANT).json \
+	      $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json
+
 .PHONY: update_metadata_autotuner
 update_metadata_autotuner:
 	@$(UTILS_DIR)/genMetrics.py -d $(DESIGN_NICKNAME) \