[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: IdP.bat IdP.wixproj IdP.wxs Registry.wxs Shibbo...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Aug 26 12:50:01 2014
New Revision: 6471

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6471&view=rev
Log:
IDP 469 Introduce GUIs from the SP.  Wixcop.  Better control of features.

Added:
    trunk/idp-installer/src/main/wix/ShibbolethIdP-gui.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
      - copied, changed from r6470, trunk/idp-installer/src/main/wix/IdP.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
      - copied, changed from r6470, trunk/idp-installer/src/main/wix/Registry.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
Modified:
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.wixproj
    trunk/idp-installer/src/main/wix/IdP.wxs
    trunk/idp-installer/src/main/wix/Registry.wxs
    trunk/idp-installer/src/main/wix/scripts/shib_is_v2.vbs-wix

Modified: trunk/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.bat?rev=6471&r1=6470&r2=6471&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Tue Aug 26 12:50:01 2014
@@ -116,10 +116,10 @@
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -didpSrc=idp-extract\%idpex% idp_contents.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. idp.wxs registry.wxs
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-update-dlg.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension idp.wixobj idp_contents.wixobj registry.wixobj
+"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-update-dlg.wixobj
 if ERRORLEVEL 1 goto done
 
 dir idp.msi

Modified: trunk/idp-installer/src/main/wix/IdP.wixproj
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wixproj?rev=6471&r1=6470&r2=6471&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wixproj (original)
+++ trunk/idp-installer/src/main/wix/IdP.wixproj Tue Aug 26 12:50:01 2014
@@ -24,9 +24,12 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="IdP.wxs" />
     <Compile Include="idp_contents.wxs" />
-    <Compile Include="Registry.wxs" />
+    <Compile Include="ShibbolethIdP-gui.wxs" />
+    <Compile Include="ShibbolethIdP-install-dlg.wxs" />
+    <Compile Include="ShibbolethIdP-main.wxs" />
+    <Compile Include="ShibbolethIdP-registry.wxs" />
+    <Compile Include="ShibbolethIdP-update-dlg.wxs" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--

Copied: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (from r6470, trunk/idp-installer/src/main/wix/IdP.wxs)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?p2=trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs&p1=trunk/idp-installer/src/main/wix/IdP.wxs&r1=6470&r2=6471&rev=6471&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Tue Aug 26 12:50:01 2014
@@ -1,103 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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
-   additional information regarding copyright ownership. The UCAID
-   licenses this file to You under the Apache License, Version 2.0
-   (the 'License'); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
- 
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
      http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an 'AS IS' BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied.  See the License for the specific language governing

[... 256 lines stripped ...]