From 24688a02bc2701306aff75902964c3615d3f6cbd Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 25 Jan 2022 09:35:18 +0100 Subject: refactor(makefile): better powershell handling - add missing $(MKDIR) variable - create a simple function to allow running `make clean` without an error if a file doesn't exist --- scripts/compile_parsers.makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/compile_parsers.makefile b/scripts/compile_parsers.makefile index e03a6c5ea..a3d495885 100644 --- a/scripts/compile_parsers.makefile +++ b/scripts/compile_parsers.makefile @@ -10,15 +10,16 @@ DEST_DIR ?= ./dest ifeq ($(OS),Windows_NT) SHELL := powershell.exe - .SHELLFLAGS := -NoProfile - RM := Remove-Item -Force - CP := Copy-Item -Recurse - MKDIR := New-Item -ItemType directory + .SHELLFLAGS := -NoProfile -command + CP := Copy-Item -Recurse -ErrorAction SilentlyContinue + MKDIR := New-Item -ItemType directory -ErrorAction SilentlyContinue TARGET := parser.dll + rmf = Write-Output $(1) | foreach { if (Test-Path $$_) { Remove-Item -Force } } else - RM := rm -rf CP := cp + MKDIR := mkdir -p TARGET := parser.so + rmf = rm -rf $(1) endif ifneq ($(wildcard src/*.cc),) @@ -39,13 +40,12 @@ $(TARGET): $(OBJECTS) $(CC) -c $(CXXFLAGS) -I$(SRC_DIR) -o $@ $< clean: - $(foreach file, $(OBJECTS), $(RM) $(file)) - $(RM) $(TARGET) + $(call rmf,$(TARGET) $(OBJECTS)) $(DEST_DIR): - test -d $(DEST_DIR) || $(MKDIR) $(DEST_DIR) + @$(MKDIR) $(DEST_DIR) install: $(TARGET) $(DEST_DIR) - $(CP) $^ $(DEST_DIR) + $(CP) $(TARGET) $(DEST_DIR)/ .PHONY: clean -- cgit v1.2.3-70-g09d2