Changeset 5541

Timestamp:

02/22/11 17:13:47 (14 years ago)

Author:

ascheibe

Message:

#1233

• added app.configs
• use PreBuildEvent.cmd in SlaveConsoleClient
• react to SayHello msg

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/app_ascheibe.config (added)
• HeuristicLab.Clients.Hive.Slave.SlaveWindowsService (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave.Tests/Mocks (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config (added)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/app_ascheibe.config (added)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4/HeuristicLab.Clients.Hive.Slave.ConsoleClient-3.4.csproj

@@ -78 +78 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config">
+    <None Include="app.config" />
+    <None Include="app_ascheibe.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="app - F005PC.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="app - services.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="app_services.config" />
   </ItemGroup>
   <ItemGroup>
@@ -94 +90 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveWindowsService

@@ -2 +2 @@
 obj
 *.user
+InstallUtil.InstallLog

@@ -2 +2 @@
 obj
 *.user
+InstallUtil.InstallLog

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -172 +172 @@
           case MessageContainer.MessageType.Sleep:
             Sleep();
+            break;
+          case MessageContainer.MessageType.SayHello:
+            wcfService.Connect(ConfigManager.Instance.GetClientInfo());
             break;
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeuristicLab.Clients.Hive.Slave-3.4.csproj

@@ -124 +124 @@
     <Compile Include="StatusCommons.cs" />
     <Compile Include="WcfService.cs" />
-    <None Include="app.config" />
+    <None Include="app_ascheibe.config" />
     <None Include="app - F005PC.config" />
     <None Include="app - services.config" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -115 +115 @@
     <None Include="app - F005PC.config" />
     <None Include="app - services.config" />
+    <None Include="app.config" />
     <None Include="HeuristicLabClientsHivePlugin.cs.frame" />
     <Compile Include="Administration\HiveAdministrationClient.cs" />
@@ -143 +144 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <None Include="app.config" />
+    <None Include="app_ascheibe.config" />
     <None Include="HeuristicLab.snk" />
     <None Include="ServiceClients\GenerateServiceClients.cmd" />

@@ -2 +2 @@
 obj
 *.user
+InstallUtil.InstallLog