Changeset 17586 for branches/2521_ProblemRefactoring/Installers

Timestamp:

06/04/20 15:55:13 (5 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• Installers/HiveJanitorServiceInstaller.nsi (modified) (3 diffs)
• Installers/HiveSlaveInstaller.nsi (modified) (2 diffs)

branches/2521_ProblemRefactoring/Installers/HiveJanitorServiceInstaller.nsi

@@ -46 +46 @@
   SetOutPath $INSTDIR
 
-  File "${JANITORBUILDPATH}\GeoIP.dat"
+  File "${JANITORBUILDPATH}\Google.Protobuf.dll"
+  File "${JANITORBUILDPATH}\HEAL.Attic.dll"
+  ;File "${JANITORBUILDPATH}\GeoIP.dat"
   File "${JANITORBUILDPATH}\HeuristicLab.Common-3.3.dll"
-  File "${JANITORBUILDPATH}\HeuristicLab.Persistence-3.3.dll"
+  ;File "${JANITORBUILDPATH}\HeuristicLab.Persistence-3.3.dll"
   File "${JANITORBUILDPATH}\HeuristicLab.PluginInfrastructure-3.3.dll"
   File "${JANITORBUILDPATH}\HeuristicLab.Services.Access.dll"
@@ -56 +58 @@
   File "${JANITORBUILDPATH}\HeuristicLab.Services.Hive.JanitorService-3.3.exe.config"
   File "${JANITORBUILDPATH}\HeuristicLab.Services.Hive-3.3.dll"
-  File "${JANITORBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
+  ;File "${JANITORBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
   
   WriteRegStr HKLM SOFTWARE\HeuristicLabHiveJanitorService "Install_Dir" "$INSTDIR"
@@ -76 +78 @@
   nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe" --uninstall'
     
-  Delete "$INSTDIR\GeoIP.dat"
+  Delete "$INSTDIR\Google.Protobuf.dll"
+  Delete "$INSTDIR\HEAL.Attic.dll"
+  ;Delete "$INSTDIR\GeoIP.dat"
   Delete "$INSTDIR\HeuristicLab.Common-3.3.dll"
-  Delete "$INSTDIR\HeuristicLab.Persistence-3.3.dll"
+  ;Delete "$INSTDIR\HeuristicLab.Persistence-3.3.dll"
   Delete "$INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll"
   Delete "$INSTDIR\HeuristicLab.Services.Access.dll"
+  Delete "$INSTDIR\HeuristicLab.Services.Access.DataAccess.dll"
   Delete "$INSTDIR\HeuristicLab.Services.Hive.DataAccess-3.3.dll"
   Delete "$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe"
   Delete "$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe.config"
   Delete "$INSTDIR\HeuristicLab.Services.Hive-3.3.dll"
-  Delete "$INSTDIR\HeuristicLab.Tracing-3.3.dll"
+  ;Delete "$INSTDIR\HeuristicLab.Tracing-3.3.dll"
   Delete "$INSTDIR\uninstall.exe"
 

branches/2521_ProblemRefactoring/Installers/HiveSlaveInstaller.nsi

@@ -46 +46 @@
   SetOutPath $INSTDIR
 
+  File "${SLAVEBUILDPATH}\Google.Protobuf.dll"
+  File "${SLAVEBUILDPATH}\HEAL.Attic.dll"
+  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe"
-  File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"
   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config"
   File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll"
@@ -82 +84 @@
 
   nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --uninstall'
-    
-  Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe
-  Delete $INSTDIR\HeuristicLab.Clients.Common-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config
-  Delete $INSTDIR\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Clients.Hive-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Collections-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Common.Resources-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Common-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Core-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Data-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Hive-3.3.dll
-  Delete $INSTDIR\HeuristicLab.MainForm-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Optimization-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Parameters-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Persistence-3.3.dll
-  Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll
-  Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll
-  Delete $INSTDIR\uninstall.exe
 
-  RMDir "$INSTDIR"
+  RMDir /r "$INSTDIR"
 SectionEnd