Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/18/15 10:54:32 (10 years ago)
Author:
bburlacu
Message:

#2276: Merged trunk changes.

Location:
branches/HeuristicLab.DatasetRefactor/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.DatasetRefactor/sources

  • branches/HeuristicLab.DatasetRefactor/sources/Installers/HiveJanitorServiceInstaller.nsi

    r11366 r12031  
     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.11"
    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
  • branches/HeuristicLab.DatasetRefactor/sources/Installers/HiveSlaveInstaller.nsi

    r11366 r12031  
     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.11"
    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.