[cpp-sp COMMIT] in /branches/REL_2: configs/keygen.bat-wix msi/WiX/Compile.bat msi/WiX/MergeModules/OpenSAML-schemas....

[noreply at shibboleth.net]

Author: rdw
Date: Wed May  9 12:02:15 2012
New Revision: 3651

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3651&view=rev
Log:
Keygen no longer throws a command window up.  Add TODOs to mirror documentation.  Add missed vbs file

Added:
    branches/REL_2/msi/scripts/shib_edit_catalog.vbs
Modified:
    branches/REL_2/configs/keygen.bat-wix
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/scripts/shib_edit_config_files.vbs-wix

Modified: branches/REL_2/configs/keygen.bat-wix
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/keygen.bat-wix?rev=3651&r1=3650&r2=3651&view=diff
==============================================================================
--- branches/REL_2/configs/keygen.bat-wix (original)
+++ branches/REL_2/configs/keygen.bat-wix Wed May  9 12:02:15 2012
@@ -29,6 +29,7 @@
 if not defined FQDN goto guess_fqdn
 
 :generate
+set PATH=%PATH%;%ProgramFiles%\Shibboleth\SP\lib\
 set CNF="%PREFIX%sp-cert.cnf"
 echo # OpenSSL configuration file for creating sp-cert.pem    >%CNF%
 echo [req]                                                   >>%CNF%

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3651&r1=3650&r2=3651&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Wed May  9 12:02:15 2012
@@ -15,10 +15,10 @@
 
 wixcop -indent:2 ShibbolethSP-main-x64.wxs
 candle ShibbolethSP-main-x64.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj -ext WixUtilExtension.dll
 
 wixcop -indent:2 ShibbolethSP-main-x86.wxs
 candle ShibbolethSP-main-x86.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj -ext WixUtilExtension.dll
 
 

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs?rev=3651&r1=3650&r2=3651&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs Wed May  9 12:02:15 2012
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
+<!-- TODO roll in xmltooling, make subsidiary to Shib -->
 <!-- Licensed to the University Corporation for Advanced Internet
      Development, Inc. (UCAID) under one or more contributor license
      agreements.  See the NOTICE file distributed with this work for

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs?rev=3651&r1=3650&r2=3651&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs Wed May  9 12:02:15 2012
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-
+<!-- TODO roll in xmltooling, make subsidiary to Shib Ad documentation -->
 <!-- Licensed to the University Corporation for Advanced Internet
    Development, Inc. (UCAID) under one or more contributor license
    agreements.  See the NOTICE file distributed with this work for

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs?rev=3651&r1=3650&r2=3651&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs Wed May  9 12:02:15 2012
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!-- TODO roll in xmltooling make subsidiary to Shib -->
 
 <!-- Licensed to the University Corporation for Advanced Internet
    Development, Inc. (UCAID) under one or more contributor license

Modified: branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs

[... 85 lines stripped ...]