Changeset 15660


Ignore:
Timestamp:
01/27/18 01:42:07 (22 months ago)
Author:
swagner
Message:

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

Location:
branches/2877_HiveImprovements
Files:
9 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>
  • branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/HeuristicLab.Clients.Hive.Slave.WindowsService-3.3.csproj

    r11623 r15660  
    185185</PreBuildEvent>
    186186  </PropertyGroup>
     187  <PropertyGroup>
     188    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     189set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     190set ProjectDir=$(ProjectDir)
     191set SolutionDir=$(SolutionDir)
     192set OutDir=$(OutDir)
     193set TargetDir=$(TargetDir)
     194set TargetPath=$(TargetPath)
     195set Platform=$(PlatformName)
     196set Configuration=$(ConfigurationName)
     197
     198call "$(SolutionDir)MergeConfigs.cmd"
     199    </PostBuildEvent>
     200    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     201export ProjectDir=$(ProjectDir)
     202export SolutionDir=$(SolutionDir)
     203export OutDir=$(OutDir)
     204export TargetDir=$(TargetDir)
     205export TargetPath=$(TargetPath)
     206export Platform=$(PlatformName)
     207export Configuration=$(ConfigurationName)
     208
     209$SolutionDir/MergeConfigs.sh
     210</PostBuildEvent>
     211  </PropertyGroup>
    187212  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    188213       Other similar extension points exist, see Microsoft.Common.targets.
  • branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config

    r15361 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       <setting name="CheckpointInterval" serializeAs="String">
    82         <value>18:00:00</value>
    83       </setting>
    84       <setting name="CheckpointCheckInterval" serializeAs="String">
    85         <value>00:05:00</value>
    86       </setting>
    87     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    88     <HeuristicLab.Clients.Hive.Settings>
    89       <setting name="MaxParallelUploads" serializeAs="String">
    90         <value>2</value>
    91       </setting>
    92       <setting name="HLBinaryName" serializeAs="String">
    93         <value>HeuristicLab 3.3.exe</value>
    94       </setting>
    95       <setting name="ResultPollingInterval" serializeAs="String">
    96         <value>00:00:20</value>
    97       </setting>
    98       <setting name="MaxParallelDownloads" serializeAs="String">
    99         <value>2</value>
    100       </setting>
    101       <setting name="MaxRepeatServiceCalls" serializeAs="String">
    102         <value>5</value>
    103       </setting>
    104       <setting name="AnonymousUserName" serializeAs="String">
    105         <value>anonymous</value>
    106       </setting>
    107       <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
    108         <value>
    109           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    110             <string>NetBinding_IHiveService</string>
    111             <string>WSHttpBinding_IHiveService</string>
    112           </ArrayOfString>
    113         </value>
    114       </setting>
    115       <setting name="MaxEndpointRetries" serializeAs="String">
    116         <value>3</value>
    117       </setting>
    118     </HeuristicLab.Clients.Hive.Settings>
    119   </userSettings>
    120 
    1216  <system.serviceModel>
    122     <bindings>
    123       <netTcpBinding>
    124         <binding name="NetBinding_IHiveService" receiveTimeout="00:20:00"
    125           sendTimeout="00:20:00" maxBufferPoolSize="2147483647" maxBufferSize="2147483647"
    126           maxReceivedMessageSize="2147483647">
    127           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
    128             maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    129           <security mode="TransportWithMessageCredential">
    130             <message clientCredentialType="UserName" />
    131           </security>
    132         </binding>
    133       </netTcpBinding>
    134       <wsHttpBinding>
    135         <binding name="WSHttpBinding_IHiveService" receiveTimeout="00:20:00"
    136           sendTimeout="00:20:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    137           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
    138             maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    139           <security>
    140             <message clientCredentialType="UserName" />
    141           </security>
    142         </binding>
    143       </wsHttpBinding>
    144     </bindings>
    145     <services>
    146       <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService">
    147         <endpoint address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    148       </service>
    149     </services>
    150     <client>
    151       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    152       <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
    153         binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
    154         contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
    155         <identity>
    156           <dns value="services.heuristiclab.com" />
    157         </identity>
    158       </endpoint>
    159       <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc"
    160         binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
    161         contract="HeuristicLab.Clients.Hive.IHiveService" name="NetBinding_IHiveService">
    162         <identity>
    163           <dns value="services.heuristiclab.com" />
    164         </identity>
    165       </endpoint>
    166     </client>
    1677  </system.serviceModel>
    1688
  • branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj

    r14882 r15660  
    199199$SolutionDir/PreBuildEvent.sh
    200200    </PreBuildEvent>
    201     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    202       set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    203       set ProjectDir=$(ProjectDir)
    204       set SolutionDir=$(SolutionDir)
    205       set OutDir=$(OutDir)
    206       set TargetDir=$(TargetDir)
    207       set Platform=$(PlatformName)
    208       set Configuration=$(ConfigurationName)
    209 
    210       call "$(SolutionDir)MergeConfigs.cmd"
    211     </PostBuildEvent>
    212     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    213 export OutDir=$(OutDir)
    214 export ProjectDir=$(ProjectDir)
    215 export SolutionDir=$(SolutionDir)
    216 export TargetDir=$(TargetDir)
    217 
    218 $SolutionDir/MergeConfigs.sh
    219     </PostBuildEvent>
    220201  </PropertyGroup>
    221202  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/2877_HiveImprovements/HeuristicLab.Clients.Hive.Slave/3.3/app.config

    r15361 r15660  
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    55      <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"/>
    76    </sectionGroup>
    87  </configSections>
     
    8685      </setting>
    8786    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    88     <HeuristicLab.Clients.Hive.Settings>
    89       <setting name="MaxParallelUploads" serializeAs="String">
    90         <value>2</value>
    91       </setting>
    92       <setting name="HLBinaryName" serializeAs="String">
    93         <value>HeuristicLab 3.3.exe</value>
    94       </setting>
    95       <setting name="ResultPollingInterval" serializeAs="String">
    96         <value>00:00:20</value>
    97       </setting>
    98       <setting name="MaxParallelDownloads" serializeAs="String">
    99         <value>2</value>
    100       </setting>
    101       <setting name="MaxRepeatServiceCalls" serializeAs="String">
    102         <value>5</value>
    103       </setting>
    104       <setting name="AnonymousUserName" serializeAs="String">
    105         <value>anonymous</value>
    106       </setting>
    107       <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
    108         <value>
    109           <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
    110             <string>NetBinding_IHiveService</string>
    111             <string>WSHttpBinding_IHiveService</string>
    112           </ArrayOfString>
    113         </value>
    114       </setting>
    115       <setting name="MaxEndpointRetries" serializeAs="String">
    116         <value>3</value>
    117       </setting>
    118     </HeuristicLab.Clients.Hive.Settings>
    11987  </userSettings>
    12088
    12189  <system.serviceModel>
    122     <bindings>
    123       <netTcpBinding>
    124         <binding name="NetBinding_IHiveService" receiveTimeout="00:20:00"
    125           sendTimeout="00:20:00" maxBufferPoolSize="2147483647" maxBufferSize="2147483647"
    126           maxReceivedMessageSize="2147483647">
    127           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
    128             maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    129           <security mode="TransportWithMessageCredential">
    130             <message clientCredentialType="UserName" />
    131           </security>
    132         </binding>
    133       </netTcpBinding>
    134       <wsHttpBinding>
    135         <binding name="WSHttpBinding_IHiveService" receiveTimeout="00:20:00"
    136           sendTimeout="00:20:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    137           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647"
    138             maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    139           <security>
    140             <message clientCredentialType="UserName" />
    141           </security>
    142         </binding>
    143       </wsHttpBinding>
    144     </bindings>
    14590    <services>
    14691      <service name="HeuristicLab.Clients.Hive.SlaveCore.SlaveCommunicationService">
     
    15095    <client>
    15196      <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
    152       <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
    153         binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
    154         contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
    155         <identity>
    156           <dns value="services.heuristiclab.com" />
    157         </identity>
    158       </endpoint>
    159       <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc"
    160         binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
    161         contract="HeuristicLab.Clients.Hive.IHiveService" name="NetBinding_IHiveService">
    162         <identity>
    163           <dns value="services.heuristiclab.com" />
    164         </identity>
    165       </endpoint>
    16697    </client>
    16798  </system.serviceModel>
  • branches/2877_HiveImprovements/HeuristicLab/3.3/HeuristicLab-3.3.csproj

    r15052 r15660  
    213213</PreBuildEvent>
    214214    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
    215       set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    216       set ProjectDir=$(ProjectDir)
    217       set SolutionDir=$(SolutionDir)
    218       set OutDir=$(OutDir)
    219       set TargetDir=$(TargetDir)
    220       set Platform=$(PlatformName)
    221       set Configuration=$(ConfigurationName)
    222 
    223       call "$(SolutionDir)MergeConfigs.cmd"
     215set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     216set ProjectDir=$(ProjectDir)
     217set SolutionDir=$(SolutionDir)
     218set OutDir=$(OutDir)
     219set TargetDir=$(TargetDir)
     220set TargetPath=$(TargetPath)
     221set Platform=$(PlatformName)
     222set Configuration=$(ConfigurationName)
     223
     224call "$(SolutionDir)MergeConfigs.cmd"
    224225    </PostBuildEvent>
    225226    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    226 export OutDir=$(OutDir)
    227227export ProjectDir=$(ProjectDir)
    228228export SolutionDir=$(SolutionDir)
     229export OutDir=$(OutDir)
    229230export TargetDir=$(TargetDir)
     231export TargetPath=$(TargetPath)
     232export Platform=$(PlatformName)
     233export Configuration=$(ConfigurationName)
    230234
    231235$SolutionDir/MergeConfigs.sh
  • branches/2877_HiveImprovements/MergeConfigs.cmd

    r15398 r15660  
    77)
    88
    9 echo Recreating HeuristicLab 3.3.exe.config...
    10 copy /Y "%SolutionDir%\HeuristicLab\3.3\app.config" "%TargetDir%HeuristicLab 3.3.exe.config"
     9echo Recreating %TargetPath%.config...
     10copy /Y "%ProjectDir%\app.config" "%TargetPath%.config"
    1111
    1212echo Merging...
    1313FOR /F "tokens=*" %%A IN ('dir /B "%TargetDir%*.dll.config"') DO (
    14   "%SolutionDir%ConfigMerger.exe" "%TargetDir%%%A" "%TargetDir%HeuristicLab 3.3.exe.config"
     14  "%SolutionDir%ConfigMerger.exe" "%TargetDir%%%A" "%TargetPath%.config"
    1515)
    1616
  • branches/2877_HiveImprovements/MergeConfigs.sh

    r14207 r15660  
    33fi
    44
    5 echo Recreating HeuristicLab 3.3.exe.config...
    6 cp $SolutionDir/HeuristicLab/3.3/app.config "$TargetDir/HeuristicLab 3.3.exe.config"
     5echo Recreating $TargetPath.config...
     6cp "$ProjectDir/app.config" "$TargetPath.config"
    77
    88echo Merging...
    9 for f in $(ls $TargetDir/*.dll.config); do
    10     mono $SolutionDir/ConfigMerger.exe $f "$TargetDir/HeuristicLab 3.3.exe.config"
     9for f in $(ls "$TargetDir/*.dll.config"); do
     10    mono "$SolutionDir/ConfigMerger.exe" "$f" "$TargetPath.config"
    1111done
Note: See TracChangeset for help on using the changeset viewer.