- Timestamp:
- 09/14/12 18:58:15 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Clients.Hive.Slave.App/3.3/HeuristicLab.Clients.Hive.Slave.App-3.3.csproj
r7091 r8660 153 153 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 154 154 <PropertyGroup> 155 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)155 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 156 156 set ProjectDir=$(ProjectDir) 157 157 set SolutionDir=$(SolutionDir) … … 159 159 160 160 call PreBuildEvent.cmd</PreBuildEvent> 161 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 162 export ProjectDir=$(ProjectDir) 163 export SolutionDir=$(SolutionDir) 164 165 $SolutionDir/PreBuildEvent.sh 166 </PreBuildEvent> 161 167 </PropertyGroup> 162 168 <PropertyGroup> -
branches/GP-MoveOperators/HeuristicLab.Clients.Hive.Slave.App/3.3/HiveSlaveApplication.cs
r7259 r8660 20 20 #endregion 21 21 22 using System.IO;23 22 using System.Threading; 24 23 using System.Windows.Forms; 25 using HeuristicLab.Clients.Hive.SlaveCore.Properties;26 24 using HeuristicLab.Clients.Hive.SlaveCore.Views; 27 25 using HeuristicLab.PluginInfrastructure; … … 32 30 private HeuristicLab.Clients.Hive.SlaveCore.Core core; 33 31 public override void Run() { 34 CheckWorkingDirectories();35 32 36 33 core = new HeuristicLab.Clients.Hive.SlaveCore.Core(); … … 48 45 core.Shutdown(); 49 46 } 50 51 /// <summary>52 /// Normally the configuration file just contains the folder names of the PluginCache and the AppDomain working directory.53 /// This means that these folders are created in the current directory which is ok for the console client and the windows service.54 /// For the HL client we can't do that because the plugin infrastructure gets confused when starting HeuristicLab.55 /// Therefore if there is only a relative path in the config, we change that to the temp path.56 /// </summary>57 void CheckWorkingDirectories() {58 if (!Path.IsPathRooted(Settings.Default.PluginCacheDir)) {59 Settings.Default.PluginCacheDir = Path.Combine(Path.GetTempPath(), Settings.Default.PluginCacheDir);60 Settings.Default.Save();61 }62 63 if (!Path.IsPathRooted(Settings.Default.PluginTempBaseDir)) {64 Settings.Default.PluginTempBaseDir = Path.Combine(Path.GetTempPath(), Settings.Default.PluginTempBaseDir);65 Settings.Default.Save();66 }67 }68 47 } 69 48 } -
branches/GP-MoveOperators/HeuristicLab.Clients.Hive.Slave.App/3.3/Plugin.cs.frame
r7259 r8660 28 28 29 29 namespace HeuristicLab.Clients.Hive.Slave.App { 30 [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3. 6.$WCREV$")]30 [Plugin("HeuristicLab.Clients.Hive.Slave.App", "3.3.7.$WCREV$")] 31 31 [PluginFile("HeuristicLab.Clients.Hive.Slave.App-3.3.dll", PluginFileType.Assembly)] 32 32 [PluginDependency("HeuristicLab.Clients.Hive.SlaveCore", "3.3")] -
branches/GP-MoveOperators/HeuristicLab.Clients.Hive.Slave.App/3.3/Properties/AssemblyInfo.cs.frame
r7259 r8660 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.