Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/27/18 01:42:07 (6 years ago)
Author:
swagner
Message:

#2877: Generalized MergeConfigs scripts, cleaned app.config files, corrected post-build events

Location:
branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.3.csproj

    r11623 r15660  
    103103    <Compile Include="Program.cs" />
    104104    <Compile Include="Properties\AssemblyInfo.cs" />
     105    <None Include="app.config">
     106      <SubType>Designer</SubType>
     107    </None>
    105108    <None Include="Properties\AssemblyInfo.cs.frame" />
    106109    <Compile Include="SlaveCommListener.cs" />
    … …  
    112115      <Private>True</Private>
    113116    </ProjectReference>
    114   </ItemGroup>
    115   <ItemGroup>
    116     <None Include="app.config">
    117       <SubType>Designer</SubType>
    118     </None>
    119117  </ItemGroup>
    120118  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    133131</PreBuildEvent>
    134132  </PropertyGroup>
     133  <PropertyGroup>
     134    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     135set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     136set ProjectDir=$(ProjectDir)
     137set SolutionDir=$(SolutionDir)
     138set OutDir=$(OutDir)
     139set TargetDir=$(TargetDir)
     140set TargetPath=$(TargetPath)
     141set Platform=$(PlatformName)
     142set Configuration=$(ConfigurationName)
     143
     144call "$(SolutionDir)MergeConfigs.cmd"
     145    </PostBuildEvent>
     146    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     147export ProjectDir=$(ProjectDir)
     148export SolutionDir=$(SolutionDir)
     149export OutDir=$(OutDir)
     150export TargetDir=$(TargetDir)
     151export TargetPath=$(TargetPath)
     152export Platform=$(PlatformName)
     153export Configuration=$(ConfigurationName)
     154
     155$SolutionDir/MergeConfigs.sh
     156</PostBuildEvent>
     157  </PropertyGroup>
    135158  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    136159       Other similar extension points exist, see Microsoft.Common.targets.

  • branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config

    r14738 r15660  
    22<configuration>
    33  <configSections>
    4     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    5       <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    6       <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
    7     </sectionGroup>
    84  </configSections>
    95
    10   <userSettings>
    11     <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    12       <setting name="LastUsedFileName" serializeAs="String">
    13         <value>lastUsed.dat</value>
    14       </setting>
    15       <setting name="PluginCacheDir" serializeAs="String">
    16         <value>PluginCache</value>
    17       </setting>
    18       <setting name="PluginTempBaseDir" serializeAs="String">
    19         <value>PluginTemp</value>
    20       </setting>
    21       <setting name="ConfigurationName" serializeAs="String">
    22         <value>Configuration</value>
    23       </setting>
    24       <setting name="PluginInfrastructureDll" serializeAs="String">
    25         <value>HeuristicLab.PluginInfrastructure-3.3.dll</value>
    26       </setting>
    27       <setting name="ClientsHiveSlaveCoreDll" serializeAs="String">
    28         <value>HeuristicLab.Clients.Hive.SlaveCore-3.3.dll</value>
    29       </setting>
    30       <setting name="ClientsHiveDll" serializeAs="String">
    31         <value>HeuristicLab.Clients.Hive-3.3.dll</value>
    32       </setting>
    33       <setting name="HiveDll" serializeAs="String">
    34         <value>HeuristicLab.Hive-3.3.dll</value>
    35       </setting>
    36       <setting name="ClientsCommonDll" serializeAs="String">
    37         <value>HeuristicLab.Clients.Common-3.3.dll</value>
    38       </setting>
    39       <setting name="PluginLifetime" serializeAs="String">
    40         <value>3</value>
    41       </setting>
    42       <setting name="DirOpSleepTime" serializeAs="String">
    43         <value>00:00:01</value>
    44       </setting>
    45       <setting name="PluginDeletionRetries" serializeAs="String">
    46         <value>5</value>
    47       </setting>
    48       <setting name="PluginDeletionTimeout" serializeAs="String">
    49         <value>00:00:01</value>
    50       </setting>
    51       <setting name="ExecutorSemTimeouts" serializeAs="String">
    52         <value>00:00:46</value>
    53       </setting>
    54       <setting name="QueuesMaxThreads" serializeAs="String">
    55         <value>5000</value>
    56       </setting>
    57       <setting name="SlaveCommunicationServiceEndpoint" serializeAs="String">
    58         <value>SlaveCommunicationServiceEndpoint</value>
    59       </setting>
    60       <setting name="SlaveUser" serializeAs="String">
    61         <value>hiveslave</value>
    62       </setting>
    63       <setting name="SlavePwd" serializeAs="String">
    64         <value>hiveslave</value>
    65       </setting>
    66       <setting name="MaxLogCount" serializeAs="String">
    67         <value>1</value>
    68       </setting>
    69       <setting name="ExecutorQueueTimeout" serializeAs="String">
    70         <value>00:00:20</value>
    71       </setting>
    72       <setting name="NrOfCoresToScavenge" serializeAs="String">
    73         <value>-1</value>
    74       </setting>
    75       <setting name="ShutdownCommand" serializeAs="String">
    76         <value>shutdown.exe</value>
    77       </setting>
    78       <setting name="HeartbeatInterval" serializeAs="String">
    79         <value>00:00:40</value>
    80       </setting>
    81     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    82     <HeuristicLab.Clients.Hive.Settings>
    83       <setting name="MaxParallelUploads" serializeAs="String">
    84         <value>2</value>
    85       </setting>
    86       <setting name="HLBinaryName" serializeAs="String">
    87         <value>HeuristicLab 3.3.exe</value>
    88       </setting>
    89       <setting name="ResultPollingInterval" serializeAs="String">
    90         <value>00:00:20</value>
    91       </setting>
    92       <setting name="MaxParallelDownloads" serializeAs="String">
    93         <value>2</value>
    94       </setting>
    95       <setting name="MaxRepeatServiceCalls" serializeAs="String">
    96         <value>5</value>
    97       </setting>
    98       <setting name="AnonymousUserName" serializeAs="String">
    99         <value>anonymous</value>
    100       </setting>
    101       <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
    102         <value>
    103           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    104             <string>NetBinding_IHiveService</string>
    105             <string>WSHttpBinding_IHiveService</string>
    106           </ArrayOfString>
    107         </value>
    108       </setting>
    109       <setting name="MaxEndpointRetries" serializeAs="String">
    110         <value>3</value>
    111       </setting>
    112     </HeuristicLab.Clients.Hive.Settings>
    113   </userSettings>
     6  <connectionStrings>
     7  </connectionStrings>
     8
     9  <system.serviceModel>
     10  </system.serviceModel>
    11411
    11512  <runtime>
Note: See TracChangeset for help on using the changeset viewer.