Index: src/Deltares.DSoilModel.Setup/BuildWixProject.bat =================================================================== diff -u -r7 -r26 --- src/Deltares.DSoilModel.Setup/BuildWixProject.bat (.../BuildWixProject.bat) (revision 7) +++ src/Deltares.DSoilModel.Setup/BuildWixProject.bat (.../BuildWixProject.bat) (revision 26) @@ -1,7 +1,7 @@ rem >>> run this batch file to update BinFolder.wxs only when the content of the setup changes cls -@echo off +@echo on set build=C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe set harvest="%WIX%bin\heat.exe" @@ -13,45 +13,46 @@ echo/ echo cleaning and building project... -rd /s /q ..\..\bin\Release +rd /s /q ..\bin\Release + %build% ..\DSoilModel.sln /p:Configuration=Release;Platform=x86 >BuildWixProject.log echo/ echo cleaning up bin folder... -rd /s /q ..\..\bin\Release\Dupuit > nul 2>&1 -rd /s /q ..\..\bin\Release\TestFiles > nul 2>&1 -rd /s /q ..\..\bin\Release\TestData > nul 2>&1 -rd /s /q ..\..\bin\Release\CalcDlls > nul 2>&1 -rd /s /q ..\..\bin\Release\x64 > nul 2>&1 -rd /s /q ..\..\bin\Release\cs > nul 2>&1 -rd /s /q ..\..\bin\Release\de > nul 2>&1 -rd /s /q ..\..\bin\Release\de-DE > nul 2>&1 -rd /s /q ..\..\bin\Release\el > nul 2>&1 -rd /s /q ..\..\bin\Release\en-US > nul 2>&1 -rd /s /q ..\..\bin\Release\it > nul 2>&1 -rd /s /q ..\..\bin\Release\it-IT > nul 2>&1 -rd /s /q ..\..\bin\Release\ja-JP > nul 2>&1 -rd /s /q ..\..\bin\Release\lt > nul 2>&1 -rd /s /q ..\..\bin\Release\pt > nul 2>&1 -rd /s /q ..\..\bin\Release\pt-BR > nul 2>&1 -rd /s /q ..\..\bin\Release\ro > nul 2>&1 -rd /s /q ..\..\bin\Release\th > nul 2>&1 -rd /s /q ..\..\bin\Release\vi-VN > nul 2>&1 -rd /s /q ..\..\bin\Release\zh-CN > nul 2>&1 -rd /s /q ..\..\bin\Release\zh-MO > nul 2>&1 -del /q ..\..\bin\Release\*.pdb > nul 2>&1 -del /q ..\..\bin\Release\*.xml > nul 2>&1 -del /q ..\..\bin\Release\*test*.dll > nul 2>&1 -del /q ..\..\bin\Release\nunit.framework.dll > nul 2>&1 -del /q ..\..\bin\Release\dauth.dll > nul 2>&1 -del /q ..\..\bin\Release\Deltares.Authorization.dll > nul 2>&1 -del /q ..\..\bin\Release\*.dll.config > nul 2>&1 -del /q ..\..\bin\Release\Rhino.Mocks.* > nul 2>&1 -del /q ..\..\bin\Release\KellermanSoftware*.dll > nul 2>&1 +rd /s /q ..\bin\Release\Dupuit > nul 2>&1 +rd /s /q ..\bin\Release\TestFiles > nul 2>&1 +rd /s /q ..\bin\Release\TestData > nul 2>&1 +rd /s /q ..\bin\Release\CalcDlls > nul 2>&1 +rd /s /q ..\bin\Release\x64 > nul 2>&1 +rd /s /q ..\bin\Release\cs > nul 2>&1 +rd /s /q ..\bin\Release\de > nul 2>&1 +rd /s /q ..\bin\Release\de-DE > nul 2>&1 +rd /s /q ..\bin\Release\el > nul 2>&1 +rd /s /q ..\bin\Release\en-US > nul 2>&1 +rd /s /q ..\bin\Release\it > nul 2>&1 +rd /s /q ..\bin\Release\it-IT > nul 2>&1 +rd /s /q ..\bin\Release\ja-JP > nul 2>&1 +rd /s /q ..\bin\Release\lt > nul 2>&1 +rd /s /q ..\bin\Release\pt > nul 2>&1 +rd /s /q ..\bin\Release\pt-BR > nul 2>&1 +rd /s /q ..\bin\Release\ro > nul 2>&1 +rd /s /q ..\bin\Release\th > nul 2>&1 +rd /s /q ..\bin\Release\vi-VN > nul 2>&1 +rd /s /q ..\bin\Release\zh-CN > nul 2>&1 +rd /s /q ..\bin\Release\zh-MO > nul 2>&1 +del /q ..\bin\Release\*.pdb > nul 2>&1 +del /q ..\bin\Release\*.xml > nul 2>&1 +del /q ..\bin\Release\*test*.dll > nul 2>&1 +del /q ..\bin\Release\nunit.framework.dll > nul 2>&1 +del /q ..\bin\Release\dauth.dll > nul 2>&1 +del /q ..\bin\Release\Deltares.Authorization.dll > nul 2>&1 +del /q ..\bin\Release\*.dll.config > nul 2>&1 +del /q ..\bin\Release\Rhino.Mocks.* > nul 2>&1 +del /q ..\bin\Release\KellermanSoftware*.dll > nul 2>&1 echo/ echo harvesting project to create BinFolder.wxs, please commit this file if there are significant changes in the fileset ! -%harvest% dir ..\..\bin\release -cg ProductComponents -dr INSTALLFOLDER -var var.BinFolder -gg -sfrag -sreg -srd -o BinFolder.wxs >>BuildWixProject.log +%harvest% dir ..\bin\release -cg ProductComponents -dr INSTALLFOLDER -var var.BinFolder -gg -sfrag -sreg -srd -o BinFolder.wxs >>BuildWixProject.log echo/ echo building setup...