From 394440ff2055e79a9858920b96a5e3eecf361805 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 12 Oct 2012 12:17:09 +0200
Subject: [PATCH] Fix WiX module for Ship workbench

---
 src/WindowsInstaller/FreeCAD.wxs | 19 +++++++++++++++++++
 src/WindowsInstaller/ModShip.wxi | 10 +++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/WindowsInstaller/FreeCAD.wxs b/src/WindowsInstaller/FreeCAD.wxs
index 05a5d19fd..8a3a8833c 100644
--- a/src/WindowsInstaller/FreeCAD.wxs
+++ b/src/WindowsInstaller/FreeCAD.wxs
@@ -161,6 +161,25 @@
             <ComponentRef Id="CompModWeb" />
             <ComponentRef Id="CompModOpenSCAD" />
             <ComponentRef Id="CompModOpenSCADPly" />
+            <!-- Ship module -->
+            <ComponentRef Id="CompModShip" />
+            <ComponentRef Id="CompModShipExamples" />
+            <ComponentRef Id="CompModShipIcons" />
+            <ComponentRef Id="CompModshipAreasCurve" />
+            <ComponentRef Id="CompModshipCreateShip" />
+            <ComponentRef Id="CompModshipHydrostatics" />
+            <ComponentRef Id="CompModshipLoadExample" />
+            <ComponentRef Id="CompModshipOutlineDraw" />
+            <ComponentRef Id="CompModshipUtils" />
+            <ComponentRef Id="CompModsimCreate" />
+            <ComponentRef Id="CompModsimPost" />
+            <ComponentRef Id="CompModsimRun" />
+            <ComponentRef Id="CompModsimRunCL" />
+            <ComponentRef Id="CompModsimRunNoCL" />
+            <ComponentRef Id="CompModtankCreateTank" />
+            <ComponentRef Id="CompModtankGZ" />
+            <ComponentRef Id="CompModtankWeights" />
+            <!-- Ship module -->
             <ComponentRef Id="CompExampleData" />
 		
             <Feature Id="FeatModImage" Title="The Image module" Description="Module to handle pictures" Level="1">
diff --git a/src/WindowsInstaller/ModShip.wxi b/src/WindowsInstaller/ModShip.wxi
index 274c0fc78..6472b3fa8 100644
--- a/src/WindowsInstaller/ModShip.wxi
+++ b/src/WindowsInstaller/ModShip.wxi
@@ -80,7 +80,7 @@
 				<File Id="shipHydrostatics02" Name="Plot.py"   />
 				<File Id="shipHydrostatics03" Name="TaskPanel.py"   />
 				<File Id="shipHydrostatics04" Name="TaskPanel.ui"   />
-				<File Id="shipHydrostatics05" Name="Tools.ui"   />
+				<File Id="shipHydrostatics05" Name="Tools.py"   />
 			</Component>
 		</Directory>
 		<Directory Id="ModshipLoadExample" Name="shipLoadExample" FileSource="../../Mod/Ship/shipLoadExample" >
@@ -137,11 +137,11 @@
 			</Directory>
 			<Directory Id="ModsimRunNoCL" Name="Sim" FileSource="../../Mod/Ship/simRun/Sim" >
 				<Component Id="CompModsimRunNoCL"  Guid="c8655a85-20de-4f30-9924-de34a79ffa2e" Win64='$(var.Win_64)' KeyPath="yes">
-					<File Id="Sim02" Name="computeSources.py"   />
+					<File Id="Sim01" Name="computeSources.py"   />
 					<File Id="Sim02" Name="fsEvolution.py"   />
-					<File Id="Sim01" Name="__init__.py"   />
-					<File Id="Sim02" Name="initialization.py"   />
-					<File Id="Sim03" Name="matrixGen.py"   />
+					<File Id="Sim03" Name="__init__.py"   />
+					<File Id="Sim04" Name="initialization.py"   />
+					<File Id="Sim05" Name="matrixGen.py"   />
 				</Component>
 			</Directory>
 		</Directory>