mirror of https://github.com/rusefi/bldc.git
[Make][Windows] Replace `pwsh` by `powershell`
This calls the "Powershell for Windows" instead of the "MS Powershell" console.
This commit is contained in:
parent
1076356d09
commit
37068c70a9
|
@ -3,7 +3,7 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
HALCONF := $(strip $(shell pwsh -noprofile -command cat halconf.h | findstr -i define))
|
HALCONF := $(strip $(shell powershell -noprofile -command cat halconf.h | findstr -i define))
|
||||||
else
|
else
|
||||||
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define"))
|
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define"))
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
HALCONF := $(strip $(shell pwsh -noprofile -command cat halconf.h | findstr -i define))
|
HALCONF := $(strip $(shell powershell -noprofile -command cat halconf.h | findstr -i define))
|
||||||
else
|
else
|
||||||
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define"))
|
HALCONF := $(strip $(shell cat halconf.h | egrep -e "define"))
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
CHCONF := $(strip $(shell pwsh -noprofile -command cat chconf.h | findstr -i define))
|
CHCONF := $(strip $(shell powershell -noprofile -command cat chconf.h | findstr -i define))
|
||||||
else
|
else
|
||||||
CHCONF := $(strip $(shell cat chconf.h | egrep -e "define")),
|
CHCONF := $(strip $(shell cat chconf.h | egrep -e "define")),
|
||||||
endif
|
endif
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -174,7 +174,7 @@ fw_$(1)_clean:
|
||||||
ifneq ($(OSFAMILY), windows)
|
ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) [ ! -d "$(BUILD_DIR)/$(1)" ] || $(RM) -r "$(BUILD_DIR)/$(1)"
|
$(V1) [ ! -d "$(BUILD_DIR)/$(1)" ] || $(RM) -r "$(BUILD_DIR)/$(1)"
|
||||||
else
|
else
|
||||||
$(V1) pwsh -noprofile -command if (Test-Path $(BUILD_DIR)/$(1)) {Remove-Item -Recurse $(BUILD_DIR)/$(1)}
|
$(V1) powershell -noprofile -command if (Test-Path $(BUILD_DIR)/$(1)) {Remove-Item -Recurse $(BUILD_DIR)/$(1)}
|
||||||
endif
|
endif
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -228,7 +228,7 @@ all_fw_package: all_fw all_fw_package_clean
|
||||||
ifneq ($(OSFAMILY), windows)
|
ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) $(RM) $(BUILD_CRUFT)
|
$(V1) $(RM) $(BUILD_CRUFT)
|
||||||
else
|
else
|
||||||
$(V1) pwsh -noprofile -command {Remove-Item $(BUILD_CRUFT)}
|
$(V1) powershell -noprofile -command {Remove-Item $(BUILD_CRUFT)}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: all_fw_package_clean
|
.PHONY: all_fw_package_clean
|
||||||
|
@ -237,7 +237,7 @@ all_fw_package_clean:
|
||||||
ifneq ($(OSFAMILY), windows)
|
ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) [ ! -d "$(ROOT_DIR)/package/" ] || $(RM) -rf $(ROOT_DIR)/package/*
|
$(V1) [ ! -d "$(ROOT_DIR)/package/" ] || $(RM) -rf $(ROOT_DIR)/package/*
|
||||||
else
|
else
|
||||||
$(V1) pwsh -noprofile -command if (Test-Path $(ROOT_DIR)/package/*) {Remove-Item -Recurse $(ROOT_DIR)/package/*}
|
$(V1) powershell -noprofile -command if (Test-Path $(ROOT_DIR)/package/*) {Remove-Item -Recurse $(ROOT_DIR)/package/*}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) tar -C $(TOOLS_DIR) -xjf "$(DL_DIR)/$(ARM_SDK_FILE)"
|
$(V1) tar -C $(TOOLS_DIR) -xjf "$(DL_DIR)/$(ARM_SDK_FILE)"
|
||||||
else
|
else
|
||||||
$(V1) curl --continue - --location --insecure --output "$(DL_DIR)/$(ARM_SDK_FILE)" "$(ARM_SDK_URL)"
|
$(V1) curl --continue - --location --insecure --output "$(DL_DIR)/$(ARM_SDK_FILE)" "$(ARM_SDK_URL)"
|
||||||
$(V1) pwsh -noprofile -command Expand-Archive -DestinationPath $(ARM_SDK_DIR) -LiteralPath "$(DL_DIR)/$(ARM_SDK_FILE)"
|
$(V1) powershell -noprofile -command Expand-Archive -DestinationPath $(ARM_SDK_DIR) -LiteralPath "$(DL_DIR)/$(ARM_SDK_FILE)"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ arm_sdk_clean:
|
||||||
ifneq ($(OSFAMILY), windows)
|
ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) [ ! -d "$(ARM_SDK_DIR)" ] || $(RM) -r $(ARM_SDK_DIR)
|
$(V1) [ ! -d "$(ARM_SDK_DIR)" ] || $(RM) -r $(ARM_SDK_DIR)
|
||||||
else
|
else
|
||||||
$(V1) pwsh -noprofile -command if (Test-Path $(ARM_SDK_DIR)) {Remove-Item -Recurse $(ARM_SDK_DIR)}
|
$(V1) powershell -noprofile -command if (Test-Path $(ARM_SDK_DIR)) {Remove-Item -Recurse $(ARM_SDK_DIR)}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -96,7 +96,7 @@ qt_sdk_clean:
|
||||||
ifneq ($(OSFAMILY), windows)
|
ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) [ ! -d "$(QT_SDK_DIR)" ] || $(RM) -r $(QT_SDK_DIR)
|
$(V1) [ ! -d "$(QT_SDK_DIR)" ] || $(RM) -r $(QT_SDK_DIR)
|
||||||
else
|
else
|
||||||
$(V1) pwsh -noprofile -command if (Test-Path $(QT_SDK_DIR)) {Remove-Item -Recurse $(QT_SDK_DIR)}
|
$(V1) powershell -noprofile -command if (Test-Path $(QT_SDK_DIR)) {Remove-Item -Recurse $(QT_SDK_DIR)}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -168,7 +168,7 @@ qt_creator_clean: qt_creator_uninstall
|
||||||
ifneq ($(OSFAMILY), windows)
|
ifneq ($(OSFAMILY), windows)
|
||||||
$(V1) [ ! -d "$(QT_CREATOR_DIR)" ] || $(RM) -r $(QT_CREATOR_DIR)
|
$(V1) [ ! -d "$(QT_CREATOR_DIR)" ] || $(RM) -r $(QT_CREATOR_DIR)
|
||||||
else
|
else
|
||||||
$(V1) pwsh -noprofile -command if (Test-Path $(QT_CREATOR_DIR)) {Remove-Item -Recurse $(QT_CREATOR_DIR)}
|
$(V1) powershell -noprofile -command if (Test-Path $(QT_CREATOR_DIR)) {Remove-Item -Recurse $(QT_CREATOR_DIR)}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -45,4 +45,4 @@ export PYTHON
|
||||||
############################
|
############################
|
||||||
|
|
||||||
RM := del
|
RM := del
|
||||||
MKDIR := pwsh -noprofile -command New-Item -Force -itemtype "directory"
|
MKDIR := powershell -noprofile -command New-Item -Force -itemtype "directory"
|
||||||
|
|
Loading…
Reference in New Issue