Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11749


Ignore:
Timestamp:
01/13/15 13:33:12 (10 years ago)
Author:
ascheibe
Message:

#2244 merged r11364,r11365,r11366,r11599,r11652 into stable

Location:
stable
Files:
3 deleted
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab 3.3 Hive.Slave.sln

    r7009 r11749  
    11
    2 Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual Studio 2010
     2Microsoft Visual Studio Solution File, Format Version 12.00
     3# Visual Studio 2012
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.3", "HeuristicLab.Clients.Hive.Slave\3.3\HeuristicLab.Clients.Hive.Slave-3.3.csproj", "{989FE92B-484E-41EE-87E2-6A24AF0381D8}"
    55EndProject
    … …  
    1212Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3", "HeuristicLab.Clients.Hive.Slave.TrayIcon\3.3\HeuristicLab.Clients.Hive.Slave.TrayIcon-3.3.csproj", "{7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}"
    1313EndProject
    14 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.TrayIconSetup-3.3", "HeuristicLab.Clients.Hive.Slave.TrayIconSetup\HeuristicLab.Clients.Hive.Slave.TrayIconSetup.vdproj", "{57E37188-4523-4F8D-8CEF-AE0AA27BB754}"
    15 EndProject
    1614Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave.WindowsService-3.3", "HeuristicLab.Clients.Hive.Slave.WindowsService\3.3\HeuristicLab.Clients.Hive.Slave.WindowsService-3.3.csproj", "{BA8001DE-E83C-4B1F-8B2E-2695C4222491}"
    17 EndProject
    18 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup-3.3", "HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup\HeuristicLab.Clients.Hive.Slave.WindowsServiceSetup.vdproj", "{C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}"
    1915EndProject
    2016Global
    … …  
    8884    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.ActiveCfg = Release|x86
    8985    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.Build.0 = Release|x86
    90     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Debug|Any CPU.ActiveCfg = Debug
    91     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Debug|Any CPU.Build.0 = Debug
    92     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Debug|x64.ActiveCfg = Debug
    93     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Debug|x64.Build.0 = Debug
    94     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Debug|x86.ActiveCfg = Debug
    95     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Debug|x86.Build.0 = Debug
    96     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Release|Any CPU.ActiveCfg = Release
    97     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Release|Any CPU.Build.0 = Release
    98     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Release|x64.ActiveCfg = Release
    99     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Release|x64.Build.0 = Release
    100     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Release|x86.ActiveCfg = Release
    101     {57E37188-4523-4F8D-8CEF-AE0AA27BB754}.Release|x86.Build.0 = Release
    10286    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    10387    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    11296    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.ActiveCfg = Release|x86
    11397    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.Build.0 = Release|x86
    114     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Debug|Any CPU.ActiveCfg = Debug
    115     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Debug|Any CPU.Build.0 = Debug
    116     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Debug|x64.ActiveCfg = Debug
    117     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Debug|x64.Build.0 = Debug
    118     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Debug|x86.ActiveCfg = Debug
    119     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Debug|x86.Build.0 = Debug
    120     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|Any CPU.ActiveCfg = Release
    121     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|Any CPU.Build.0 = Release
    122     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|x64.ActiveCfg = Release
    123     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|x64.Build.0 = Release
    124     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|x86.ActiveCfg = Release
    125     {C16CA1A6-7AE8-4B87-A6A6-9C290E8B9646}.Release|x86.Build.0 = Release
    12698  EndGlobalSection
    12799  GlobalSection(SolutionProperties) = preSolution

  • stable/HeuristicLab 3.3 Services.sln

    r8049 r11749  
    11
    2 Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual Studio 2010
     2Microsoft Visual Studio Solution File, Format Version 12.00
     3# Visual Studio 2012
    44Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
    55  ProjectSection(SolutionItems) = preProject
    … …  
    2424  ProjectSection(WebsiteProperties) = preProject
    2525    TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
    26     ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.3.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.3.dll;"
     26    ProjectReferences = "{CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}|HeuristicLab.Services.Hive-3.3.dll;{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}|HeuristicLab.Services.Hive.DataAccess-3.3.dll;{9FAC0B23-2730-452A-9BA0-D7CA1746C541}|HeuristicLab.Services.Access.dll;{BE9B0229-9150-49A4-AEA6-BB58E055992F}|HeuristicLab.GeoIP.dll;{0F652437-998A-4EAB-8BF1-444B5FE8CE97}|HeuristicLab.Services.Access.DataAccess.dll;"
    2727    Debug.AspNetCompiler.VirtualPath = "/Hive-3.3"
    2828    Debug.AspNetCompiler.PhysicalPath = "HeuristicLab.Services.Hive.Web\Hive-3.3\"
    … …  
    4545EndProject
    4646Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Hive.JanitorService-3.3", "HeuristicLab.Services.Hive.JanitorService\3.3\HeuristicLab.Services.Hive.JanitorService-3.3.csproj", "{F685556B-F6EB-4143-8E7E-662D00FDD299}"
    47 EndProject
    48 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HeuristicLab.Services.Hive.JanitorServiceSetup-3.3", "HeuristicLab.Services.Hive.JanitorServiceSetup\HeuristicLab.Services.Hive.JanitorServiceSetup-3.3.vdproj", "{034C2EE4-E303-4E45-98AB-F0074EC83B81}"
    4947EndProject
    5048Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GeoIP", "HeuristicLab.GeoIP\1.12\HeuristicLab.GeoIP.csproj", "{BE9B0229-9150-49A4-AEA6-BB58E055992F}"
    … …  
    150148    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.ActiveCfg = Release|x86
    151149    {F685556B-F6EB-4143-8E7E-662D00FDD299}.Release|x86.Build.0 = Release|x86
    152     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.ActiveCfg = Debug
    153     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|Any CPU.Build.0 = Debug
    154     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x64.ActiveCfg = Debug
    155     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x64.Build.0 = Debug
    156     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x86.ActiveCfg = Debug
    157     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Debug|x86.Build.0 = Debug
    158     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|Any CPU.ActiveCfg = Release
    159     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|Any CPU.Build.0 = Release
    160     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x64.ActiveCfg = Release
    161     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x64.Build.0 = Release
    162     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x86.ActiveCfg = Release
    163     {034C2EE4-E303-4E45-98AB-F0074EC83B81}.Release|x86.Build.0 = Release
    164150    {BE9B0229-9150-49A4-AEA6-BB58E055992F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    165151    {BE9B0229-9150-49A4-AEA6-BB58E055992F}.Debug|Any CPU.Build.0 = Debug|Any CPU

  • stable/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/Program.cs

    r11170 r11749  
    2020#endregion
    2121
     22using System;
     23using System.Configuration.Install;
     24using System.Reflection;
    2225using System.ServiceProcess;
    2326
    2427namespace HeuristicLab.Clients.Hive.SlaveCore.WindowsService {
    2528  static class Program {
    26     /// <summary>
    27     /// The main entry point for the application.
    28     /// </summary>
    29     static void Main() {
    30       ServiceBase[] ServicesToRun;
    31       ServicesToRun = new ServiceBase[] 
    32       {
    33         new SlaveWindowsService()
    34       };
    35       ServiceBase.Run(ServicesToRun);
     29    private static void Main(string[] args) {
     30      // Install as service, see http://stackoverflow.com/a/12703878
     31      if (Environment.UserInteractive) {
     32        try {
     33          string parameter = string.Concat(args);
     34          switch (parameter) {
     35            case "--install":
     36              ManagedInstallerClass.InstallHelper(new[] { Assembly.GetExecutingAssembly().Location });
     37              break;
     38            case "--uninstall":
     39              ManagedInstallerClass.InstallHelper(new[] { "/u", Assembly.GetExecutingAssembly().Location });
     40              break;
     41          }
     42        }
     43        catch (Exception ex) {
     44          Console.WriteLine("Error on (un)install of Hive Slave service: " + Environment.NewLine + ex);
     45        }
     46      } else {
     47        ServiceBase[] ServicesToRun;
     48        ServicesToRun = new ServiceBase[]
     49        {
     50          new SlaveWindowsService()
     51        };
     52        ServiceBase.Run(ServicesToRun);
     53      }
    3654    }
    3755  }

  • stable/HeuristicLab.Services.Hive.JanitorService/3.3/HeuristicLab.Services.Hive.JanitorService-3.3.csproj

    r8600 r11749  
    135135    </EmbeddedResource>
    136136  </ItemGroup>
     137  <ItemGroup>
     138    <Content Include="ICSharpCode.SharpZipLib License.txt">
     139      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     140    </Content>
     141  </ItemGroup>
    137142  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    138143  <PropertyGroup>
    139    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     144    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    140145set ProjectDir=$(ProjectDir)
    141146set SolutionDir=$(SolutionDir)
    … …  
    143148
    144149call PreBuildEvent.cmd</PreBuildEvent>
    145 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     150    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    146151export ProjectDir=$(ProjectDir)
    147152export SolutionDir=$(SolutionDir)

  • stable/HeuristicLab.Services.Hive.JanitorService/3.3/Program.cs

    r11170 r11749  
    2020#endregion
    2121
     22using System;
     23using System.Configuration.Install;
     24using System.Reflection;
    2225using System.ServiceProcess;
    2326
    2427namespace HeuristicLab.Services.Hive.JanitorService {
    2528  static class Program {
    26     /// <summary>
    27     /// The main entry point for the application.
    28     /// </summary>
    29     static void Main() {
    30       ServiceBase[] ServicesToRun;
    31       ServicesToRun = new ServiceBase[]
    32       {
    33         new JanitorService()
    34       };
    35       ServiceBase.Run(ServicesToRun);
     29    private static void Main(string[] args) {
     30      // Install as service, see http://stackoverflow.com/a/12703878
     31      if (Environment.UserInteractive) {
     32        try {
     33          string parameter = string.Concat(args);
     34          switch (parameter) {
     35            case "--install":
     36              ManagedInstallerClass.InstallHelper(new[] { Assembly.GetExecutingAssembly().Location });
     37              break;
     38            case "--uninstall":
     39              ManagedInstallerClass.InstallHelper(new[] { "/u", Assembly.GetExecutingAssembly().Location });
     40              break;
     41          }
     42        }
     43        catch (Exception ex) {
     44          Console.WriteLine("Error on (un)install of Hive Slave service: " + Environment.NewLine + ex);
     45        }
     46      } else {
     47        ServiceBase[] ServicesToRun;
     48        ServicesToRun = new ServiceBase[]
     49        {
     50          new JanitorService()
     51        };
     52        ServiceBase.Run(ServicesToRun);
     53      }
    3654    }
    3755  }

  • stable/Installers/HiveJanitorServiceInstaller.nsi

    r11366 r11749  
     1/* HeuristicLab
     2 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 *
     4 * This file is part of HeuristicLab.
     5 *
     6 * HeuristicLab is free software: you can redistribute it and/or modify
     7 * it under the terms of the GNU General Public License as published by
     8 * the Free Software Foundation, either version 3 of the License, or
     9 * (at your option) any later version.
     10 *
     11 * HeuristicLab is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14 * GNU General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU General Public License
     17 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     18 */
     19 
    120; NSIS installer script for HeuristicLab Hive Janitor Service
    2 ; NSIS version: v3.0b0
     21; NSIS version: 3.0b0
    322
    423Name "HeuristicLab Hive Janitor Service"
    … …  
    827!define BUILDCONFIGURATION "Debug"
    928!define JANITORBUILDPATH "..\HeuristicLab.Services.Hive.JanitorService\3.3\bin\${BUILDCONFIGURATION}"
     29!define VERSION "3.3.10"
    1030
    1131InstallDir $PROGRAMFILES\HeuristicLabHiveJanitorService
    12 InstallDirRegKey HKLM "Software\HeuristicLabHiveJanitorService" "Install_Dir"
    13 
    1432RequestExecutionLevel admin
    1533
    … …  
    3856  File "${JANITORBUILDPATH}\HeuristicLab.Services.Hive-3.3.dll"
    3957  File "${JANITORBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
    40   File "${JANITORBUILDPATH}\ICSharpCode.SharpZipLib License.txt"
    41   File "${JANITORBUILDPATH}\ICSharpCode.SharpZipLib.dll"
    42 
     58 
    4359  WriteRegStr HKLM SOFTWARE\HeuristicLabHiveJanitorService "Install_Dir" "$INSTDIR"
    4460  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "DisplayName" "HeuristicLabHiveJanitorService"
    … …  
    4662  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "NoModify" 1
    4763  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "NoRepair" 1
     64  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "DisplayVersion" "${VERSION}"
    4865  WriteUninstaller "uninstall.exe"
    4966
    5067  nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe" --install'
    51 
    5268SectionEnd
    5369
    … …  
    6985  Delete "$INSTDIR\HeuristicLab.Services.Hive-3.3.dll"
    7086  Delete "$INSTDIR\HeuristicLab.Tracing-3.3.dll"
    71   Delete "$INSTDIR\ICSharpCode.SharpZipLib License.txt"
    72   Delete "$INSTDIR\ICSharpCode.SharpZipLib.dll"   
    7387  Delete "$INSTDIR\uninstall.exe"
    7488
    7589  RMDir "$INSTDIR"
    76 
    7790SectionEnd
    7891

  • stable/Installers/HiveSlaveInstaller.nsi

    r11366 r11749  
     1/* HeuristicLab
     2 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 *
     4 * This file is part of HeuristicLab.
     5 *
     6 * HeuristicLab is free software: you can redistribute it and/or modify
     7 * it under the terms of the GNU General Public License as published by
     8 * the Free Software Foundation, either version 3 of the License, or
     9 * (at your option) any later version.
     10 *
     11 * HeuristicLab is distributed in the hope that it will be useful,
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14 * GNU General Public License for more details.
     15 *
     16 * You should have received a copy of the GNU General Public License
     17 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     18 */
     19 
    120; NSIS installer script for HeuristicLab Hive Slave
    2 ; NSIS version: v3.0b0
     21; NSIS version: 3.0b0
    322
    423Name "HeuristicLab Hive Slave"
    … …  
    827!define BUILDCONFIGURATION "Debug"
    928!define SLAVEBUILDPATH "..\HeuristicLab.Clients.Hive.Slave.WindowsService\3.3\bin\${BUILDCONFIGURATION}"
     29!define VERSION "3.3.10"
    1030
    1131InstallDir $PROGRAMFILES\HeuristicLabHiveSlave
    12 InstallDirRegKey HKLM "Software\HeuristicLabHiveSlave" "Install_Dir"
    13 
    1432RequestExecutionLevel admin
    1533
    … …  
    4563  File "${SLAVEBUILDPATH}\HeuristicLab.PluginInfrastructure-3.3.dll"
    4664  File "${SLAVEBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
    47   File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib License.txt"
    48   File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib.dll"
    4965
    5066
    … …  
    5470  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoModify" 1
    5571  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoRepair" 1
     72  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "DisplayVersion" "${VERSION}"
    5673  WriteUninstaller "uninstall.exe"
    5774
    5875  nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --install'
    59 
    6076SectionEnd
    6177
    … …  
    84100  Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll
    85101  Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll
    86   Delete "$INSTDIR\ICSharpCode.SharpZipLib License.txt"
    87   Delete $INSTDIR\ICSharpCode.SharpZipLib.dll
    88102  Delete $INSTDIR\uninstall.exe
    89103
    90104  RMDir "$INSTDIR"
    91 
    92105SectionEnd
    93106
Note: See TracChangeset for help on using the changeset viewer.