[java-identity-provider COMMIT] in /trunk/idp-installer/src/main/wix: IdP.bat IdP.wixproj IdP.wxs Jetty.bat MergeModu...
noreply at shibboleth.net
noreply at shibboleth.net
Tue Aug 26 09:02:51 EDT 2014
Author: rdw
Date: Tue Aug 26 09:02:51 2014
New Revision: 6470
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6470&view=rev
Log:
IDP 469: Checkpoint work in progress. Cleanup and start to wire in the scripts
Added:
trunk/idp-installer/src/main/wix/Registry.wxs
trunk/idp-installer/src/main/wix/scripts/
trunk/idp-installer/src/main/wix/scripts/shib_is_v2.vbs-wix
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/Jetty.bat
trunk/idp-installer/src/main/wix/MergeModule.wxs
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=6470&r1=6469&r2=6470&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Tue Aug 26 09:02:51 2014
@@ -75,28 +75,51 @@
) else (
"%JARCMD%" xf ..\%1
)
+
+rem is this a real package?
dir /s idp.properties 1> nl:a 2> nl:b
if ERRORLEVEL 1 (
cd ..
- echo "Could not find idp.properties in IdP package"
+ echo Could not find idp.properties in IdP package
goto done;
)
+for /D %%X in (*) do set idpex=%%X
+
+rem we do not want to populate conf/flows/view
+rem we will populate them from the dist directory
+
+rd/s/q %idpex%\conf
+if ERRORLEVEL 1 (
+ cd ..
+ echo Conf directory not found?
+ goto done;
+)
+rd/s/q %idpex%\flows
+if ERRORLEVEL 1 (
+ cd ..
+ echo Flows directory not found?
+ goto done;
+)
+rd/s/q %idpex%\views
+if ERRORLEVEL 1 (
+ cd ..
+ echo Views directory not found?
+ goto done;
+)
cd ..
-for /D %%X in (idp-extract/*) do set idpex=%%X
"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IdPFolder -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
if ERRORLEVEL 1 goto done
-
REM Build
"%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
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. idp.wxs registry.wxs
if ERRORLEVEL 1 goto done
-"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension idp.wixobj idp_contents.wixobj
+"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension idp.wixobj idp_contents.wixobj registry.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=6470&r1=6469&r2=6470&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wixproj (original)
+++ trunk/idp-installer/src/main/wix/IdP.wixproj Tue Aug 26 09:02:51 2014
@@ -26,6 +26,7 @@
<ItemGroup>
<Compile Include="IdP.wxs" />
<Compile Include="idp_contents.wxs" />
+ <Compile Include="Registry.wxs" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
Modified: trunk/idp-installer/src/main/wix/IdP.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.wxs?rev=6470&r1=6469&r2=6470&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.wxs (original)
+++ trunk/idp-installer/src/main/wix/IdP.wxs Tue Aug 26 09:02:51 2014
@@ -1,32 +1,103 @@
<?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
+
+ 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
+ permissions and limitations under the License. -->
+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="*" Name="IdP" Language="1033" Version="0.0.3.0" Manufacturer="Microsoft" UpgradeCode="8d3bfb53-47ff-4cbc-9363-cbf9e46bedc4">
- <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x86"/>
+ <Product Id="*" Name="Shibboleth IdP" Language="1033" Version="0.0.3.0" Manufacturer="Shibboleth Consortium" UpgradeCode="8d3bfb53-47ff-4cbc-9363-cbf9e46bedc4">
[... 161 lines stripped ...]
More information about the commits
mailing list