Skip to content
This repository was archived by the owner on Jul 30, 2019. It is now read-only.

Commit b4c467f

Browse files
Laszlo HordosLaszlo Hordos
Laszlo Hordos
authored and
Laszlo Hordos
committed
CR-4077 / OPENICF-268 - Add the 'legal-notices' folder with necessary license files
1 parent 6aa56c0 commit b4c467f

File tree

5 files changed

+50
-3632
lines changed

5 files changed

+50
-3632
lines changed

‎ServiceInstall/ExtBuild.proj

+20-12
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
enclosed by brackets [] replaced by your own identifying information:
2020
"Portions Copyrighted [year] [name of copyright owner]"
2121
====================
22-
Portions Copyrighted 2012-2013 ForgeRock AS
22+
Portions Copyrighted 2012-2014 ForgeRock AS
2323
-->
2424
<Project DefaultTargets="Clean" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2525
<PropertyGroup>
2626
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
27+
<ForgeRockLegal>false</ForgeRockLegal>
2728
</PropertyGroup>
2829
<Target Name="BeforeBuild">
2930
<!-- write out the top of the file.. -->
@@ -33,15 +34,15 @@
3334
<WriteLinesToFile File="Files.wxs" Lines="@(FileTopLines)" Overwrite="true" />
3435

3536
<ItemGroup>
36-
<AllFiles Include="..\Service\bin\$(Configuration)\*.*"
37+
<AllFiles Include="..\Service\bin\$(Configuration)\*.dll;..\Service\bin\$(Configuration)\*.config"
3738
Exclude="..\Service\bin\$(Configuration)\*.exe"/>
3839
<EXEFiles Include="..\Service\bin\$(Configuration)\ConnectorServer.exe"/>
3940
<PowerShellScriptExecutorFactoryFiles Include="..\PowerShellScriptExecutorFactory\bin\$(Configuration)\*.ScriptExecutorFactory.*"/>
4041
<ShellScriptExecutorFactoryFiles Include="..\ShellScriptExecutorFactory\bin\$(Configuration)\*.ScriptExecutorFactory.*"/>
4142
<LegalFiles Include="..\legal\*.txt"
4243
Exclude="..\legal\ForgeRock*.txt"/>
4344
<ForgeRockLegalFiles Include="..\legal\ForgeRock*.txt"/>
44-
<LegalFiles Include="@(ForgeRockLegalFiles)" Condition=" '$(Configuration)' == 'Release' "/>
45+
<LegalFiles Include="@(ForgeRockLegalFiles)" Condition=" '$(ForgeRockLegal)' == 'true' "/>
4546
</ItemGroup>
4647

4748
<!-- Write out the majority of base files -->
@@ -52,15 +53,20 @@
5253
<WriteLinesToFile File="Files.wxs"
5354
Lines="@(PowerShellScriptExecutorFactoryFiles->'&lt;File Source=&quot;%(Fullpath)&quot; Name=&quot;%(Filename)%(Extension)&quot; /&gt;')"/>
5455
<WriteLinesToFile File="Files.wxs"
55-
Lines="@(ShellScriptExecutorFactoryFiles->'&lt;File Source=&quot;%(Fullpath)&quot; Name=&quot;%(Filename)%(Extension)&quot; /&gt;')"/>
56+
Lines="@(ShellScriptExecutorFactoryFiles->'&lt;File Source=&quot;%(Fullpath)&quot; Name=&quot;%(Filename)%(Extension)&quot; /&gt;')"/>
5657

58+
<!-- Write out the Service Executable (should only be one) -->
59+
<WriteLinesToFile File="Files.wxs"
60+
Lines="@(EXEFiles->'&lt;File Source=&quot;%(Fullpath)&quot; Name=&quot;%(Filename)%(Extension)&quot; Checksum=&quot;yes&quot; KeyPath=&quot;yes&quot; /&gt;')"/>
61+
62+
<WriteLinesToFile File="Files.wxs" Lines="&lt;/Component&gt;"/>
63+
<WriteLinesToFile File="Files.wxs" Lines="&lt;/ComponentGroup&gt;"/>
64+
<WriteLinesToFile File="Files.wxs" Lines="&lt;ComponentGroup Id=&quot;LegalFilesComponents&quot; Directory=&quot;LEGALDIR&quot;&gt;"/>
65+
<WriteLinesToFile File="Files.wxs" Lines="&lt;Component Id=&quot;LegalNotices&quot; Guid=&quot;84d57160-13d5-11e4-9191-0800200c9a66&quot; DiskId=&quot;1&quot;&gt;"/>
5766
<!-- Write out the Legal files -->
5867
<WriteLinesToFile File="Files.wxs"
5968
Lines="@(LegalFiles->'&lt;File Source=&quot;%(Fullpath)&quot; Name=&quot;%(Filename)%(Extension)&quot; /&gt;')"/>
60-
61-
<!-- Write out the Service Executable (should only be one) -->
62-
<WriteLinesToFile File="Files.wxs"
63-
Lines="@(EXEFiles->'&lt;File Source=&quot;%(Fullpath)&quot; Name=&quot;%(Filename)%(Extension)&quot; KeyPath=&quot;yes&quot; /&gt;')"/>
69+
6470
<!-- Write out the bottom of the file -->
6571
<ReadLinesFromFile File="File.bottom" >
6672
<Output TaskParameter="Lines" ItemName="FileBottomLines"/>
@@ -77,11 +83,13 @@
7783
<Copy SourceFiles="@(PowerShellScriptExecutorFactoryFiles)" DestinationFolder="bin\$(Configuration)\target" />
7884
<Copy SourceFiles="@(ShellScriptExecutorFactoryFiles)" DestinationFolder="bin\$(Configuration)\target" />
7985
<Copy SourceFiles="@(EXEFiles)" DestinationFolder="bin\$(Configuration)\target" />
80-
<Copy SourceFiles="..\legal\CDDLv1.txt" DestinationFolder="bin\$(Configuration)\target" />
81-
<Copy SourceFiles="..\legal\THIRDPARTYREADME.txt" DestinationFolder="bin\$(Configuration)\target" />
82-
<Copy SourceFiles="..\legal\ForgeRock_License.txt" DestinationFolder="bin\$(Configuration)\target" Condition=" '$(Configuration)' == 'Release' "/>
86+
<Copy SourceFiles="..\legal\CDDLv1.txt" DestinationFolder="bin\$(Configuration)\target\legal-notices" />
87+
<Copy SourceFiles="..\legal\ForgeRock_License.txt" DestinationFolder="bin\$(Configuration)\target\legal-notices" Condition=" '$(ForgeRockLegal)' == 'true' "/>
8388
<ItemGroup>
84-
<ZipFiles Include="bin\$(Configuration)\target\*.*" Exclude="*.zip" />
89+
<ZipFiles Include="bin\$(Configuration)\target\**\*.dll;
90+
bin\$(Configuration)\target\**\*.exe;
91+
bin\$(Configuration)\target\**\*.config;
92+
bin\$(Configuration)\target\**\*.txt" Exclude="*.zip;*.pdb" />
8593
</ItemGroup>
8694
<Zip Files="@(ZipFiles)" WorkingDirectory="bin\$(Configuration)\target" ZipFileName="bin\$(Configuration)\openicf-$(OpenICFVersion)-dotnet.zip" />
8795
</Target>

‎ServiceInstall/File.bottom

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
</Component>
2-
</Directory>
3-
</Directory>
4-
</Directory>
5-
</DirectoryRef>
6-
</Fragment>
7-
</Wix>
1+
</Component>
2+
</ComponentGroup>
3+
</Fragment>
4+
</Wix>

‎ServiceInstall/File.top

+23-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<Fragment>
4-
<DirectoryRef Id="TARGETDIR">
5-
<Directory Id="ProgramFilesFolder" Name="PFiles">
6-
<Directory Id="IdConn" Name="Identity Connectors">
7-
<Directory Id="INSTALLDIR" Name="Connector Server" >
8-
<Component Id="ConnectorServerService" Guid="8B1F7E82-46D7-4F88-A1FA-44FCBF7E684F" DiskId="1">
9-
<ServiceInstall
10-
Id="ConnectorServerServiceInstall"
11-
Name="ConnectorServerService"
12-
DisplayName="OpenICF Connector Server"
13-
Type="ownProcess"
14-
Start="auto"
15-
ErrorControl="normal"
16-
Description="OpenICF Connector Server"
17-
Account="[SERVICEACCOUNT]"
18-
Password="[SERVICEPASSWORD]">
19-
</ServiceInstall>
20-
<ServiceControl Id="StartConnectorServerService" Name="ConnectorServerService" Start="install" Wait="no" />
21-
<ServiceControl Id="StopConnectorServerService" Name="ConnectorServerService" Stop="both" Wait="yes" Remove="uninstall" />
3+
<Fragment>
4+
<DirectoryRef Id="TARGETDIR">
5+
<Directory Id="ProgramFilesFolder" Name="PFiles">
6+
<Directory Id="IdConn" Name="Identity Connectors">
7+
<Directory Id="INSTALLDIR" Name="Connector Server">
8+
<Directory Id="LEGALDIR" Name="legal-notices"/>
9+
</Directory>
10+
</Directory>
11+
</Directory>
12+
</DirectoryRef>
13+
</Fragment>
14+
<Fragment>
15+
<ComponentGroup Id="ConnectorServerComponents" Directory="INSTALLDIR">
16+
<Component Id="ConnectorServerService" Guid="8B1F7E82-46D7-4F88-A1FA-44FCBF7E684F" DiskId="1">
17+
<ServiceInstall Id="ConnectorServerServiceInstall" Name="ConnectorServerService"
18+
DisplayName="OpenICF Connector Server" Type="ownProcess" Start="auto"
19+
ErrorControl="normal" Description="OpenICF Connector Server" Account="[SERVICEACCOUNT]"
20+
Password="[SERVICEPASSWORD]"> </ServiceInstall>
21+
<ServiceControl Id="StartConnectorServerService" Name="ConnectorServerService"
22+
Start="install" Wait="no"/>
23+
<ServiceControl Id="StopConnectorServerService" Name="ConnectorServerService" Stop="both"
24+
Wait="yes" Remove="uninstall"/>

‎ServiceInstall/Setup.wxs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Product Id="*"
4-
Name="Connector Server"
4+
Name="OpenICF Connector Server"
55
Language="1033"
66
Version="!(bind.FileVersion.Framework.dll)"
77
UpgradeCode="2C19FE30-F6A7-482D-A50F-C1E64D34C024"
@@ -24,7 +24,8 @@
2424
Description="Connector Server Service"
2525
Level="1"
2626
ConfigurableDirectory="INSTALLDIR">
27-
<ComponentRef Id="ConnectorServerService"/>
27+
<ComponentGroupRef Id="ConnectorServerComponents" />
28+
<ComponentGroupRef Id="LegalFilesComponents" />
2829
</Feature>
2930

3031
<!--

0 commit comments

Comments
 (0)