Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/27/21 14:10:56 (4 years ago)
Author:
pfleck
Message:

#3040 Merged trunk into branch.

Location:
branches/3040_VectorBasedGP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3040_VectorBasedGP

  • branches/3040_VectorBasedGP/Installers/HiveJanitorServiceInstaller.nsi

    r17182 r17825  
    4646  SetOutPath $INSTDIR
    4747
    48   File "${JANITORBUILDPATH}\GeoIP.dat"
     48  File "${JANITORBUILDPATH}\Google.Protobuf.dll"
     49  File "${JANITORBUILDPATH}\HEAL.Attic.dll"
     50  ;File "${JANITORBUILDPATH}\GeoIP.dat"
    4951  File "${JANITORBUILDPATH}\HeuristicLab.Common-3.3.dll"
    50   File "${JANITORBUILDPATH}\HeuristicLab.Persistence-3.3.dll"
     52  ;File "${JANITORBUILDPATH}\HeuristicLab.Persistence-3.3.dll"
    5153  File "${JANITORBUILDPATH}\HeuristicLab.PluginInfrastructure-3.3.dll"
    5254  File "${JANITORBUILDPATH}\HeuristicLab.Services.Access.dll"
     
    5658  File "${JANITORBUILDPATH}\HeuristicLab.Services.Hive.JanitorService-3.3.exe.config"
    5759  File "${JANITORBUILDPATH}\HeuristicLab.Services.Hive-3.3.dll"
    58   File "${JANITORBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
     60  ;File "${JANITORBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
    5961 
    6062  WriteRegStr HKLM SOFTWARE\HeuristicLabHiveJanitorService "Install_Dir" "$INSTDIR"
     
    7678  nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe" --uninstall'
    7779   
    78   Delete "$INSTDIR\GeoIP.dat"
     80  Delete "$INSTDIR\Google.Protobuf.dll"
     81  Delete "$INSTDIR\HEAL.Attic.dll"
     82  ;Delete "$INSTDIR\GeoIP.dat"
    7983  Delete "$INSTDIR\HeuristicLab.Common-3.3.dll"
    80   Delete "$INSTDIR\HeuristicLab.Persistence-3.3.dll"
     84  ;Delete "$INSTDIR\HeuristicLab.Persistence-3.3.dll"
    8185  Delete "$INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll"
    8286  Delete "$INSTDIR\HeuristicLab.Services.Access.dll"
     87  Delete "$INSTDIR\HeuristicLab.Services.Access.DataAccess.dll"
    8388  Delete "$INSTDIR\HeuristicLab.Services.Hive.DataAccess-3.3.dll"
    8489  Delete "$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe"
    8590  Delete "$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe.config"
    8691  Delete "$INSTDIR\HeuristicLab.Services.Hive-3.3.dll"
    87   Delete "$INSTDIR\HeuristicLab.Tracing-3.3.dll"
     92  ;Delete "$INSTDIR\HeuristicLab.Tracing-3.3.dll"
    8893  Delete "$INSTDIR\uninstall.exe"
    8994
  • branches/3040_VectorBasedGP/Installers/HiveSlaveInstaller.nsi

    r17182 r17825  
    4646  SetOutPath $INSTDIR
    4747
     48  File "${SLAVEBUILDPATH}\Google.Protobuf.dll"
     49  File "${SLAVEBUILDPATH}\HEAL.Attic.dll"
     50  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
    4851  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe"
    49   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
    5052  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config"
    5153  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll"
     
    8284
    8385  nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --uninstall'
    84    
    85   Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe
    86   Delete $INSTDIR\HeuristicLab.Clients.Common-3.3.dll
    87   Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config
    88   Delete $INSTDIR\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll
    89   Delete $INSTDIR\HeuristicLab.Clients.Hive-3.3.dll
    90   Delete $INSTDIR\HeuristicLab.Collections-3.3.dll
    91   Delete $INSTDIR\HeuristicLab.Common.Resources-3.3.dll
    92   Delete $INSTDIR\HeuristicLab.Common-3.3.dll
    93   Delete $INSTDIR\HeuristicLab.Core-3.3.dll
    94   Delete $INSTDIR\HeuristicLab.Data-3.3.dll
    95   Delete $INSTDIR\HeuristicLab.Hive-3.3.dll
    96   Delete $INSTDIR\HeuristicLab.MainForm-3.3.dll
    97   Delete $INSTDIR\HeuristicLab.Optimization-3.3.dll
    98   Delete $INSTDIR\HeuristicLab.Parameters-3.3.dll
    99   Delete $INSTDIR\HeuristicLab.Persistence-3.3.dll
    100   Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll
    101   Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll
    102   Delete $INSTDIR\uninstall.exe
    10386
    104   RMDir "$INSTDIR"
     87  RMDir /r "$INSTDIR"
    10588SectionEnd
    10689
Note: See TracChangeset for help on using the changeset viewer.