Changeset 11366
- Timestamp:
- 09/15/14 11:18:18 (6 years ago)
- Location:
- trunk/sources
- Files:
-
- 2 added
- 2 edited
-
HeuristicLab.Services.Hive.JanitorService/3.3/HeuristicLab.Services.Hive.JanitorService-3.3.csproj (modified) (2 diffs)
-
HeuristicLab.Services.Hive.JanitorService/3.3/ICSharpCode.SharpZipLib License.txt (added)
-
Installers/HiveJanitorServiceInstaller.nsi (added)
-
Installers/HiveSlaveInstaller.nsi (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Services.Hive.JanitorService/3.3/HeuristicLab.Services.Hive.JanitorService-3.3.csproj
r8600 r11366 135 135 </EmbeddedResource> 136 136 </ItemGroup> 137 <ItemGroup> 138 <Content Include="ICSharpCode.SharpZipLib License.txt"> 139 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 140 </Content> 141 </ItemGroup> 137 142 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 138 143 <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) 140 145 set ProjectDir=$(ProjectDir) 141 146 set SolutionDir=$(SolutionDir) … … 143 148 144 149 call PreBuildEvent.cmd</PreBuildEvent> 145 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">150 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 146 151 export ProjectDir=$(ProjectDir) 147 152 export SolutionDir=$(SolutionDir) -
trunk/sources/Installers/HiveSlaveInstaller.nsi
r11364 r11366 26 26 27 27 Section "HeuristicLabHiveSlave (required)" 28 SetOutPath $INSTDIR28 SetOutPath $INSTDIR 29 29 30 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe"31 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll"32 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config"33 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll"34 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive-3.3.dll"35 File "${SLAVEBUILDPATH}\HeuristicLab.Collections-3.3.dll"36 File "${SLAVEBUILDPATH}\HeuristicLab.Common.Resources-3.3.dll"37 File "${SLAVEBUILDPATH}\HeuristicLab.Common-3.3.dll"38 File "${SLAVEBUILDPATH}\HeuristicLab.Core-3.3.dll"39 File "${SLAVEBUILDPATH}\HeuristicLab.Data-3.3.dll"40 File "${SLAVEBUILDPATH}\HeuristicLab.Hive-3.3.dll"41 File "${SLAVEBUILDPATH}\HeuristicLab.MainForm-3.3.dll"42 File "${SLAVEBUILDPATH}\HeuristicLab.Optimization-3.3.dll"43 File "${SLAVEBUILDPATH}\HeuristicLab.Parameters-3.3.dll"44 File "${SLAVEBUILDPATH}\HeuristicLab.Persistence-3.3.dll"45 File "${SLAVEBUILDPATH}\HeuristicLab.PluginInfrastructure-3.3.dll"46 File "${SLAVEBUILDPATH}\HeuristicLab.Tracing-3.3.dll"47 File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib License.txt"48 File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib.dll"30 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" 31 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Common-3.3.dll" 32 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config" 33 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll" 34 File "${SLAVEBUILDPATH}\HeuristicLab.Clients.Hive-3.3.dll" 35 File "${SLAVEBUILDPATH}\HeuristicLab.Collections-3.3.dll" 36 File "${SLAVEBUILDPATH}\HeuristicLab.Common.Resources-3.3.dll" 37 File "${SLAVEBUILDPATH}\HeuristicLab.Common-3.3.dll" 38 File "${SLAVEBUILDPATH}\HeuristicLab.Core-3.3.dll" 39 File "${SLAVEBUILDPATH}\HeuristicLab.Data-3.3.dll" 40 File "${SLAVEBUILDPATH}\HeuristicLab.Hive-3.3.dll" 41 File "${SLAVEBUILDPATH}\HeuristicLab.MainForm-3.3.dll" 42 File "${SLAVEBUILDPATH}\HeuristicLab.Optimization-3.3.dll" 43 File "${SLAVEBUILDPATH}\HeuristicLab.Parameters-3.3.dll" 44 File "${SLAVEBUILDPATH}\HeuristicLab.Persistence-3.3.dll" 45 File "${SLAVEBUILDPATH}\HeuristicLab.PluginInfrastructure-3.3.dll" 46 File "${SLAVEBUILDPATH}\HeuristicLab.Tracing-3.3.dll" 47 File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib License.txt" 48 File "${SLAVEBUILDPATH}\ICSharpCode.SharpZipLib.dll" 49 49 50 50 51 WriteRegStr HKLM SOFTWARE\HeuristicLabHiveSlave "Install_Dir" "$INSTDIR"52 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "DisplayName" "HeuristicLabHiveSlave"53 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "UninstallString" '"$INSTDIR\uninstall.exe"'54 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoModify" 155 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoRepair" 156 WriteUninstaller "uninstall.exe"51 WriteRegStr HKLM SOFTWARE\HeuristicLabHiveSlave "Install_Dir" "$INSTDIR" 52 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "DisplayName" "HeuristicLabHiveSlave" 53 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "UninstallString" '"$INSTDIR\uninstall.exe"' 54 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoModify" 1 55 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" "NoRepair" 1 56 WriteUninstaller "uninstall.exe" 57 57 58 nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --install'58 nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --install' 59 59 60 60 SectionEnd … … 62 62 63 63 Section "un.Uninstall" 64 DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" 65 DeleteRegKey HKLM SOFTWARE\HeuristicLabHiveSlave 66 67 nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --uninstall' 68 69 Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe 70 Delete $INSTDIR\HeuristicLab.Clients.Common-3.3.dll 71 Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config 72 Delete $INSTDIR\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll 73 Delete $INSTDIR\HeuristicLab.Clients.Hive-3.3.dll 74 Delete $INSTDIR\HeuristicLab.Collections-3.3.dll 75 Delete $INSTDIR\HeuristicLab.Common.Resources-3.3.dll 76 Delete $INSTDIR\HeuristicLab.Common-3.3.dll 77 Delete $INSTDIR\HeuristicLab.Core-3.3.dll 78 Delete $INSTDIR\HeuristicLab.Data-3.3.dll 79 Delete $INSTDIR\HeuristicLab.Hive-3.3.dll 80 Delete $INSTDIR\HeuristicLab.MainForm-3.3.dll 81 Delete $INSTDIR\HeuristicLab.Optimization-3.3.dll 82 Delete $INSTDIR\HeuristicLab.Parameters-3.3.dll 83 Delete $INSTDIR\HeuristicLab.Persistence-3.3.dll 84 Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll 85 Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll 86 Delete "$INSTDIR\ICSharpCode.SharpZipLib License.txt" 87 Delete $INSTDIR\ICSharpCode.SharpZipLib.dll 88 Delete $INSTDIR\uninstall.exe 64 DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HeuristicLabHiveSlave" 65 DeleteRegKey HKLM SOFTWARE\HeuristicLabHiveSlave 89 66 90 RMDir "$INSTDIR" 67 nsExec::ExecToLog '"$INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe" --uninstall' 68 69 Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe 70 Delete $INSTDIR\HeuristicLab.Clients.Common-3.3.dll 71 Delete $INSTDIR\HeuristicLab.Clients.Hive.Slave.WindowsService.exe.config 72 Delete $INSTDIR\HeuristicLab.Clients.Hive.SlaveCore-3.3.dll 73 Delete $INSTDIR\HeuristicLab.Clients.Hive-3.3.dll 74 Delete $INSTDIR\HeuristicLab.Collections-3.3.dll 75 Delete $INSTDIR\HeuristicLab.Common.Resources-3.3.dll 76 Delete $INSTDIR\HeuristicLab.Common-3.3.dll 77 Delete $INSTDIR\HeuristicLab.Core-3.3.dll 78 Delete $INSTDIR\HeuristicLab.Data-3.3.dll 79 Delete $INSTDIR\HeuristicLab.Hive-3.3.dll 80 Delete $INSTDIR\HeuristicLab.MainForm-3.3.dll 81 Delete $INSTDIR\HeuristicLab.Optimization-3.3.dll 82 Delete $INSTDIR\HeuristicLab.Parameters-3.3.dll 83 Delete $INSTDIR\HeuristicLab.Persistence-3.3.dll 84 Delete $INSTDIR\HeuristicLab.PluginInfrastructure-3.3.dll 85 Delete $INSTDIR\HeuristicLab.Tracing-3.3.dll 86 Delete "$INSTDIR\ICSharpCode.SharpZipLib License.txt" 87 Delete $INSTDIR\ICSharpCode.SharpZipLib.dll 88 Delete $INSTDIR\uninstall.exe 89 90 RMDir "$INSTDIR" 91 91 92 92 SectionEnd
Note: See TracChangeset
for help on using the changeset viewer.
