[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat Dialog.bmp ShibbolethSP-Gui.wxi ShibbolethSP-main-x64.wxs Shi...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May 11 17:29:47 2012
New Revision: 3656

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3656&view=rev
Log:
(Start to) Add a GUI.  Splash screen is WIP

Added:
    branches/REL_2/msi/WiX/Dialog.bmp   (with props)
    branches/REL_2/msi/WiX/ShibbolethSP-Gui.wxi
    branches/REL_2/msi/WiX/TopBanner.bmp   (with props)
    branches/REL_2/msi/WiX/license.rtf
Modified:
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3656&r1=3655&r2=3656&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Fri May 11 17:29:47 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 -ext WixUtilExtension.dll
+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 -ext WixUIExtension
 
 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 -ext WixUtilExtension.dll
+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 -ext WixUIExtension
 
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3656&r1=3655&r2=3656&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Fri May 11 17:29:47 2012
@@ -38,6 +38,8 @@
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
     <?include ShibbolethSP-properties.wxi?>
+
+    <?include ShibbolethSP-gui.wxi ?>
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3656&r1=3655&r2=3656&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Fri May 11 17:29:47 2012
@@ -39,6 +39,8 @@
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
     <?include ShibbolethSP-properties.wxi?>
+
+    <?include ShibbolethSP-gui.wxi ?>
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi?rev=3656&r1=3655&r2=3656&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi Fri May 11 17:29:47 2012
@@ -16,11 +16,11 @@
      implied.  See the License for the specific language governing
      permissions and limitations under the License.  -->
 
-<!-- <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-   This is where we put all the configuration properties we will
-       used to drive the install.  The GUI will change them as required,
-       but the GUI is not required.  -->
-<Include>
+<!-- This is where we put all the configuration properties we will
+     used to drive the install.  The GUI will change them as required,
+     but the GUI is not required.  -->
+
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
   <!-- Are we installing IIS, if so what extension to used -->
   <Property Id='SHIB_FILE_EXTENSION' Value='.sso' Secure='yes'>