Adjust state of some files and path to keygen script.

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3672 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 7ce0f8e..573ef35 100644 (file)
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -10,7 +10,6 @@
   <ComponentRef Id='README.txt'/>\r
   <ComponentRef Id='RELEASE.txt'/>\r
 \r
-  <ComponentRef Id='openssl.cnf'/>\r
   <ComponentRef Id='upgrade.xsl'/>\r
   <ComponentRef Id='example_metadata.xml'/>\r
   <ComponentRef Id='example_shibboleth2.xml'/> \r

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 857bac5..0c39a15 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -54,11 +54,8 @@
         </Directory><!-- doc_shibboleth -->\r
       </Directory><!-- doc -->\r
       <Directory Id='etc' Name='etc' >\r
-        <Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs' >\r
-          <Component Id='openssl.cnf' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>\r
-            <File KeyPath='yes' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />\r
-          </Component>\r
-          <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}' Permanent='yes'>\r
+        <Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
+          <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}'>\r
             <File KeyPath='yes' Name='upgrade.xsl' />\r
           </Component>\r
           <Component Id='example_metadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' Permanent='yes'>\r
@@ -67,13 +64,13 @@
           <Component Id='example_shibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' Permanent='yes'>\r
             <File KeyPath='yes' Name='example-shibboleth2.xml' />\r
           </Component>\r
-          <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'  Permanent='yes'>\r
-            <File KeyPath='yes' Name='keygen.bat' Source='$(var.SPBuildDirectory)\cpp-sp\configs\keygen.bat-wix'/>\r
+          <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>\r
+            <File KeyPath='yes' Name='keygen.bat'/>\r
           </Component>\r
-          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'  Permanent='yes'>\r
+          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'>\r
             <File KeyPath='yes' Name='xsltproc.js' />\r
           </Component>\r
-          <Directory Id='etc_shibboleth_dist' Name='dist' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs' >\r
+          <Directory Id='etc_shibboleth_dist' Name='dist' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
             <Component Id='apache.config.in' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>\r
               <File KeyPath='yes' Name='apache.config.in' />\r
             </Component>\r