suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust WiX scripts

Browse Source
This commit is contained in:
wmayer 2012-02-21 13:46:35 +01:00
parent e89aeaed5d
commit 73bf4d5d8c
2 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/WindowsInstaller/FreeCADData.wxs
View File

@ -41,7 +41,9 @@
<File Id="ExampleFile4" Name="Schenkel.stp" /> <File Id="ExampleFile4" Name="Schenkel.stp" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="DataMod" Name="Mod" FileSource="../../data/Mod" >
<!-- Robot resource files --> <!-- Robot resource files -->
<Directory Id="DataModRobot" Name="Robot" FileSource="../../data/Mod/Robot" >
<Directory Id="ModRobotLib" Name="Lib" FileSource="../../data/Mod/Robot/Lib" > <Directory Id="ModRobotLib" Name="Lib" FileSource="../../data/Mod/Robot/Lib" >
<Directory Id="ModRobotLibKuka" Name="Kuka" FileSource="../../data/Mod/Robot/Lib/Kuka" > <Directory Id="ModRobotLibKuka" Name="Kuka" FileSource="../../data/Mod/Robot/Lib/Kuka" >
<Component Id="CompModRobotLibKuka" Guid="753d2cc0-02af-11df-8a39-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes"> <Component Id="CompModRobotLibKuka" Guid="753d2cc0-02af-11df-8a39-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
@ -56,14 +58,18 @@
</Component> </Component>
</Directory> </Directory>
</Directory> </Directory>
</Directory>
<!-- Drawing resource files --> <!-- Drawing resource files -->
<Directory Id="DataModDraw" Name="Drawing" FileSource="../../data/Mod/Drawing" >
<Directory Id="ModDrawingTemplates" Name="Templates" FileSource="../../data/Mod/Drawing/Templates"> <Directory Id="ModDrawingTemplates" Name="Templates" FileSource="../../data/Mod/Drawing/Templates">
<Component Id="CompModDrawingTemplates" Guid="f879f473-3a2a-4808-8fa0-021b4a7db30b" Win64='$(var.Win_64)' KeyPath="yes"> <Component Id="CompModDrawingTemplates" Guid="f879f473-3a2a-4808-8fa0-021b4a7db30b" Win64='$(var.Win_64)' KeyPath="yes">
<File Id="DrawingTemplateA3" Name="A3_Landscape.svg" /> <File Id="DrawingTemplateA3" Name="A3_Landscape.svg" />
</Component> </Component>
</Directory> </Directory>
</Directory>
<!-- StartPage resource files --> <!-- StartPage resource files -->
<Directory Id="ModStartDataStartPage" Name="StartPageData" FileSource="../../data/Mod/Start/StartPage" > <Directory Id="DataModStart" Name="Start" FileSource="../../data/Mod/Start" >
<Directory Id="ModStartDataStartPage" Name="StartPage" FileSource="../../data/Mod/Start/StartPage" >
<Component Id="CompModStartDataStartPage" Guid="aa63eb2a-9355-4d6e-872c-e2fdf9c697da" Win64='$(var.Win_64)' KeyPath="yes"> <Component Id="CompModStartDataStartPage" Guid="aa63eb2a-9355-4d6e-872c-e2fdf9c697da" Win64='$(var.Win_64)' KeyPath="yes">
<File Id="StartPage2" Name="PartDesign.py" /> <File Id="StartPage2" Name="PartDesign.py" />
<File Id="StartPage3" Name="Mesh.py" /> <File Id="StartPage3" Name="Mesh.py" />
@ -88,6 +94,8 @@
<File Id="StartPage23" Name="ArchExample.png" /> <File Id="StartPage23" Name="ArchExample.png" />
</Component> </Component>
</Directory> </Directory>
</Directory>
</Directory>
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
</Wix> </Wix>

1
src/WindowsInstaller/LibPack.wxs
View File

@ -77,6 +77,7 @@
--> -->
<File Id="LibPack13" Name="coin3.dll" /> <File Id="LibPack13" Name="coin3.dll" />
<!-- <File Id="LibPack20" Name="libumfpack.dll" /> --> <!-- <File Id="LibPack20" Name="libumfpack.dll" /> -->
<File Id="LibPack25" Name="_socket.pyd" />
<File Id="LibPack26" Name="python26.dll" /> <File Id="LibPack26" Name="python26.dll" />
<File Id="LibPack27" Name="python26.zip" /> <File Id="LibPack27" Name="python26.zip" />
<File Id="LibPack29" Name="soqt1.dll" /> <File Id="LibPack29" Name="soqt1.dll" />