Changeset 12031 for branches/HeuristicLab.DatasetRefactor/sources/Installers

Timestamp:

02/18/15 10:54:32 (10 years ago)

Author:

bburlacu

Message:

#2276: Merged trunk changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

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

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

@@ +1 @@
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 ; NSIS installer script for HeuristicLab Hive Janitor Service
-; NSIS version: v3.0b0
+; NSIS version: 3.0b0
 
 Name "HeuristicLab Hive Janitor Service"
@@ -8 +27 @@
 !define BUILDCONFIGURATION "Debug"
 !define JANITORBUILDPATH "..\HeuristicLab.Services.Hive.JanitorService\3.3\bin\${BUILDCONFIGURATION}"
+!define VERSION "3.3.11"
 
 InstallDir $PROGRAMFILES\HeuristicLabHiveJanitorService
-InstallDirRegKey HKLM "Software\HeuristicLabHiveJanitorService" "Install_Dir"
-
 RequestExecutionLevel admin
 
@@ -38 +56 @@
   File "${JANITORBUILDPATH}\HeuristicLab.Services.Hive-3.3.dll"
   File "${JANITORBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
-  File "${JANITORBUILDPATH}\ICSharpCode.SharpZipLib License.txt"
-  File "${JANITORBUILDPATH}\ICSharpCode.SharpZipLib.dll"
-
+  
   WriteRegStr HKLM SOFTWARE\HeuristicLabHiveJanitorService "Install_Dir" "$INSTDIR"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "DisplayName" "HeuristicLabHiveJanitorService"
@@ -46 +62 @@
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "NoRepair" 1
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveJanitorService" "DisplayVersion" "${VERSION}"
   WriteUninstaller "uninstall.exe"
 
   nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Services.Hive.JanitorService-3.3.exe" --install'
-
 SectionEnd
 
@@ -69 +85 @@
   Delete "$INSTDIR\HeuristicLab.Services.Hive-3.3.dll"
   Delete "$INSTDIR\HeuristicLab.Tracing-3.3.dll"
-  Delete "$INSTDIR\ICSharpCode.SharpZipLib License.txt"
-  Delete "$INSTDIR\ICSharpCode.SharpZipLib.dll"    
   Delete "$INSTDIR\uninstall.exe"
 
   RMDir "$INSTDIR"
-
 SectionEnd
 

branches/HeuristicLab.DatasetRefactor/sources/Installers/HiveSlaveInstaller.nsi

@@ +1 @@
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 ; NSIS installer script for HeuristicLab Hive Slave
-; NSIS version: v3.0b0
+; NSIS version: 3.0b0
 
 Name "HeuristicLab Hive Slave"
@@ -8 +27 @@
 !define BUILDCONFIGURATION "Debug"
 !define SLAVEBUILDPATH "..\HeuristicLab.Clients.Hive.Slave.WindowsService\3.3\bin\${BUILDCONFIGURATION}"
+!define VERSION "3.3.11"
 
 InstallDir $PROGRAMFILES\HeuristicLabHiveSlave
-InstallDirRegKey HKLM "Software\HeuristicLabHiveSlave" "Install_Dir"
-
 RequestExecutionLevel admin
 
@@ -45 +63 @@
   File "${SLAVEBUILDPATH}\HeuristicLab.PluginInfrastructure-3.3.dll"
   File "${SLAVEBUILDPATH}\HeuristicLab.Tracing-3.3.dll"
-  File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib License.txt"
-  File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib.dll"
 
 
@@ -54 +70 @@
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoRepair" 1
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "DisplayVersion" "${VERSION}"
   WriteUninstaller "uninstall.exe"
 
   nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --install'
-
 SectionEnd
 
@@ -84 +100 @@
   Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll
   Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll
-  Delete "$INSTDIR\ICSharpCode.SharpZipLib License.txt"
-  Delete $INSTDIR\ICSharpCode.SharpZipLib.dll
   Delete $INSTDIR\uninstall.exe
 
   RMDir "$INSTDIR"
-
 SectionEnd