implied. See the License for the specific language governing\r
permissions and limitations under the License. -->\r
\r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSAMLVersion='2.4.3' ?> \r
-<?define OpenSAMLFileVersion='2_4' ?>\r
+<?include ..\Versions.wxi ?>\r
+<?define SamlComponent32='{B52F8C71-2042-4CDF-A250-BD773985A2AB}' ?>\r
+<?define XMLToolingComponent32='{53533A59-A563-439D-B13D-A4D7090C42D3}' ?>\r
+<?define XMLToolingLiteComponent32='{5045A722-D6D6-4E55-9196-CB7C50B4446F}' ?>\r
+<?define SamlComponent32d='{7B934257-5F7F-428E-930E-A793A11573D7}' ?>\r
+<?define XMLToolingComponent32d='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}' ?>\r
+<?define XMLToolingLiteComponent32d='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}' ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
- <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML'\r
- Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign and Schema'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
- <!-- For now just install this where it is put we expect to go into lib and lib\debug below. \r
- At a a later date, we may chose to make this a placed module -->\r
+ <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'\r
+ Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_SP' Name='SP'>\r
- <Directory Id='lib' Name='lib'>\r
-\r
- <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>\r
+ <Component Id='saml.dll' Guid='$(var.SamlComponent32)'>\r
+ <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
</Component>\r
<Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />\r
+ <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
+ </Component>\r
+ <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent32)'>\r
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+ </Component>\r
+ <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent32)'>\r
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
</Component>\r
- <Directory Id='lib_debug' Name='debug'>\r
- <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
- <File KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />\r
+ <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>\r
+ <Component Id='samlD.dll' Guid='$(var.SamlComponent32d)'>\r
+ <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
</Component>\r
- <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
- <File Id='samlsign.exe_Debug' KeyPath='yes'\r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />\r
+ <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
+ <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
</Component>\r
- </Directory><!-- lib_debug-->\r
+ <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>\r
+ <File KeyPath='yes' Checksum='yes'\r
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>\r
+ <File KeyPath='yes' Checksum='yes'\r
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+ </Component>\r
+ </Directory><!-- lib_debug -->\r
</Directory><!-- lib -->\r
- <Directory Id='share' Name='share'>\r
- <Directory Id='share_xml' Name='xml'>\r
- <Directory Id='share_xml_opensaml' Name='opensaml' />\r
- </Directory><!-- xml-->\r
- </Directory><!-- share -->\r
+ <Directory Id='doc' Name='doc'>\r
+ <Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
+ <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />\r
+ <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />\r
+ <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />\r
+ </Component>\r
+ </Directory><!-- doc -->\r
</Directory><!-- shibboleth_SP -->\r
</Directory><!-- shibboleth -->\r
</Directory><!-- ProgramFilesFolder -->\r
</Directory><!-- TARGETDIR -->\r
- <ComponentRef Id='schema_assertion_01'/>\r
- <ComponentRef Id='schema_assertion_1_1'/>\r
- <ComponentRef Id='schema_protocol_01'/>\r
- <ComponentRef Id='schema_protocol_1_1'/>\r
- <ComponentRef Id='samlschema' />\r
</Module>\r
</Wix>\r
-\r
- \r