Skip to content

Commit

Permalink
* Remove BerkleyDB DLLs from setup as it is not supported in Windows …
Browse files Browse the repository at this point in the history 
…builds

* Add MySQL DLLs to setup
* Change CyrusSASL DLLs with GSASL DLLs
* Add mod_roster-publish.dll
* Removed db-setup-status.mysql
* Added db-update.sqlite
  • Loading branch information
@nanoant
nanoant committed Jan 29, 2008
1 parent b3fbe14 commit 540c46f
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 38 deletions.
6 changes: 3 additions & 3 deletions win32/setup/libraries.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.TargetDir)">
<Component Id="libdb45.dll" Guid="{3B9C1069-2EDE-44B1-B6A1-A46FC9D21030}">
<File Id="libdb45.dll" Name="libdb45.dll" KeyPath="yes" Vital="yes" />
<Component Id="libmysql.dll" Guid="{10A12E1B-55F5-43C1-955D-729CA860416B}">
<File Id="libmysql.dll" Name="libmysql.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="libexpat.dll" Guid="{28B2C906-9655-48F4-BFD4-9448FB504750}">
<File Id="libexpat.dll" Name="libexpat.dll" KeyPath="yes" Vital="yes" />
Expand All @@ -18,7 +18,7 @@
</Fragment>
<Fragment>
<ComponentGroup Id="Libraries">
<ComponentRef Id="libdb45.dll" />
<ComponentRef Id="libmysql.dll" />
<ComponentRef Id="libexpat.dll" />
<ComponentRef Id="libidn.dll" />
<ComponentRef Id="sqlite3.dll" />
Expand Down
4 changes: 4 additions & 0 deletions win32/setup/modules.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
<Component Id="mod_roster.dll" Guid="{437373A4-53C1-4B06-9459-9467C7514DB8}">
<File Id="mod_roster.dll" Name="mod_roster.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="mod_rosterpublish.dll" Guid="{A3706FEE-3A58-4175-A91F-8C66E5C2078B}">
<File Id="mod_rosterpublish.dll" Name="mod_roster-publish.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="mod_session.dll" Guid="{3630201D-7112-436E-B4F5-E1683BE6C57B}">
<File Id="mod_session.dll" Name="mod_session.dll" KeyPath="yes" Vital="yes" />
</Component>
Expand Down Expand Up @@ -119,6 +122,7 @@
<ComponentRef Id="mod_presence.dll" />
<ComponentRef Id="mod_privacy.dll" />
<ComponentRef Id="mod_roster.dll" />
<ComponentRef Id="mod_rosterpublish.dll" />
<ComponentRef Id="mod_session.dll" />
<ComponentRef Id="mod_status.dll" />
<ComponentRef Id="mod_templateroster.dll" />
Expand Down
33 changes: 3 additions & 30 deletions win32/setup/sasl.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,14 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.TargetDir)">
<Component Id="libsasl.dll" Guid="{A7318531-DAB3-40DF-965A-08C1160BDCD1}">
<File Id="libsasl.dll" Name="libsasl.dll" KeyPath="yes" Vital="yes" />
</Component>
</DirectoryRef>
<!-- SASL modules -->
<DirectoryRef Id="SASLDir" FileSource="$(var.TargetDir)\sasl">
<Component Id="saslANONYMOUS.dll" Guid="{B5D53A87-CDDE-48C0-9EAC-A054F600D47A}">
<File Id="saslANONYMOUS.dll" Name="saslANONYMOUS.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="saslCRAMMD5.dll" Guid="{98876728-0E0C-4D26-A715-CB05B6CCEA69}">
<File Id="saslCRAMMD5.dll" Name="saslCRAMMD5.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="saslDIGESTMD5.dll" Guid="{9454245F-4844-4E6E-89E1-4A3D1817C686}">
<File Id="saslDIGESTMD5.dll" Name="saslDIGESTMD5.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="saslLOGIN.dll" Guid="{D9D780CB-1235-4023-8757-D448C71EB96D}">
<File Id="saslLOGIN.dll" Name="saslLOGIN.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="saslPLAIN.dll" Guid="{C0AF731D-74B5-46F6-9631-9A99FEAE2841}">
<File Id="saslPLAIN.dll" Name="saslPLAIN.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="saslSASLDB.dll" Guid="{9C0BBDD8-D8C2-41DD-9B85-9B7C2FB95BF5}">
<File Id="saslSASLDB.dll" Name="saslSASLDB.dll" KeyPath="yes" Vital="yes" />
<Component Id="libgsasl.dll" Guid="{E390362B-74D0-400A-B531-7F49ADBB98A2}">
<File Id="libgsasl.dll" Name="libgsasl.dll" KeyPath="yes" Vital="yes" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="SASL">
<ComponentRef Id="libsasl.dll" />
<ComponentRef Id="saslANONYMOUS.dll" />
<ComponentRef Id="saslCRAMMD5.dll" />
<ComponentRef Id="saslDIGESTMD5.dll" />
<ComponentRef Id="saslLOGIN.dll" />
<ComponentRef Id="saslPLAIN.dll" />
<ComponentRef Id="saslSASLDB.dll" />
<ComponentRef Id="libgsasl.dll" />
</ComponentGroup>
</Fragment>
</Wix>
8 changes: 4 additions & 4 deletions win32/setup/services.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@
<Component Id="jabberd2.dll" Guid="{4C6C8EBD-DB23-498C-8E1E-0254631AB252}">
<File Id="jabberd2.dll" Name="jabberd2.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="dbsetupstatus.mysql" Guid="{7DF07536-99A9-455A-9DB8-A4369AE0660D}">
<File Id="dbsetupstatus.mysql" Name="db-setup-status.mysql" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="dbsetup.mysql" Guid="{0EE029D6-DFD1-4F20-A910-02B472940D7F}">
<File Id="dbsetup.mysql" Name="db-setup.mysql" KeyPath="yes" Vital="yes" />
</Component>
Expand All @@ -138,6 +135,9 @@
<Component Id="dbsetup.sqlite" Guid="{5C39F304-CD9E-4488-8C8D-5C629EB315D1}">
<File Id="dbsetup.sqlite" Name="db-setup.sqlite" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="dbupdate.sqlite" Guid="{609ED973-93AE-4CCF-8B04-661DEBDC466E}">
<File Id="dbupdate.sqlite" Name="db-update.sqlite" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="sqlite.dist.db" Guid="{928DD3B5-F429-45C4-B677-F3A2FFE23051}">
<Condition>SQLITE.DB.EXISTS</Condition>
<File Id="sqlite.dist.db" Name="sqlite.dist.db" KeyPath="yes" Vital="yes" />
Expand Down Expand Up @@ -171,10 +171,10 @@
<ComponentRef Id="sm.dist.xml" />
<ComponentRef Id="server.pem" />
<ComponentRef Id="jabberd2.dll" />
<ComponentRef Id="dbsetupstatus.mysql" />
<ComponentRef Id="dbsetup.mysql" />
<ComponentRef Id="dbupdate.mysql" />
<ComponentRef Id="dbsetup.sqlite" />
<ComponentRef Id="dbupdate.sqlite" />
<ComponentRef Id="sqlite.dist.db" />
<ComponentRef Id="sqlite.db" />
</ComponentGroup>
Expand Down
1 change: 0 additions & 1 deletion win32/setup/setup.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="jabberd2">
<Directory Id="ModulesDir" Name="modules" />
<Directory Id="SASLDir" Name="sasl" />
</Directory>
</Directory>
</Directory>
Expand Down

0 comments on commit 540c46f

Please sign in to comment.