Merge pull request #290 from neuromore/master

Version 1.7.2
neuromore · Jul 6, 2023 · 1346b3d · 1346b3d
2 parents 58c28bd + d1d3952
commit 1346b3d
Show file tree

Hide file tree

Showing 60 changed files with 1,074 additions and 561 deletions.
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
@@ -267,7 +267,7 @@ jobs:
         APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
         APPLE_APPSPEC_PASS: ${{ secrets.APPLE_APPSPEC_PASS }}
         APPLE_DIST_STORE: true
-        APPLE_UPLOAD_STORE: startsWith(github.ref, 'refs/tags/1.') || startsWith(github.ref, 'refs/tags/2.')
+        APPLE_UPLOAD_STORE: ${{ startsWith(github.ref, 'refs/tags/1.') || startsWith(github.ref, 'refs/tags/2.') }}
       run: make dist
 
     # Upload

diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
@@ -142,6 +142,10 @@ jobs:
     env:
       BRANDING: ${{ matrix.branding }}
     steps:
+
+    # Install WIX
+    - name: Install WIX
+      run: dotnet tool install --global wix --version 4.0.1
 
     # Checkout
     - name: Checkout
@@ -213,13 +217,13 @@ jobs:
       run: |
         fsutil volume diskfree d:
     
-    # Upload ZIP
-    - name: Upload ZIP
+    # Upload MSI
+    - name: Upload MSI
       uses: actions/upload-artifact@v3
       with:
-        name: Packages ZIP (${{ matrix.os }}-${{ matrix.branding }})
+        name: Packages MSI (${{ matrix.os }}-${{ matrix.branding }})
         path: |
-          ./dist/win-10/*.zip
+          ./dist/win-10/*.msi
 
     # Upload Packages
     - name: Upload App
@@ -236,4 +240,4 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/') && (matrix.branding == 'neuromore')
       with:
         token: ${{ secrets.PAT_GITHUB_ACTIONS }}
-        files: ./dist/win-10/*.zip
+        files: ./dist/win-10/*.msi
diff --git a/build/make/Engine.mk b/build/make/Engine.mk
@@ -410,9 +410,9 @@ build: pch $(OBJS) $(OBJSPRIV)
 	$(AR) $(ARFLAGS) $(LIBDIR)/$(NAME)$(SUFFIX)$(EXTLIB) $(OBJS) $(OBJSPRIV)
 
 clean:
-	$(call deletefiles,$(OBJDIR),*.o)
-	$(call deletefiles,$(OBJDIR),*.op)
-	$(call deletefiles,$(OBJDIR),$(PCH).pch)
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTLIB))
+	-$(call deletefiles,$(OBJDIR),*.o)
+	-$(call deletefiles,$(OBJDIR),*.op)
+	-$(call deletefiles,$(OBJDIR),$(PCH).pch)
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTLIB))
 
 .DEFAULT_GOAL := build
diff --git a/build/make/EngineJNI.mk b/build/make/EngineJNI.mk
@@ -192,8 +192,8 @@ build: $(OBJDIR)/neuromoreEngine.o $(OBJS) $(JOBJS)
 	$(JAR) cf $(LIBDIR)/$(NAME)$(SUFFIX).jar -C $(OBJDIR)/Java .
 
 clean:
-	$(call deletefiles,$(OBJDIR),*.o)
-	$(call deletefiles,$(OBJDIR),*.class)
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTDLL))
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTPDB))
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX).jar)
+	-$(call deletefiles,$(OBJDIR),*.o)
+	-$(call deletefiles,$(OBJDIR),*.class)
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTDLL))
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTPDB))
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX).jar)
diff --git a/build/make/EngineLIB.mk b/build/make/EngineLIB.mk
@@ -175,6 +175,6 @@ build: $(OBJDIR)/neuromoreEngine.o $(OBJS)
 	$(LINK) $(LINKFLAGS) $(LINKPATH) $(OBJDIR)/neuromoreEngine.o $(OBJS) $(LINKLIBS) -o $(LIBDIR)/$(NAME)$(SUFFIX)$(EXTDLL)
 
 clean:
-	$(call deletefiles,$(OBJDIR),*.o)
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTDLL))
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTPDB))
+	-$(call deletefiles,$(OBJDIR),*.o)
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTDLL))
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTPDB))
diff --git a/build/make/QtBase.mk b/build/make/QtBase.mk
@@ -538,19 +538,19 @@ build: pch $(PRES) $(OBLS)
 	$(AR) $(ARFLAGS) $(LIBDIR)/$(NAME)$(SUFFIX)$(EXTLIB) $(OBLS)
 
 clean:
-	$(call deletefiles,$(MOCDIR),*.cpp)
-	$(call deletefiles,$(MOCDIR),*.moc)
-	$(call deletefiles,$(MOCDIR),*.mocmm)
-	$(call deletefiles,$(RCCDIR),*.cpp)
-	$(call deletefiles,$(RCCDIR),*.cppp)
-	$(call deletefiles,$(UICDIR),*.h)
-	$(call deletefiles,$(OBJDIR),$(PCH).pch)
-	$(call deletefiles,$(OBJDIR),*.o)
-	$(call deletefiles,$(OBJDIR),*.op)
-	$(call deletefiles,$(OBJDIR),*.oc)
-	$(call deletefiles,$(OBJDIR),*.ocp)
-	$(call deletefiles,$(OBJDIR),*.omm)
-	$(call deletefiles,$(OBJDIR),*.ommp)
-	$(call deletefiles,$(OBJDIR),*.omoc)
-	$(call deletefiles,$(OBJDIR),*.orcc)
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTLIB))
+	-$(call deletefiles,$(MOCDIR),*.cpp)
+	-$(call deletefiles,$(MOCDIR),*.moc)
+	-$(call deletefiles,$(MOCDIR),*.mocmm)
+	-$(call deletefiles,$(RCCDIR),*.cpp)
+	-$(call deletefiles,$(RCCDIR),*.cppp)
+	-$(call deletefiles,$(UICDIR),*.h)
+	-$(call deletefiles,$(OBJDIR),$(PCH).pch)
+	-$(call deletefiles,$(OBJDIR),*.o)
+	-$(call deletefiles,$(OBJDIR),*.op)
+	-$(call deletefiles,$(OBJDIR),*.oc)
+	-$(call deletefiles,$(OBJDIR),*.ocp)
+	-$(call deletefiles,$(OBJDIR),*.omm)
+	-$(call deletefiles,$(OBJDIR),*.ommp)
+	-$(call deletefiles,$(OBJDIR),*.omoc)
+	-$(call deletefiles,$(OBJDIR),*.orcc)
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTLIB))
diff --git a/build/make/Studio.mk b/build/make/Studio.mk
@@ -393,6 +393,18 @@ DEFINES     := $(DEFINES) \
 OBJSPRIV    := $(OBJSPRIV)
 RCCHPRIV    := $(RCCHPRIV)
 RCCO        := $(RCCO)
+ifeq ($(TARGET_ARCH),x86)
+APPGUIDPLAT  = ba60729d-dace-4746-9c78-829d9b943f67
+endif
+ifeq ($(TARGET_ARCH),x64)
+APPGUIDPLAT  = 2bcdb126-dc80-42ba-985e-48836ce23193
+endif
+ifeq ($(TARGET_ARCH),arm)
+APPGUIDPLAT  = 9e9ffa9f-f21a-4125-bb87-bff0d2866af7
+endif
+ifeq ($(TARGET_ARCH),arm64)
+APPGUIDPLAT  = badb6403-11c5-4dd4-8964-9fda8a470314
+endif
 else
 include ../../priv/build/make/StudioBranding.mk
 endif
@@ -796,27 +808,27 @@ build: pch $(PRES) $(OBLS) $(RESO)
 	@-$(call copyfiles,$(BINDIRDEP)/*$(EXTDLL),$(BINDIR))
 
 clean:
-	$(call deletefiles,$(MOCDIR),*.cpp)
-	$(call deletefiles,$(MOCDIR),*.moc)
-	$(call deletefiles,$(MOCDIR),*.mocmm)
-	$(call deletefiles,$(RCCDIR),*.cpp)
-	$(call deletefiles,$(RCCDIR),*.cppp)
-	$(call deletefiles,$(UICDIR),*.h)
-	$(call deletefiles,$(OBJDIR),$(PCH).pch)
-	$(call deletefiles,$(OBJDIR),*.o)
-	$(call deletefiles,$(OBJDIR),*.op)
-	$(call deletefiles,$(OBJDIR),*.oc)
-	$(call deletefiles,$(OBJDIR),*.ocp)
-	$(call deletefiles,$(OBJDIR),*.omm)
-	$(call deletefiles,$(OBJDIR),*.ommp)
-	$(call deletefiles,$(OBJDIR),*.omoc)
-	$(call deletefiles,$(OBJDIR),*.orcc)
-	$(call deletefiles,$(OBJDIR),*.res)
-	$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTLIB))
-	$(call deletefiles,$(BINDIR),$(NAME)$(SUFFIX)$(EXTLIB))
-	$(call deletefiles,$(BINDIR),$(NAME)$(SUFFIX)$(EXTBIN))
-	$(call deletefiles,$(BINDIR),$(NAME)$(SUFFIX)$(EXTPDB))
-	$(call deletefiles,$(BINDIR),*.$(EXTDLL))
+	-$(call deletefiles,$(MOCDIR),*.cpp)
+	-$(call deletefiles,$(MOCDIR),*.moc)
+	-$(call deletefiles,$(MOCDIR),*.mocmm)
+	-$(call deletefiles,$(RCCDIR),*.cpp)
+	-$(call deletefiles,$(RCCDIR),*.cppp)
+	-$(call deletefiles,$(UICDIR),*.h)
+	-$(call deletefiles,$(OBJDIR),$(PCH).pch)
+	-$(call deletefiles,$(OBJDIR),*.o)
+	-$(call deletefiles,$(OBJDIR),*.op)
+	-$(call deletefiles,$(OBJDIR),*.oc)
+	-$(call deletefiles,$(OBJDIR),*.ocp)
+	-$(call deletefiles,$(OBJDIR),*.omm)
+	-$(call deletefiles,$(OBJDIR),*.ommp)
+	-$(call deletefiles,$(OBJDIR),*.omoc)
+	-$(call deletefiles,$(OBJDIR),*.orcc)
+	-$(call deletefiles,$(OBJDIR),*.res)
+	-$(call deletefiles,$(LIBDIR),$(NAME)$(SUFFIX)$(EXTLIB))
+	-$(call deletefiles,$(BINDIR),$(NAME)$(SUFFIX)$(EXTLIB))
+	-$(call deletefiles,$(BINDIR),$(NAME)$(SUFFIX)$(EXTBIN))
+	-$(call deletefiles,$(BINDIR),$(NAME)$(SUFFIX)$(EXTPDB))
+	-$(call deletefiles,$(BINDIR),*.$(EXTDLL))
 
 ################################################################################################
 

diff --git a/deps/build/make/platforms/dist.mk b/deps/build/make/platforms/dist.mk
@@ -65,18 +65,21 @@ dist-prep:
 	chcp 1252
 	echo [PUB] $(PUBLISHER)
 	echo [PFX] $(SIGN_PFX_FILE)
+	echo [RMD] $(DISTDIR)/$(NAME)
+	-$(call rmdir,$(DISTDIR)/$(NAME))
+	-$(call deletefiles,$(DISTDIR),$(NAME)*.zip)
+	-$(call deletefiles,$(DISTDIR),$(NAME)*.msi)
+	-$(call deletefiles,$(DISTDIR),$(NAME)*.wixpdb)
+	-$(call deletefiles,$(DISTDIR),$(NAME)*.appx)
+	-$(call deletefiles,$(DISTDIR),$(NAME)*.appxbundle)
+	-$(call deletefiles,$(DISTDIR),$(NAME)*.appxupload)
 	echo [MKD] $(DISTDIR)/$(NAME)
-	$(call rmdir,$(DISTDIR)/$(NAME))
-	$(call deletefiles,$(DISTDIR),$(NAME)*.zip)
-	$(call deletefiles,$(DISTDIR),$(NAME)*.appx)
-	$(call deletefiles,$(DISTDIR),$(NAME)*.appxbundle)
-	$(call deletefiles,$(DISTDIR),$(NAME)*.appxupload)
-	$(call mkdir,$(DISTDIR)/$(NAME))
-	$(call mkdir,$(DISTDIR)/$(NAME)/resources)
-	$(call mkdir,$(DISTDIR)/$(NAME)/upload)
-	$(call mkdir,$(DISTDIR)/$(NAME)/x64)
-	$(call mkdir,$(DISTDIR)/$(NAME)/x86)
-	$(call mkdir,$(DISTDIR)/$(NAME)/arm64)
+	-$(call mkdir,$(DISTDIR)/$(NAME))
+	-$(call mkdir,$(DISTDIR)/$(NAME)/resources)
+	-$(call mkdir,$(DISTDIR)/$(NAME)/upload)
+	-$(call mkdir,$(DISTDIR)/$(NAME)/x64)
+	-$(call mkdir,$(DISTDIR)/$(NAME)/x86)
+	-$(call mkdir,$(DISTDIR)/$(NAME)/arm64)
 	$(call copyfiles,$(DISTDIR)/$(NAME).appxmanifest,$(DISTDIR)/$(NAME)/AppxManifest.xml)
 	$(call replace,$(DISTDIR)/$(NAME)/AppxManifest.xml,{PUBLISHER},$(PUBLISHER),$(DISTDIR)/$(NAME)/AppxManifest.xml)
 	$(call replace,$(DISTDIR)/$(NAME)/AppxManifest.xml,{PUBLISHERID},$(PUBLISHERID),$(DISTDIR)/$(NAME)/AppxManifest.xml)
@@ -91,37 +94,38 @@ dist-prep:
 	$(call copyfiles,$(APPICON)-44x44.png,$(DISTDIR)/$(NAME)/resources/app-44x44.png)
 	$(call copyfiles,$(APPICON)-50x50.png,$(DISTDIR)/$(NAME)/resources/app-50x50.png)
 	$(call copyfiles,$(APPICON)-150x150.png,$(DISTDIR)/$(NAME)/resources/app-150x150.png)
+	$(call copyfiles,$(APPICON).ico,$(DISTDIR)/$(NAME)/resources/app.ico)
 dist-vis-%: dist-prep
 	echo [VIS] $*
 	$(call mkdir,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/)
 	$(call copyfiles,$(DISTDIR)/../../visualizations/$*/Info.json,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/)
 	$(call copyfiles,$(DISTDIR)/../../visualizations/$*/Thumbnail.png,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/)
-	$(call copyfilesrecursive,$(DISTDIR)/../../visualizations/$*/win-x64/*,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/)
+	-$(call copyfilesrecursive,$(DISTDIR)/../../visualizations/$*/win-x64/*,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/)
 	$(call sleep,3)
 ifeq ($(SIGN_PFX_PASS),)
-	$(call sign,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE))
+	-$(call sign,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE))
 else
-	$(call signp,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
+	-$(call signp,$(DISTDIR)/$(NAME)/x64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
 endif
 	$(call mkdir,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/)
 	$(call copyfiles,$(DISTDIR)/../../visualizations/$*/Info.json,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/)
 	$(call copyfiles,$(DISTDIR)/../../visualizations/$*/Thumbnail.png,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/)
-	$(call copyfilesrecursive,$(DISTDIR)/../../visualizations/$*/win-x86/*,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/)
+	-$(call copyfilesrecursive,$(DISTDIR)/../../visualizations/$*/win-x86/*,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/)
 	$(call sleep,3)
 ifeq ($(SIGN_PFX_PASS),)
-	$(call sign,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE))
+	-$(call sign,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE))
 else
-	$(call signp,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
+	-$(call signp,$(DISTDIR)/$(NAME)/x86/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
 endif
 	$(call mkdir,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/)
 	$(call copyfiles,$(DISTDIR)/../../visualizations/$*/Info.json,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/)
 	$(call copyfiles,$(DISTDIR)/../../visualizations/$*/Thumbnail.png,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/)
-	$(call copyfilesrecursive,$(DISTDIR)/../../visualizations/$*/win-arm64/*,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/)
+	-$(call copyfilesrecursive,$(DISTDIR)/../../visualizations/$*/win-arm64/*,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/)
 	$(call sleep,3)
 ifeq ($(SIGN_PFX_PASS),)
-	$(call sign,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE))
+	-$(call sign,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE))
 else
-	$(call signp,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
+	-$(call signp,$(DISTDIR)/$(NAME)/arm64/Visualizations/$*/$*.exe,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
 endif
 dist-dll-x64: dist-prep
 	echo [DLL] Copy X64 DLL
@@ -142,7 +146,6 @@ dist-dll-arm64: dist-prep
 	echo [DLL] Copy ARM64 DLL
 dist-bin-%: dist-prep dist-dll-%
 	echo [BIN] $(DISTDIR)/$(NAME)/$*
-	$(call mkdir,$(DISTDIR)/$(NAME)/$*)
 	$(call copyfiles,./bin/win-$*/$(NAME)$(EXTBIN),$(DISTDIR)/$(NAME)/$*/$(NAME)$(EXTBIN))
 	$(call copyfiles,./bin/win-$*/$(NAME)$(EXTPDB),$(DISTDIR)/$(NAME)/$*/$(NAME)$(EXTPDB))
 	$(call sleep,3)
@@ -157,8 +160,26 @@ endif
 	echo [SYM] $(DISTDIR)/$(NAME)/upload/$(NAME)-$*.appxsym
 	$(ZIPPER) $(DISTDIR)/$(NAME)/upload/$(NAME)-$*.appxsym.zip $(DISTDIR)/$(NAME)/$*/$(NAME)$(EXTPDB)	
 	$(call move,$(DISTDIR)/$(NAME)/upload/$(NAME)-$*.appxsym.zip,$(DISTDIR)/$(NAME)/upload/$(NAME)-$*.appxsym)
-	echo [ZIP] $(DISTDIR)/$(NAME)-$(VERSION3)-win-10-$*.zip
-	$(ZIPPER) $(DISTDIR)/$(NAME)-$(VERSION3)-win-10-$*.zip $(DISTDIR)/$(NAME)/$*/*
+	echo [MSI] $(DISTDIR)/$(NAME)-$(VERSION3)-win-10-$*.msi
+	powershell -command "& { \
+	  Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass; \
+	  . $(DISTDIR)/Harvest.ps1 -in $(DISTDIR)/$(NAME).wxs -out $(DISTDIR)/$(NAME)/MSI.$*.wxs -path $(DISTDIR)/$(NAME)/$*; }"  
+	wix extension add WixToolset.Firewall.wixext
+	wix build -arch $* \
+	  -ext WixToolset.Firewall.wixext \
+	  -d APPNAME="$(APPNAME)" \
+	  -d APPSHORTNAME="$(APPSHORTNAME)" \
+	  -d APPGUIDPLAT="$(APPGUIDPLAT)" \
+	  -d APPCOMPANY="$(APPCOMPANY)" \
+	  -d VERSION=$(VERSION4) \
+	  -b $(DISTDIR)/$(NAME) \
+	  $(DISTDIR)/$(NAME)/MSI.$*.wxs \
+	  -out $(DISTDIR)/$(NAME)-$(VERSION3)-win-10-$*.msi
+ifeq ($(SIGN_PFX_PASS),)
+	$(call sign,$(DISTDIR)/$(NAME)-$(VERSION3)-win-10-$*.msi,$(SIGN_PFX_FILE))
+else
+	$(call signp,$(DISTDIR)/$(NAME)-$(VERSION3)-win-10-$*.msi,$(SIGN_PFX_FILE),$(SIGN_PFX_PASS))
+endif
 dist: dist-prep dist-vis dist-bin-x64 dist-bin-x86 dist-bin-arm64
 	echo [BDL] $(DISTDIR)/$(NAME)-$(VERSION3)-win-10.appxbundle
 	$(call makepkg,$(DISTDIR)/$(NAME)/Layout.xml,$(DISTDIR))

diff --git a/deps/build/make/platforms/win-all.mk b/deps/build/make/platforms/win-all.mk
@@ -2,27 +2,27 @@
 
 # Delete Files in Folder by Pattern
 define deletefiles
-	cmd.exe /C "del /s /q $(subst /,\,$(1))\$(2) >nul 2>&1" & exit 0
+	powershell "Remove-Item $(1)/$(2) -Force"
 endef
 
 # Copy Files between Folders by Pattern
 define copyfiles
-	cmd.exe /C "copy /Y $(subst /,\,$(1)) $(subst /,\,$(2)) >nul 2>&1" & exit 0
+	powershell "Copy-Item $(1) -Destination $(2) -Force"
 endef
 
 # Copy Files recursively
 define copyfilesrecursive
-	cmd.exe /C "xcopy /Y /E /H $(subst /,\,$(1)) $(subst /,\,$(2)) >nul 2>&1" & exit 0
+	powershell "Copy-Item $(1) -Destination $(2) -Force -Recurse"
 endef
 
 # Recursively remove folder
-define rmdir	
-	cmd.exe /C "if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1)) >nul 2>&1"
+define rmdir
+	powershell "Remove-Item $(1) -Force -Recurse"
 endef
 
 # Create folder and all sub folders
 define mkdir
-	cmd.exe /C "if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) >nul 2>&1"
+	powershell "New-Item $(1) -ItemType Directory -Force"
 endef
 
 # Replace string occurrences in file
@@ -32,40 +32,40 @@ endef
 
 # Create APPX unencrypted
 define makepkg
-	cmd.exe /C "MakeAppx.exe build /o /h SHA256 /f $(subst /,\,$(1)) /op $(subst /,\,$(2))"
+	MakeAppx.exe build /o /h SHA256 /f $(subst /,\,$(1)) /op $(subst /,\,$(2))
 endef
 
 # Create APPXBUNDLE
 define makebundle
-	cmd.exe /C "MakeAppx.exe bundle /o /d $(subst /,\,$(1)) /p $(subst /,\,$(2)) >nul 2>&1"
+	MakeAppx.exe bundle /o /d $(subst /,\,$(1)) /p $(subst /,\,$(2))
 endef
 
 # Sign File with pfx without password
 define sign
-	cmd.exe /C "if exist $(subst /,\,$(1)) SignTool.exe sign /a /fd SHA256 /td SHA256 /tr http://timestamp.digicert.com /f $(subst /,\,$(2)) $(subst /,\,$(1)) >nul 2>&1"
+	SignTool.exe sign /a /fd SHA256 /td SHA256 /tr http://timestamp.digicert.com /f $(subst /,\,$(2)) $(subst /,\,$(1))
 endef
 
 # Sign File with pfx with password
 define signp
-	cmd.exe /C "if exist $(subst /,\,$(1)) SignTool.exe sign /a /fd SHA256 /td SHA256 /tr http://timestamp.digicert.com /f $(subst /,\,$(2)) /p $(3) $(subst /,\,$(1))"
+	SignTool.exe sign /a /fd SHA256 /td SHA256 /tr http://timestamp.digicert.com /f $(subst /,\,$(2)) /p $(3) $(subst /,\,$(1))
 endef
 
 # Create .pri resources
 define makepri
-	cmd.exe /C "MakePri.exe new /v /o /cf $(subst /,\,$(1)) /pr $(subst /,\,$(2)) /of $(subst /,\,$(3)) /IndexName $(4)"
+	MakePri.exe new /v /o /cf $(subst /,\,$(1)) /pr $(subst /,\,$(2)) /of $(subst /,\,$(3)) /IndexName $(4)
 endef
 
 # Create ZIP
 define makezip
-	cmd.exe /C "powershell Compress-Archive -Force $(1) $(2)"
+	powershell Compress-Archive -Force $(1) $(2)
 endef
 
 # Move Folder or File
 define move
-	cmd.exe /C "powershell Move-Item -Force -Path $(1) -Destination $(2)"
+	powershell Move-Item -Force -Path $(1) -Destination $(2)
 endef
 
 # Sleep n seconds
 define sleep
-	cmd.exe /C "powershell Start-Sleep -Seconds $(1)"
+	powershell Start-Sleep -Seconds $(1)
 endef
diff --git a/dist/win-10/.gitignore b/dist/win-10/.gitignore
@@ -5,3 +5,5 @@
 *.appxbundle
 *.appxupload
 *.appx
+*.msi
+*.wixpdb