Fisheye: Tag 1062 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/Devexpress.wxs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/Deltares.DSoilModel.Setup/Product.wxs
===================================================================
diff -u -r1033 -r1062
--- src/Deltares.DSoilModel.Setup/Product.wxs (.../Product.wxs) (revision 1033)
+++ src/Deltares.DSoilModel.Setup/Product.wxs (.../Product.wxs) (revision 1062)
@@ -3,7 +3,7 @@
-
+
@@ -33,7 +33,6 @@
-
@@ -43,12 +42,10 @@
Index: src/Deltares.DSoilModel.Setup/BinFolder.wxs
===================================================================
diff -u -r1030 -r1062
--- src/Deltares.DSoilModel.Setup/BinFolder.wxs (.../BinFolder.wxs) (revision 1030)
+++ src/Deltares.DSoilModel.Setup/BinFolder.wxs (.../BinFolder.wxs) (revision 1062)
@@ -2,175 +2,356 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
@@ -197,20 +378,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -225,14 +466,15 @@
+
+
-
Fisheye: Tag 1062 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/CleanupBinFolder.bat'.
Fisheye: No comparison available. Pass `N' to diff?
Index: src/Deltares.DSoilModel.Setup/Tutorials.wxs
===================================================================
diff -u -r1030 -r1062
--- src/Deltares.DSoilModel.Setup/Tutorials.wxs (.../Tutorials.wxs) (revision 1030)
+++ src/Deltares.DSoilModel.Setup/Tutorials.wxs (.../Tutorials.wxs) (revision 1062)
@@ -2,151 +2,151 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Index: src/Deltares.DSoilModel.Setup/Harvest.bat
===================================================================
diff -u
--- src/Deltares.DSoilModel.Setup/Harvest.bat (revision 0)
+++ src/Deltares.DSoilModel.Setup/Harvest.bat (revision 1062)
@@ -0,0 +1,14 @@
+rem >>> run this batch file to update BinFolder.wxs only when the content of the setup changes
+
+cls
+@echo on
+set harvest="%WIX%bin\heat.exe"
+
+echo/
+echo harvesting project to create BinFolder.wxs, please commit this file if there are significant changes in the fileset !
+%harvest% dir ..\..\release\DSoilModel -cg ProductComponents -dr INSTALLFOLDER -var var.BinFolder -gg -sfrag -sreg -srd -o BinFolder.wxs >>BuildWixProject.log
+%harvest% dir ..\..\data\Tutorials -dr TUTORIALSFOLDER -cg Tutorials -var var.TutorialsFolder -gg -sfrag -srd -o Tutorials.wxs >>BuildWixProject.log
+%harvest% dir ..\..\data\WTISOS2017 -dr WTISOSFOLDER -cg WtiSos -var var.WtiSosFolder -gg -sfrag -srd -o WtiSos.wxs >>BuildWixProject.log
+
+echo/
+echo Done.
Index: src/DSoilModelSetup.sln
===================================================================
diff -u
--- src/DSoilModelSetup.sln (revision 0)
+++ src/DSoilModelSetup.sln (revision 1062)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Deltares.DSoilModel.Setup", "Deltares.DSoilModel.Setup\Deltares.DSoilModel.Setup.wixproj", "{E3E0CC29-5031-47E2-B230-C077B9BB5061}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {E3E0CC29-5031-47E2-B230-C077B9BB5061}.Debug|x86.ActiveCfg = Debug|x86
+ {E3E0CC29-5031-47E2-B230-C077B9BB5061}.Release|x86.ActiveCfg = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ EndGlobalSection
+EndGlobal
Index: src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj
===================================================================
diff -u -r1022 -r1062
--- src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj (.../Deltares.DSoilModel.Setup.wixproj) (revision 1022)
+++ src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj (.../Deltares.DSoilModel.Setup.wixproj) (revision 1062)
@@ -24,12 +24,11 @@
bin\
obj\$(Configuration)\
- BinFolder=..\bin\release; TutorialsFolder=..\..\data\Tutorials; WtiSosFolder=..\..\data\WTISOS2017
+ BinFolder=..\..\release\DSoilModel; TutorialsFolder=..\..\data\Tutorials; WtiSosFolder=..\..\data\WTISOS2017
ICE61
-
@@ -81,16 +80,6 @@
-
- Deltares.DSoilModel.Application
- {61d69903-f728-40df-9b6b-19e45c0621d6}
- True
- True
- Binaries;Content;Satellites
- INSTALLFOLDER
-
-
-
Fisheye: Tag 1062 refers to a dead (removed) revision in file `src/Deltares.DSoilModel.Setup/BuildWixProject.bat'.
Fisheye: No comparison available. Pass `N' to diff?