Skip to content

Commit f5d2b57

Browse files
ernst-bablickernst-bablick
committed
EH: CS-1199: Installer does not distinguish between client, execution and master specific binaries
1 parent 085f591 commit f5d2b57

File tree

30 files changed

+65
-34
lines changed

30 files changed

+65
-34
lines changed

‎CMakeLists.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,28 @@ set(PROJECT_FEATURES "clusterscheduler" CACHE STRING "clusterscheduler or gcs-ex
9494

9595
# INSTALL OPTIONS
9696
option(INSTALL_SGE_BIN "Install binaries" ON)
97+
option(INSTALL_SGE_BIN_CLIENT "Install client binaries" OFF)
98+
option(INSTALL_SGE_BIN_EXEC "Install execution daemon binaries" OFF)
99+
option(INSTALL_SGE_BIN_MASTER "Install master daemon binaries" OFF)
97100
option(INSTALL_SGE_COMMON "Install common files" ON)
98101
option(INSTALL_SGE_DOC "Build and install documentation" OFF)
99102
option(INSTALL_SGE_TEST "Install test binaries" ON)
100103
option(INSTALL_SGE_SRCDOC "Build and install source code documentation" OFF)
101104

105+
# set derived install options if user did not set any of them
106+
# might be further refined in ArchitectureSpecificSettings.cmake
107+
if(NOT (INSTALL_SGE_BIN_CLIENT OR INSTALL_SGE_BIN_EXEC OR INSTALL_SGE_BIN_MASTER))
108+
if(INSTALL_SGE_BIN)
109+
set(INSTALL_SGE_BIN_CLIENT ON CACHE BOOL "Install client binaries" FORCE)
110+
set(INSTALL_SGE_BIN_EXEC ON CACHE BOOL "Install execution daemon binaries" FORCE)
111+
set(INSTALL_SGE_BIN_MASTER ON CACHE BOOL "Install master daemon binaries" FORCE)
112+
else()
113+
set(INSTALL_SGE_BIN_CLIENT OFF CACHE BOOL "Install client binaries" FORCE)
114+
set(INSTALL_SGE_BIN_EXEC OFF CACHE BOOL "Install execution daemon binaries" FORCE)
115+
set(INSTALL_SGE_BIN_MASTER OFF CACHE BOOL "Install master daemon binaries" FORCE)
116+
endif()
117+
endif()
118+
102119
# BUILD OPTIONS
103120
option(ENABLE_LTO "Enable to add Link Time Optimization in Release Build." ON)
104121
option(ENABLE_SANITIZERS "Enable address, leak and undefined behaviour sanitizer" OFF)
@@ -292,7 +309,7 @@ if (INSTALL_SGE_DOC)
292309
add_subdirectory(doc)
293310
endif ()
294311

295-
if (INSTALL_SGE_BIN OR INSTALL_SGE_COMMON OR INSTALL_SGE_TEST)
312+
if (INSTALL_SGE_BIN OR INSTALL_SGE_BIN_CLIENT OR INSTALL_SGE_BIN_EXEC OR INSTALL_SGE_BIN_MASTER OR INSTALL_SGE_COMMON OR INSTALL_SGE_TEST)
296313
add_subdirectory(source)
297314
add_subdirectory(test)
298315
endif ()

‎cmake/ArchitectureSpecificSettings.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ function(architecture_specific_settings)
8080
set(WITH_MTMALLOC OFF PARENT_SCOPE)
8181
set(JNI_ARCH "linux" PARENT_SCOPE)
8282
elseif (SGE_ARCH MATCHES "lx-.*" OR SGE_ARCH MATCHES "ulx-.*" OR SGE_ARCH MATCHES "xlx-.*")
83+
# master is not supported on CentOS 6. Execd is deprecated and will be removed in the future.
84+
if (SGE_ARCH STREQUAL "xlx-.*")
85+
set(INSTALL_SGE_BIN_MASTER OFF CACHE BOOL "Install master daemon binaries" FORCE)
86+
#set(INSTALL_SGE_BIN_EXEC OFF CACHE BOOL "Install execution daemon binaries" FORCE)
87+
endif()
88+
8389
# Disable Python for unsupported qmaster architectures
8490
if (WITH_PYTHON)
8591
if (SGE_ARCH MATCHES "lx-ppc64le" OR SGE_ARCH MATCHES "lx-s390x")
@@ -222,6 +228,9 @@ function(architecture_specific_settings)
222228
set(NSL_LIB socket nsl PARENT_SCOPE)
223229
endif()
224230
elseif (SGE_ARCH MATCHES "darwin-arm64")
231+
set(INSTALL_SGE_BIN_EXEC OFF CACHE BOOL "Install execution daemon binaries" FORCE)
232+
set(INSTALL_SGE_BIN_MASTER OFF CACHE BOOL "Install execution daemon binaries" FORCE)
233+
225234
# Disable Python for unsupported qmaster architectures
226235
set(WITH_PYTHON OFF PARENT_SCOPE)
227236

‎doc/markdown/manual/release-notes/02_os_matrix.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ xxQS_NAMExx components on the other axis.
2626
| | | | | | |
2727
| Alma Linux | 8 | x86-64 | x | x | x |
2828
| Alma Linux | 9 | x86-64 | x | x | x |
29-
| CentOS Linux | 6 | x86-64 | | d | d |
29+
| CentOS Linux | 6 | x86-64 | - | d | d |
3030
| CentOS Linux | 7 | x86-64 | a | x | x |
3131
| CentOS Linux | 8 | x86-64 | x | x | x |
3232
| CentOS Linux | 9 | x86-64 | x | x | x |
@@ -47,7 +47,7 @@ xxQS_NAMExx components on the other axis.
4747
| Ubuntu Linux | 22.04 | x86-64 | x | x | x |
4848
| Ubuntu Linux | 24.04 | x86-64 | x | x | x |
4949

50-
-: Unsupported
50+
-: Unavailable and Unsupported
5151
a: Available but not covered by support contract. Contact our sales and support team if you need this configuration.
5252
b: Still in beta testing. Contact our sales and support team if you need this configuration.
5353
d: Deprecated. Will be removed in the next minor release (9.1.0).

‎source/3rdparty/qmake-4.4/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ target_include_directories(
8080
)
8181
target_link_libraries(qmake PRIVATE ${GEN_LIB} ${SGE_LIBS})
8282

83-
if(INSTALL_SGE_BIN)
83+
if(INSTALL_SGE_BIN_CLIENT)
8484
install(TARGETS qmake DESTINATION bin/${SGE_ARCH})
8585
endif()

‎source/clients/qacct/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ target_link_libraries(
3333
uti
3434
${SGE_LIBS})
3535

36-
if (INSTALL_SGE_BIN)
36+
if (INSTALL_SGE_BIN_CLIENT)
3737
install(TARGETS qacct DESTINATION bin/${SGE_ARCH})
3838
endif ()

‎source/clients/qalter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ target_link_libraries(
4141
uti
4242
${SGE_LIBS})
4343

44-
if (INSTALL_SGE_BIN)
44+
if (INSTALL_SGE_BIN_CLIENT)
4545
install(TARGETS qalter DESTINATION bin/${SGE_ARCH})
4646

4747
install(

‎source/clients/qconf/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ target_link_libraries(
4848
uti
4949
${SGE_LIBS})
5050

51-
if (INSTALL_SGE_BIN)
51+
if (INSTALL_SGE_BIN_CLIENT)
5252
install(TARGETS qconf DESTINATION bin/${SGE_ARCH})
5353
endif ()

‎source/clients/qdel/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ target_link_libraries(
3333
uti
3434
${SGE_LIBS})
3535

36-
if (INSTALL_SGE_BIN)
36+
if (INSTALL_SGE_BIN_CLIENT)
3737
install(TARGETS qdel DESTINATION bin/${SGE_ARCH})
3838
endif ()

‎source/clients/qhost/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ target_link_libraries(
4242
uti
4343
${SGE_LIBS})
4444

45-
if (INSTALL_SGE_BIN)
45+
if (INSTALL_SGE_BIN_CLIENT)
4646
install(TARGETS qhost DESTINATION bin/${SGE_ARCH})
4747
endif ()

‎source/clients/qmod/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ target_link_libraries(
3232
uti
3333
${SGE_LIBS})
3434

35-
if (INSTALL_SGE_BIN)
35+
if (INSTALL_SGE_BIN_CLIENT)
3636
install(TARGETS qmod DESTINATION bin/${SGE_ARCH})
3737
endif ()

‎source/clients/qquota/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ target_link_libraries(
4242
uti
4343
${SGE_LIBS})
4444

45-
if (INSTALL_SGE_BIN)
45+
if (INSTALL_SGE_BIN_CLIENT)
4646
install(TARGETS qquota DESTINATION bin/${SGE_ARCH})
4747
endif ()

‎source/clients/qrdel/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ target_link_libraries(
3636
uti
3737
${SGE_LIBS})
3838

39-
if (INSTALL_SGE_BIN)
39+
if (INSTALL_SGE_BIN_CLIENT)
4040
install(TARGETS qrdel DESTINATION bin/${SGE_ARCH})
4141
endif ()

‎source/clients/qrsh_starter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ add_executable(qrsh_starter ocs_qrsh_starter.cc)
2323
target_include_directories(qrsh_starter PRIVATE ${SGE_INCLUDES})
2424
target_link_libraries(qrsh_starter PRIVATE uti commlists ${SGE_LIBS})
2525

26-
if (INSTALL_SGE_BIN)
26+
if (INSTALL_SGE_BIN_EXEC)
2727
install(TARGETS qrsh_starter DESTINATION utilbin/${SGE_ARCH})
2828
endif ()

‎source/clients/qrstat/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ target_link_libraries(
4545
uti
4646
${SGE_LIBS})
4747

48-
if (INSTALL_SGE_BIN)
48+
if (INSTALL_SGE_BIN_CLIENT)
4949
install(TARGETS qrstat DESTINATION bin/${SGE_ARCH})
5050
endif ()

‎source/clients/qrsub/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ target_link_libraries(
4242
uti
4343
${SGE_LIBS})
4444

45-
if (INSTALL_SGE_BIN)
45+
if (INSTALL_SGE_BIN_CLIENT)
4646
install(TARGETS qrsub DESTINATION bin/${SGE_ARCH})
4747
endif ()

‎source/clients/qsh/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ target_link_libraries(
4646
ijs
4747
${SGE_LIBS})
4848

49-
if (INSTALL_SGE_BIN)
49+
if (INSTALL_SGE_BIN_CLIENT)
5050
install(TARGETS qsh DESTINATION bin/${SGE_ARCH})
5151

5252
install(

‎source/clients/qstat/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ target_link_libraries(
4646
uti
4747
${SGE_LIBS})
4848

49-
if (INSTALL_SGE_BIN)
49+
if (INSTALL_SGE_BIN_CLIENT)
5050
install(TARGETS qstat DESTINATION bin/${SGE_ARCH})
5151

5252
install(

‎source/clients/qsub/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ target_link_libraries(
4343
uti
4444
${SGE_LIBS})
4545

46-
if (INSTALL_SGE_BIN)
46+
if (INSTALL_SGE_BIN_CLIENT)
4747
install(TARGETS qsub DESTINATION bin/${SGE_ARCH})
4848
endif ()

‎source/clients/showq/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ target_link_libraries(
4141
uti
4242
${SGE_LIBS})
4343

44-
if (INSTALL_SGE_BIN)
44+
if (INSTALL_SGE_BIN_CLIENT)
4545
install(TARGETS showq DESTINATION examples/jobsbin/${SGE_ARCH})
4646
endif ()

‎source/daemons/execd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ target_link_libraries(
6161
${SGE_TOPO_LIB}
6262
${SGE_LIBS})
6363

64-
if (INSTALL_SGE_BIN)
64+
if (INSTALL_SGE_BIN_EXEC)
6565
install(TARGETS sge_execd DESTINATION bin/${SGE_ARCH})
6666
endif ()

‎source/daemons/qmaster/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ target_link_libraries(
108108
PRIVATE ${SGE_LIBS} ${SPOOLING_LIBS} ${GPERFTOOLS_PROFILER}
109109
)
110110

111-
if (INSTALL_SGE_BIN)
111+
if (INSTALL_SGE_BIN_MASTER)
112112
install(TARGETS sge_qmaster
113113
DESTINATION bin/${SGE_ARCH})
114114
endif ()
@@ -135,7 +135,7 @@ if (WITH_PYTHON)
135135
PRIVATE ${SGE_LIBS} ${SPOOLING_LIBS} ${GPERFTOOLS_PROFILER} ${PYTHON_ALL_LIBRARIES}
136136
)
137137

138-
if (INSTALL_SGE_BIN)
138+
if (INSTALL_SGE_BIN_MASTER)
139139
install(TARGETS sge_qmaster.python
140140
DESTINATION bin/${SGE_ARCH})
141141
endif ()

‎source/daemons/shadowd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ target_link_libraries(
3737
uti
3838
${SGE_LIBS})
3939

40-
if (INSTALL_SGE_BIN)
40+
if (INSTALL_SGE_BIN_EXEC)
4141
install(TARGETS sge_shadowd DESTINATION bin/${SGE_ARCH})
4242
endif ()

‎source/daemons/shepherd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ target_link_libraries(
4848
${SGE_TOPO_LIB}
4949
${SGE_LIBS})
5050

51-
if (INSTALL_SGE_BIN)
51+
if (INSTALL_SGE_BIN_EXEC)
5252
install(TARGETS sge_shepherd DESTINATION bin/${SGE_ARCH})
5353
endif ()

‎source/libs/japi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if (INSTALL_SGE_COMMON)
8181
DESTINATION examples/drmaa)
8282
endif ()
8383

84-
if (INSTALL_SGE_BIN)
84+
if (INSTALL_SGE_BIN_CLIENT)
8585
install(TARGETS drmaa DESTINATION lib/${SGE_ARCH})
8686
endif ()
8787

‎source/libs/sgeobj/config.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
#include <cstdio>
3636
#include <cstring>
37-
#include <strings.h>
3837
#include <cctype>
3938
#include <cstdlib>
4039

‎source/libs/spool/berkeleydb/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if (${WITH_SPOOL_BERKELEYDB})
4545
commlists
4646
berkeleydb)
4747

48-
if (INSTALL_SGE_BIN)
48+
if (INSTALL_SGE_BIN_MASTER)
4949
install(TARGETS spoolb DESTINATION lib/${SGE_ARCH})
5050

5151
if (NOT WITH_OS_3RDPARTY)

‎source/libs/spool/dynamic/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if (${WITH_SPOOL_DYNAMIC})
4848
#add_compile_options(-fno-common -dynamic)
4949
#add_link_options(-dynamiclib -flat_namespace)
5050

51-
if (INSTALL_SGE_BIN)
51+
if (INSTALL_SGE_BIN_MASTER)
5252
install(TARGETS spoold DESTINATION lib/${SGE_ARCH})
5353
endif ()
5454
endif ()

‎source/libs/spool/flatfile/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ target_link_libraries(
5454
commlists
5555
)
5656

57-
if (INSTALL_SGE_BIN)
57+
if (INSTALL_SGE_BIN_MASTER)
5858
install(TARGETS spoolc DESTINATION lib/${SGE_ARCH})
5959
endif ()
6060

‎source/security/coshepherd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ target_include_directories(sge_coshepherd PRIVATE ${SGE_INCLUDES})
2626

2727
target_link_libraries(sge_coshepherd PRIVATE sgeobj cull uti commlists ${SGE_LIBS})
2828

29-
if(INSTALL_SGE_BIN)
29+
if(INSTALL_SGE_BIN_EXEC)
3030
install(TARGETS sge_coshepherd DESTINATION bin/${SGE_ARCH})
3131
endif()

‎source/utilbin/CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ target_link_libraries(
196196
uti
197197
${SGE_LIBS})
198198

199-
if (INSTALL_SGE_BIN)
199+
if (INSTALL_SGE_BIN_CLIENT)
200200
install(TARGETS qping DESTINATION bin/${SGE_ARCH})
201201
install(
202202
TARGETS adminrun
@@ -214,11 +214,17 @@ if (INSTALL_SGE_BIN)
214214
now
215215
read_raw
216216
sge_share_mon
217-
spooldefaults
218-
spooledit
219-
spoolinit
220217
testsuidroot
221218
uidgid
222219
DESTINATION utilbin/${SGE_ARCH})
220+
endif ()
221+
222+
if (INSTALL_SGE_BIN_EXEC)
223+
install(
224+
TARGETS
225+
spooldefaults
226+
spooledit
227+
spoolinit
228+
DESTINATION utilbin/${SGE_ARCH})
223229
install(TARGETS work DESTINATION examples/jobsbin/${SGE_ARCH})
224230
endif ()

0 commit comments

Comments
 (0)