From c66ce449d291b1732e069d4fa3a01a393f2eb8a0 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Mon, 29 Apr 2024 13:04:05 +0100 Subject: [PATCH 1/8] Split off 8.12.104 Signed-off-by: Gordon Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- helm/hpcc/templates/dafilesrv.yaml | 2 +- helm/hpcc/templates/dali.yaml | 2 +- helm/hpcc/templates/dfuserver.yaml | 2 +- helm/hpcc/templates/eclagent.yaml | 4 ++-- helm/hpcc/templates/eclccserver.yaml | 4 ++-- helm/hpcc/templates/eclscheduler.yaml | 2 +- helm/hpcc/templates/esp.yaml | 2 +- helm/hpcc/templates/localroxie.yaml | 2 +- helm/hpcc/templates/roxie.yaml | 8 ++++---- helm/hpcc/templates/sasha.yaml | 2 +- helm/hpcc/templates/thor.yaml | 10 +++++----- version.cmake | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 753adcc4d4d..07c89fa9a91 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 8.12.103-closedown0 +version: 8.12.105-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 8.12.103-closedown0 +appVersion: 8.12.105-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index 15bde3fe840..1d36d8d28bb 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1240,7 +1240,7 @@ kind: Service metadata: name: {{ $lvars.serviceName | quote }} labels: - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }} {{- if $lvars.labels }} {{ toYaml $lvars.labels | indent 4 }} diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index 751350e9e2b..2a5b4168c57 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -50,7 +50,7 @@ spec: labels: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }} server: {{ .name | quote }} - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 annotations: checksum/config: {{ $configSHA }} spec: diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml index 3d77694e8fa..911760f50e4 100644 --- a/helm/hpcc/templates/dali.yaml +++ b/helm/hpcc/templates/dali.yaml @@ -82,7 +82,7 @@ spec: run: {{ $dali.name | quote }} server: {{ $dali.name | quote }} app: dali - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} {{- end }} diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml index 9c8209337a1..24c55cc8545 100644 --- a/helm/hpcc/templates/dfuserver.yaml +++ b/helm/hpcc/templates/dfuserver.yaml @@ -56,7 +56,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }} run: {{ .name | quote }} accessDali: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml index 61fff3bbba0..0304e0eca75 100644 --- a/helm/hpcc/templates/eclagent.yaml +++ b/helm/hpcc/templates/eclagent.yaml @@ -58,7 +58,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -137,7 +137,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml index fe382eb195d..0cb271ab5be 100644 --- a/helm/hpcc/templates/eclccserver.yaml +++ b/helm/hpcc/templates/eclccserver.yaml @@ -57,7 +57,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -142,7 +142,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml index be161e2261e..73bcc32bce7 100644 --- a/helm/hpcc/templates/eclscheduler.yaml +++ b/helm/hpcc/templates/eclscheduler.yaml @@ -64,7 +64,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: "no" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml index 63bc85691f0..838bc786497 100644 --- a/helm/hpcc/templates/esp.yaml +++ b/helm/hpcc/templates/esp.yaml @@ -117,7 +117,7 @@ spec: server: {{ .name | quote }} accessDali: "yes" app: {{ $application }} - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml index 62373febc06..fd14aa348dd 100644 --- a/helm/hpcc/templates/localroxie.yaml +++ b/helm/hpcc/templates/localroxie.yaml @@ -70,7 +70,7 @@ spec: server: {{ $servername | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index cac2a3e5b88..533588ad0b2 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -120,7 +120,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }} run: {{ $commonCtx.toponame | quote }} roxie-cluster: {{ $roxie.name | quote }} - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} @@ -180,7 +180,7 @@ kind: Service metadata: name: {{ $commonCtx.toponame | quote }} labels: - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} spec: ports: @@ -242,7 +242,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} @@ -347,7 +347,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml index 8148a2d6b56..269e569affc 100644 --- a/helm/hpcc/templates/sasha.yaml +++ b/helm/hpcc/templates/sasha.yaml @@ -52,7 +52,7 @@ spec: run: {{ $serviceName | quote }} server: {{ $serviceName | quote }} accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }} - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- if hasKey $sasha "labels" }} {{ toYaml $sasha.labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index 47c60fec8ec..dad30506fe0 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -82,7 +82,7 @@ data: labels: accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }} {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} @@ -149,7 +149,7 @@ data: accessEsp: "yes" app: "thor" component: "thormanager" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }} @@ -218,7 +218,7 @@ data: accessEsp: "yes" app: "thor" component: "thorworker" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }} @@ -353,7 +353,7 @@ spec: accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }} app: "thor" component: "thor-eclagent" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 instance: {{ $commonCtx.eclAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} @@ -418,7 +418,7 @@ spec: accessEsp: "no" app: "thor" component: "thor-thoragent" - helmVersion: 8.12.103-closedown0 + helmVersion: 8.12.105-closedown0 instance: {{ $commonCtx.thorAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} diff --git a/version.cmake b/version.cmake index ea8f09f5071..e979535c576 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 103 ) +set ( HPCC_POINT 105 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-04-11T16:39:31Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-04-29T12:04:04Z" ) ### From ad210d0afa9b6a2f9eb6b237103c3e2208f14565 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 17 May 2024 09:27:05 +0100 Subject: [PATCH 2/8] HPCC-31874 Bump vcpkg submodule version Fix mono failing to download Signed-off-by: Gordon Smith --- vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg b/vcpkg index 2581536d4aa..cb99f9f106a 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 2581536d4aa5e644e2da47d35335627f9634eca3 +Subproject commit cb99f9f106a31f3b301c618ab570c629b968c372 From 5375866ca96f76a1056d1e5904e53f1b718414cd Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 17 May 2024 09:23:31 +0100 Subject: [PATCH 3/8] HPCC-31874 Bump vcpkg submodule version Fix mono failing to download Signed-off-by: Gordon Smith --- vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg b/vcpkg index 2581536d4aa..cb99f9f106a 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 2581536d4aa5e644e2da47d35335627f9634eca3 +Subproject commit cb99f9f106a31f3b301c618ab570c629b968c372 From f5ae51c558f06f251dbb63f2d57d17b829579a3c Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 17 May 2024 09:12:09 +0100 Subject: [PATCH 4/8] HPCC-31874 Bump vcpkg submodule version Fix mono failing to download Signed-off-by: Gordon Smith --- vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg b/vcpkg index c0fd15560da..1376f1b0682 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit c0fd15560dae60af9b66c0095f80dca2fcdf7a92 +Subproject commit 1376f1b06824b6b154cde5448f42902aecb7223b From 28f19ce799470b5becd8697b57b9712b28233e0e Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 17 May 2024 09:06:32 +0100 Subject: [PATCH 5/8] HPCC-31874 Bump vcpkg submodule version Fix mono failing to download Consolidate overlays Signed-off-by: Gordon Smith --- vcpkg | 2 +- vcpkg_overlays/nlp-engine/CMakeLists.txt | 67 -------------- vcpkg_overlays/nlp-engine/portfile.cmake | 38 -------- vcpkg_overlays/nlp-engine/vcpkg.json | 23 ----- .../add-missing-dependencies.patch | 15 ---- .../add-missing-find-dependency.patch | 13 --- .../hpcc-remove-unsafe-onfork.patch | 56 ------------ .../opentelemetry-cpp/portfile.cmake | 75 ---------------- .../use-default-cxx-version.patch | 26 ------ vcpkg_overlays/opentelemetry-cpp/vcpkg.json | 87 ------------------- 10 files changed, 1 insertion(+), 401 deletions(-) delete mode 100644 vcpkg_overlays/nlp-engine/CMakeLists.txt delete mode 100644 vcpkg_overlays/nlp-engine/portfile.cmake delete mode 100644 vcpkg_overlays/nlp-engine/vcpkg.json delete mode 100644 vcpkg_overlays/opentelemetry-cpp/add-missing-dependencies.patch delete mode 100644 vcpkg_overlays/opentelemetry-cpp/add-missing-find-dependency.patch delete mode 100644 vcpkg_overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch delete mode 100644 vcpkg_overlays/opentelemetry-cpp/portfile.cmake delete mode 100644 vcpkg_overlays/opentelemetry-cpp/use-default-cxx-version.patch delete mode 100644 vcpkg_overlays/opentelemetry-cpp/vcpkg.json diff --git a/vcpkg b/vcpkg index 7c05b76c190..4f9147692bc 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 7c05b76c190e8099f5d5c86e54fce9df694bbc2f +Subproject commit 4f9147692bc222e6f4a503f353e4f78a684e00ea diff --git a/vcpkg_overlays/nlp-engine/CMakeLists.txt b/vcpkg_overlays/nlp-engine/CMakeLists.txt deleted file mode 100644 index 66dd00be7e8..00000000000 --- a/vcpkg_overlays/nlp-engine/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -# set the project name and version -project(nlp-engine) - -set(CMAKE_CXX_STANDARD 17) - -find_package(ICU REQUIRED COMPONENTS data i18n io tu uc) - -include_directories(cs/include) -include_directories(include) -include_directories(include/Api) -include_directories(include/Api/lite) -include_directories(${ICU_INCLUDE_DIRS}) - -add_subdirectory(cs) -add_subdirectory(src) - -install(DIRECTORY "${CMAKE_SOURCE_DIR}/include" DESTINATION "." FILES_MATCHING PATTERN "*.h") - -add_definitions( -DLITE_EXPORTS ) -if(WIN32) - add_definitions( -DMSVC_VERSION=${MSVC_VERSION} -D_CRT_SECURE_NO_WARNINGS ) -else() - add_definitions( -DLINUX -Wno-write-strings -Wno-deprecated ) -endif() - -file(GLOB lite_src "lite/*.h" "lite/*.cpp") -add_library(nlp-engine SHARED ${lite_src}) -target_link_libraries(nlp-engine PRIVATE - prim - kbm - consh - words - ${ICU_LIBRARIES} -) - -target_include_directories(nlp-engine - INTERFACE - $ - $ - $ -) - -install(TARGETS nlp-engine - EXPORT nlp-engine-config - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install(EXPORT nlp-engine-config - FILE nlp-engine-config.cmake - DESTINATION share/cmake/nlp-engine -) - -install( - DIRECTORY ./analyzers - DESTINATION share/nlp-engine - COMPONENT Runtime -) - -install( - DIRECTORY ./data - DESTINATION share/nlp-engine - COMPONENT Runtime -) diff --git a/vcpkg_overlays/nlp-engine/portfile.cmake b/vcpkg_overlays/nlp-engine/portfile.cmake deleted file mode 100644 index ae931ff004c..00000000000 --- a/vcpkg_overlays/nlp-engine/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO VisualText/nlp-engine - REF v${VERSION} - SHA512 a6871cb3db10a1d4bd7d5290141a82e788269da28b2d995963825dc4c50025e6099f5f872e4538054b7fb169773b6d6d3e73e3dd102bc3e0cbb5bddcd95ae484 - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH ANALYZER_PATH - REPO VisualText/analyzers - REF v1.6.2 - SHA512 07479c8ba1f36c3a0bb035af7414e96ce1477ffaa8a276256fc3749d169c0bb99f9ac9ad5c9b5b0868d634644013c46643a90598dd465e4f16bbe82a47ac60fe - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH PARSE_EN_US_PATH - REPO VisualText/parse-en-us - REF v1.1.1 - SHA512 1aa01c0befe82b8fe415576ae992b0b60fe51b816e93fd8f45da4c5ccacc3dc87c21373ba001cf0d0c503131b4b83346e86f1522795901bbceb07c63a52d6294 - HEAD_REF master -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY "${ANALYZER_PATH}/." DESTINATION "${SOURCE_PATH}/analyzers" PATTERN "*.*") -file(COPY "${PARSE_EN_US_PATH}/." DESTINATION "${SOURCE_PATH}/analyzers/parse-en-us" PATTERN "*.*") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "nlp-engine" CONFIG_PATH "share/cmake/nlp-engine") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/vcpkg_overlays/nlp-engine/vcpkg.json b/vcpkg_overlays/nlp-engine/vcpkg.json deleted file mode 100644 index f58aab2fe7b..00000000000 --- a/vcpkg_overlays/nlp-engine/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "nlp-engine", - "version-semver": "2.10.6", - "port-version": 0, - "homepage": "https://github.com/VisualText/nlp-engine", - "description": "The NLP engine is a cross-platform text analysis tool that can be accessed through a command line executable or by calling its C++ functions from another language.", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - { - "name": "icu", - "features": [ - "tools" - ] - } - ] -} \ No newline at end of file diff --git a/vcpkg_overlays/opentelemetry-cpp/add-missing-dependencies.patch b/vcpkg_overlays/opentelemetry-cpp/add-missing-dependencies.patch deleted file mode 100644 index 2de8be70c7a..00000000000 --- a/vcpkg_overlays/opentelemetry-cpp/add-missing-dependencies.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake -index 34b33d3..19e67e9 100644 ---- a/cmake/opentelemetry-proto.cmake -+++ b/cmake/opentelemetry-proto.cmake -@@ -311,6 +311,10 @@ if(WITH_OTLP_GRPC) - endif() - endif() - -+if(TARGET gRPC::grpc++) -+ target_link_libraries(opentelemetry_proto PUBLIC gRPC::grpc++) -+endif() -+ - if(BUILD_SHARED_LIBS) - foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS}) - set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/vcpkg_overlays/opentelemetry-cpp/add-missing-find-dependency.patch b/vcpkg_overlays/opentelemetry-cpp/add-missing-find-dependency.patch deleted file mode 100644 index 1f9c12d1636..00000000000 --- a/vcpkg_overlays/opentelemetry-cpp/add-missing-find-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in -index adae58d..2642772 100644 ---- a/cmake/opentelemetry-cpp-config.cmake.in -+++ b/cmake/opentelemetry-cpp-config.cmake.in -@@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION - # ############################################################################## - - find_package(Threads) -+include(CMakeFindDependencyMacro) -+find_dependency(absl) - - set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") - set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") diff --git a/vcpkg_overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch b/vcpkg_overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch deleted file mode 100644 index b9a0a16725a..00000000000 --- a/vcpkg_overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/sdk/src/common/random.cc b/sdk/src/common/random.cc -index 77b88cfa..14e94d0c 100644 ---- a/sdk/src/common/random.cc -+++ b/sdk/src/common/random.cc -@@ -13,11 +13,10 @@ namespace sdk - { - namespace common - { --// Wraps a thread_local random number generator, but adds a fork handler so that --// the generator will be correctly seeded after forking. --// --// See https://stackoverflow.com/q/51882689/4447365 and --// https://github.com/opentracing-contrib/nginx-opentracing/issues/52 -+// Wraps a thread_local random number generator. -+// The previous fork handler is removed because it was not safe and was solving a problem that did -+// not need to be solved since there should be no logic in the child() before it calls exec(). -+ - namespace - { - class TlsRandomNumberGenerator -@@ -26,17 +25,14 @@ class TlsRandomNumberGenerator - TlsRandomNumberGenerator() noexcept - { - Seed(); -- platform::AtFork(nullptr, nullptr, OnFork); - } - -- static FastRandomNumberGenerator &engine() noexcept { return engine_; } -+ FastRandomNumberGenerator & engine() noexcept { return engine_; } - - private: -- static thread_local FastRandomNumberGenerator engine_; -- -- static void OnFork() noexcept { Seed(); } -+ FastRandomNumberGenerator engine_; - -- static void Seed() noexcept -+ void Seed() noexcept - { - std::random_device random_device; - std::seed_seq seed_seq{random_device(), random_device(), random_device(), random_device()}; -@@ -44,13 +40,12 @@ class TlsRandomNumberGenerator - } - }; - --thread_local FastRandomNumberGenerator TlsRandomNumberGenerator::engine_{}; - } // namespace - - FastRandomNumberGenerator &Random::GetRandomNumberGenerator() noexcept - { - static thread_local TlsRandomNumberGenerator random_number_generator{}; -- return TlsRandomNumberGenerator::engine(); -+ return random_number_generator.engine(); - } - - uint64_t Random::GenerateRandom64() noexcept diff --git a/vcpkg_overlays/opentelemetry-cpp/portfile.cmake b/vcpkg_overlays/opentelemetry-cpp/portfile.cmake deleted file mode 100644 index facb6883226..00000000000 --- a/vcpkg_overlays/opentelemetry-cpp/portfile.cmake +++ /dev/null @@ -1,75 +0,0 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO open-telemetry/opentelemetry-cpp - REF "v${VERSION}" - SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62 - HEAD_REF main - PATCHES - # Use the compiler's default C++ version. Picking a version with - # CMAKE_CXX_STANDARD is not needed as the Abseil port already picked - # one and propagates that version across all its downstream deps. - use-default-cxx-version.patch - # When compiling code generated by gRPC we need to link the gRPC library - # too. - add-missing-dependencies.patch - # Missing find_dependency for Abseil - add-missing-find-dependency.patch - # HPCC-fix: Remove code that reinitialised the random number generator on fork() - hpcc-remove-unsafe-onfork.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - etw WITH_ETW - zipkin WITH_ZIPKIN - prometheus WITH_PROMETHEUS - elasticsearch WITH_ELASTICSEARCH - jaeger WITH_JAEGER - otlp WITH_OTLP - otlp-http WITH_OTLP_HTTP - zpages WITH_ZPAGES - otlp-grpc WITH_OTLP_GRPC -) - -# opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. -if(WITH_OTLP) - set(OTEL_PROTO_VERSION "0.19.0") - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" - FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" - SHA512 b6d47aaa90ff934eb24047757d5fdb8a5be62963a49b632460511155f09a725937fb7535cf34f738b81cc799600adbbc3809442aba584d760891c0a1f0ce8c03 - ) - - vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") - file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") - file(COPY "${src}/." DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto") - # Create empty .git directory to prevent opentelemetry from cloning it during build time - file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") - list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=14) - list(APPEND FEATURE_OPTIONS -DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DWITH_EXAMPLES=OFF - -DWITH_LOGS_PREVIEW=ON - -DOPENTELEMETRY_INSTALL=ON - -DWITH_ABSEIL=ON - ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - WITH_OTLP_GRPC -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/vcpkg_overlays/opentelemetry-cpp/use-default-cxx-version.patch b/vcpkg_overlays/opentelemetry-cpp/use-default-cxx-version.patch deleted file mode 100644 index 53a31faf91b..00000000000 --- a/vcpkg_overlays/opentelemetry-cpp/use-default-cxx-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4fa064..a868106 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,21 +126,6 @@ endif() - option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" - ${OPENTELEMETRY_INSTALL_default}) - --if(NOT DEFINED CMAKE_CXX_STANDARD) -- if(WITH_STL) -- # Require at least C++17. C++20 is needed to avoid gsl::span -- if(CMAKE_VERSION VERSION_GREATER 3.11.999) -- # Ask for 20, may get anything below -- set(CMAKE_CXX_STANDARD 20) -- else() -- # Ask for 17, may get anything below -- set(CMAKE_CXX_STANDARD 17) -- endif() -- else() -- set(CMAKE_CXX_STANDARD 11) -- endif() --endif() -- - if(WITH_STL) - # These definitions are needed for test projects that do not link against - # opentelemetry-api library directly. We ensure that variant implementation diff --git a/vcpkg_overlays/opentelemetry-cpp/vcpkg.json b/vcpkg_overlays/opentelemetry-cpp/vcpkg.json deleted file mode 100644 index b525fbeb2d5..00000000000 --- a/vcpkg_overlays/opentelemetry-cpp/vcpkg.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "name": "opentelemetry-cpp", - "version-semver": "1.9.1", - "description": [ - "OpenTelemetry is a collection of tools, APIs, and SDKs.", - "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." - ], - "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", - "license": "Apache-2.0", - "dependencies": [ - "abseil", - "curl", - "nlohmann-json", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "elasticsearch": { - "description": "Whether to include the Elasticsearch Client in the SDK" - }, - "etw": { - "description": "Whether to include the ETW Exporter in the SDK", - "supports": "windows" - }, - "jaeger": { - "description": "Whether to include the Jaeger exporter", - "dependencies": [ - "thrift" - ] - }, - "otlp": { - "description": "Whether to include the OpenTelemetry Protocol in the SDK", - "dependencies": [ - "protobuf" - ] - }, - "otlp-grpc": { - "description": "Whether to include the OTLP gRPC exporter in the SDK", - "dependencies": [ - "grpc", - { - "name": "grpc", - "host": true - }, - { - "name": "opentelemetry-cpp", - "default-features": false, - "features": [ - "otlp" - ] - } - ] - }, - "otlp-http": { - "description": "Whether to include the OpenTelemetry Protocol over HTTP in the SDK", - "dependencies": [ - "curl", - { - "name": "opentelemetry-cpp", - "default-features": false, - "features": [ - "otlp" - ] - } - ] - }, - "prometheus": { - "description": "Whether to include the Prometheus Client in the SDK", - "dependencies": [ - "prometheus-cpp" - ] - }, - "zipkin": { - "description": "Whether to include the Zipkin exporter in the SDK" - }, - "zpages": { - "description": "Whether to include the Zpages Server in the SDK" - } - } -} From ecbae608b0a34f5f81f73f55a6c4b015388741e7 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 17 May 2024 08:59:13 +0100 Subject: [PATCH 6/8] HPCC-31874 Bump vcpkg submodule version Fix mono failing to download Consolidate overlays Signed-off-by: Gordon Smith --- vcpkg | 2 +- vcpkg_overlays/libmysql/cross-build.patch | 162 ------------------ vcpkg_overlays/libmysql/dependencies.patch | 140 --------------- vcpkg_overlays/libmysql/fix_dup_symbols.patch | 20 --- vcpkg_overlays/libmysql/install-exports.patch | 121 ------------- vcpkg_overlays/libmysql/libmysql-config.cmake | 6 - vcpkg_overlays/libmysql/portfile.cmake | 160 ----------------- vcpkg_overlays/libmysql/usage | 4 - vcpkg_overlays/libmysql/vcpkg.json | 47 ----- vcpkg_overlays/libxml2/disable-docs.patch | 20 --- vcpkg_overlays/libxml2/fix_cmakelist.patch | 108 ------------ vcpkg_overlays/libxml2/portfile.cmake | 90 ---------- vcpkg_overlays/libxml2/usage | 4 - .../libxml2/vcpkg-cmake-wrapper.cmake | 3 - vcpkg_overlays/libxml2/vcpkg.json | 57 ------ vcpkg_overlays/libxslt/fix-gcrypt-deps.patch | 45 ----- .../libxslt/libexslt-pkgconfig.patch | 14 -- vcpkg_overlays/libxslt/msvc-no-suffix.patch | 22 --- vcpkg_overlays/libxslt/portfile.cmake | 83 --------- vcpkg_overlays/libxslt/python3.patch | 16 -- .../libxslt/skip-install-docs.patch | 17 -- vcpkg_overlays/libxslt/usage | 12 -- .../libxslt/vcpkg-cmake-wrapper.cmake | 5 - vcpkg_overlays/libxslt/vcpkg.json | 43 ----- vcpkg_overlays/nlp-engine/CMakeLists.txt | 67 -------- vcpkg_overlays/nlp-engine/portfile.cmake | 38 ---- vcpkg_overlays/nlp-engine/vcpkg.json | 23 --- 27 files changed, 1 insertion(+), 1328 deletions(-) delete mode 100644 vcpkg_overlays/libmysql/cross-build.patch delete mode 100644 vcpkg_overlays/libmysql/dependencies.patch delete mode 100644 vcpkg_overlays/libmysql/fix_dup_symbols.patch delete mode 100644 vcpkg_overlays/libmysql/install-exports.patch delete mode 100644 vcpkg_overlays/libmysql/libmysql-config.cmake delete mode 100644 vcpkg_overlays/libmysql/portfile.cmake delete mode 100644 vcpkg_overlays/libmysql/usage delete mode 100644 vcpkg_overlays/libmysql/vcpkg.json delete mode 100644 vcpkg_overlays/libxml2/disable-docs.patch delete mode 100644 vcpkg_overlays/libxml2/fix_cmakelist.patch delete mode 100644 vcpkg_overlays/libxml2/portfile.cmake delete mode 100644 vcpkg_overlays/libxml2/usage delete mode 100644 vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake delete mode 100644 vcpkg_overlays/libxml2/vcpkg.json delete mode 100644 vcpkg_overlays/libxslt/fix-gcrypt-deps.patch delete mode 100644 vcpkg_overlays/libxslt/libexslt-pkgconfig.patch delete mode 100644 vcpkg_overlays/libxslt/msvc-no-suffix.patch delete mode 100644 vcpkg_overlays/libxslt/portfile.cmake delete mode 100644 vcpkg_overlays/libxslt/python3.patch delete mode 100644 vcpkg_overlays/libxslt/skip-install-docs.patch delete mode 100644 vcpkg_overlays/libxslt/usage delete mode 100644 vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake delete mode 100644 vcpkg_overlays/libxslt/vcpkg.json delete mode 100644 vcpkg_overlays/nlp-engine/CMakeLists.txt delete mode 100644 vcpkg_overlays/nlp-engine/portfile.cmake delete mode 100644 vcpkg_overlays/nlp-engine/vcpkg.json diff --git a/vcpkg b/vcpkg index 229f836da66..ddf0c6df807 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 229f836da6616f2982ce1a7a5b18cf48f6c27e0c +Subproject commit ddf0c6df807a454c74f33d7ba75037314bf9a79c diff --git a/vcpkg_overlays/libmysql/cross-build.patch b/vcpkg_overlays/libmysql/cross-build.patch deleted file mode 100644 index a91118b4f85..00000000000 --- a/vcpkg_overlays/libmysql/cross-build.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake -index 725b9bd..289bb3d 100644 ---- a/cmake/os/Darwin.cmake -+++ b/cmake/os/Darwin.cmake -@@ -31,13 +31,9 @@ ENDIF() - # We require at least XCode 10.0 - IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(MY_COMPILER_IS_CLANG) -- CHECK_C_SOURCE_RUNS(" -- int main() -- { -- return (__clang_major__ < 10); -- }" HAVE_SUPPORTED_CLANG_VERSION) -- IF(NOT HAVE_SUPPORTED_CLANG_VERSION) -- MESSAGE(FATAL_ERROR "XCode 10.0 or newer is required!") -+ IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10) -+ MESSAGE(FATAL_ERROR -+ "XCode 10.0 or newer is required! Compiler version was ${CMAKE_CXX_COMPILER_VERSION}") - ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "Unsupported compiler!") -diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt -index 8e22453..2b63413 100644 ---- a/libmysql/CMakeLists.txt -+++ b/libmysql/CMakeLists.txt -@@ -259,6 +259,7 @@ ELSEIF(FREEBSD) - MESSAGE(STATUS "BSD built in DNS SRV APIs") - ELSE() - FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv) -+ FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH) - IF (RESOLV_LIBRARY) - LIST(APPEND LIBS_TO_LINK ${RESOLV_LIBRARY}) - SET(HAVE_UNIX_DNS_SRV 1 PARENT_SCOPE) -@@ -413,6 +414,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test - ${CMAKE_CURRENT_BINARY_DIR}/api_test.c - LINK_LIBRARIES libmysql ${LIBRT} - SKIP_INSTALL -+ EXCLUDE_FROM_ALL - ) - # Clang/UBSAN needs this on some platforms. - SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX) -@@ -439,6 +441,6 @@ ADD_CUSTOM_COMMAND( - COMMAND libmysql_api_test - > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out - ) --MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL -+MY_ADD_CUSTOM_TARGET(run_libmysql_api_test - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out - ) -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 8e93387..d971acb 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -69,7 +69,6 @@ ADD_CUSTOM_COMMAND( - - # Add target for the above to be built - MY_ADD_CUSTOM_TARGET(GenFixPrivs -- ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h - ) - -diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt -index aaba357..a0e5265 100644 ---- a/scripts/sys_schema/CMakeLists.txt -+++ b/scripts/sys_schema/CMakeLists.txt -@@ -221,7 +221,6 @@ MY_ADD_CUSTOM_TARGET(sql_commands - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sql_commands.h) - - MY_ADD_CUSTOM_TARGET(GenSysSchemaC -- ALL - DEPENDS comp_sql sql_commands - COMMENT "Generating Sys Schema C code" - ) -diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt -index 28cde40..be916cb 100644 ---- a/share/CMakeLists.txt -+++ b/share/CMakeLists.txt -@@ -47,8 +47,12 @@ SET(dirs - ukrainian - ) - --FOREACH (dir ${dirs}) -- INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir} -+ set(src_dir ${CMAKE_BINARY_DIR}/share/libmysql) -+ if(CMAKE_CROSSCOMPILING) -+ set(src_dir ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql) -+ endif() -+ FOREACH (dir ${dirs}) -+ INSTALL(DIRECTORY ${src_dir}/${dir} - DESTINATION ${INSTALL_MYSQLSHAREDIR} - COMPONENT Server - ) -diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt -index 665b35d..88f0743 100644 ---- a/strings/CMakeLists.txt -+++ b/strings/CMakeLists.txt -@@ -69,6 +69,13 @@ SET(ZH_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/zh_hans.txt) - SET(ZH_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_zh_tbls.cc) - SET(JA_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/ja_hans.txt) - SET(JA_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_ja_tbls.cc) -+if(CMAKE_CROSSCOMPILING) -+ file(COPY -+ "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_zh_tbls.cc" -+ "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_ja_tbls.cc" -+ DESTINATION "${CMAKE_BINARY_DIR}/strings" -+ ) -+else() - ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE} - ${JA_HANS_DST_FILE} - COMMAND uca9dump zh -@@ -79,6 +86,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE} - --out_file=${JA_HANS_DST_FILE} - DEPENDS uca9dump ${ZH_HANS_SRC_FILE} ${JA_HANS_SRC_FILE} - ) -+install(FILES "${ZH_HANS_DST_FILE}" "${JA_HANS_DST_FILE}" DESTINATION "share/libmysql/${PROJECT_VERSION}") -+endif() - - SET_SOURCE_FILES_PROPERTIES( - ${JA_HANS_DST_FILE} ${ZH_HANS_DST_FILE} -diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt -index da34524..dc397da 100644 ---- a/utilities/CMakeLists.txt -+++ b/utilities/CMakeLists.txt -@@ -39,6 +39,21 @@ MYSQL_ADD_EXECUTABLE(comp_client_err - SKIP_INSTALL - ) - -+if(CMAKE_CROSSCOMPILING) -+ file(COPY -+ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/include/mysql/mysqld_error.h -+ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqlclient_ername.h -+ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_ername.h -+ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_errmsg.h -+ DESTINATION ${PROJECT_BINARY_DIR}/include -+ ) -+ file(COPY -+ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/errmsg.sys -+ DESTINATION ${PROJECT_BINARY_DIR}/share/libmysql/english -+ ) -+ add_custom_target(GenClientError) -+ add_custom_target(GenError) -+else() - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h - COMMAND comp_client_err - --in_file=${PROJECT_SOURCE_DIR}/include/errmsg.h -@@ -97,6 +112,16 @@ MYSQL_ADD_EXECUTABLE(range_check_err - SKIP_INSTALL - ) - -+ install( -+ FILES -+ ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h -+ ${PROJECT_BINARY_DIR}/include/mysqld_ername.h -+ ${PROJECT_BINARY_DIR}/include/mysqld_errmsg.h -+ ${PROJECT_BINARY_DIR}/share/libmysql/english/errmsg.sys -+ DESTINATION share/libmysql/${PROJECT_VERSION} -+ ) -+endif() -+ - # Set InnoDB mutex type - ADD_DEFINITIONS(-DMUTEX_EVENT) - diff --git a/vcpkg_overlays/libmysql/dependencies.patch b/vcpkg_overlays/libmysql/dependencies.patch deleted file mode 100644 index 0129d71e974..00000000000 --- a/vcpkg_overlays/libmysql/dependencies.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e17ec1d0..465e42f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -818,8 +818,12 @@ INCLUDE(fileutils) - INCLUDE(zlib) - INCLUDE(zstd) - INCLUDE(lz4) --INCLUDE(icu) --INCLUDE(libevent) -+macro(MYSQL_CHECK_ICU) -+endmacro() -+macro(MYSQL_CHECK_LIBEVENT) -+endmacro() -+macro(WARN_MISSING_SYSTEM_LIBEVENT) -+endmacro() - INCLUDE(ssl) - INCLUDE(sasl) - INCLUDE(ldap) -@@ -837,7 +841,8 @@ INCLUDE(curl) - INCLUDE(rapidjson) - INCLUDE(fprofile) - INCLUDE(gloves) --INCLUDE(fido2) -+macro(MYSQL_CHECK_FIDO) -+endmacro() - INCLUDE(win_jemalloc) - - IF(UNIX) -@@ -1942,7 +1947,7 @@ MYSQL_CHECK_RAPIDJSON() - MYSQL_CHECK_FIDO() - MYSQL_CHECK_FIDO_DLLS() - --IF(APPLE) -+IF(0) - GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY) - IF(EXISTS ${HOMEBREW_BASE}/include/boost) - FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO) -diff --git a/cmake/boost.cmake b/cmake/boost.cmake -index c979055c..53e55fcf 100644 ---- a/cmake/boost.cmake -+++ b/cmake/boost.cmake -@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) - COULD_NOT_FIND_BOOST() - ENDIF() - --IF(NOT BOOST_MINOR_VERSION EQUAL 77) -+IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION) - MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " - "we need 77" - ) -diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index 7107f4bd..bb7f3733 100644 ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -534,7 +534,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) - - # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib - # must be merged into mysqlclient.lib -- IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient") -+ IF(0) - SET(LINKER_EXTRA_FLAGS "") - FOREACH(LIB ${SSL_LIBRARIES}) - STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}") -diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake -index 10e7e8c8..48772329 100644 ---- a/cmake/lz4.cmake -+++ b/cmake/lz4.cmake -@@ -46,7 +46,7 @@ FUNCTION(FIND_SYSTEM_LZ4) - FIND_PATH(LZ4_INCLUDE_DIR - NAMES lz4frame.h) - FIND_LIBRARY(LZ4_SYSTEM_LIBRARY -- NAMES lz4) -+ NAMES lz4d lz4 NAMES_PER_DIR) - IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY) - SET(SYSTEM_LZ4_FOUND 1 CACHE INTERNAL "") - ADD_LIBRARY(lz4_interface INTERFACE) -diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index 04e3af87..8ae52c82 100644 ---- a/cmake/ssl.cmake -+++ b/cmake/ssl.cmake -@@ -273,7 +273,18 @@ MACRO (MYSQL_CHECK_SSL) - FIND_ALTERNATIVE_SYSTEM_SSL() - ENDIF() - -- IF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL) -+ IF(WITH_SSL STREQUAL "system") -+ find_package(OpenSSL REQUIRED) -+ set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "") -+ set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "") -+ find_program(OPENSSL_EXECUTABLE openssl -+ DOC "path to the openssl executable") -+ set(SSL_DEFINES "-DHAVE_OPENSSL") -+ add_library(ext::openssl ALIAS OpenSSL::SSL) -+ set(SSL_LIBRARIES ext::openssl) -+ set(OPENSSL_APPLINK_C "${OPENSSL_APPLINK_SOURCE}") -+ include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) -+ ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL) - IF((APPLE OR WIN32) AND WITH_SSL STREQUAL "system") - # FindOpenSSL.cmake knows about - # http://www.slproweb.com/products/Win32OpenSSL.html -diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake -index 3781fe09..ac312ad0 100644 ---- a/cmake/zlib.cmake -+++ b/cmake/zlib.cmake -@@ -124,7 +124,7 @@ MACRO (MYSQL_CHECK_ZLIB) - MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system") - ENDIF() - -- ADD_LIBRARY(ext::zlib ALIAS zlib_interface) -+ ADD_LIBRARY(ext::zlib ALIAS ZLIB::ZLIB) - - IF(ZLIB_VERSION VERSION_LESS MIN_ZLIB_VERSION_REQUIRED) - MESSAGE(FATAL_ERROR -diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake -index 425426d1..0ae1a907 100644 ---- a/cmake/zstd.cmake -+++ b/cmake/zstd.cmake -@@ -90,15 +90,16 @@ MACRO (MYSQL_CHECK_ZSTD) - IF(WITH_ZSTD STREQUAL "bundled") - MYSQL_USE_BUNDLED_ZSTD() - ELSEIF(WITH_ZSTD STREQUAL "system") -- FIND_SYSTEM_ZSTD() -- IF (NOT SYSTEM_ZSTD_FOUND) -- MESSAGE(FATAL_ERROR "Cannot find system zstd libraries.") -- ENDIF() -+ find_package(ZSTD NAMES zstd REQUIRED) - ELSE() - MESSAGE(FATAL_ERROR "WITH_ZSTD must be bundled or system") - ENDIF() - -- ADD_LIBRARY(ext::zstd ALIAS zstd_interface) -+ if(TARGET zstd::libzstd_shared) -+ add_library(ext::zstd ALIAS zstd::libzstd_shared) -+ else() -+ add_library(ext::zstd ALIAS zstd::libzstd_static) -+ endif() - - IF(ZSTD_VERSION VERSION_LESS MIN_ZSTD_VERSION_REQUIRED) - MESSAGE(FATAL_ERROR diff --git a/vcpkg_overlays/libmysql/fix_dup_symbols.patch b/vcpkg_overlays/libmysql/fix_dup_symbols.patch deleted file mode 100644 index 352fd8af89f..00000000000 --- a/vcpkg_overlays/libmysql/fix_dup_symbols.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 058967b..bcd8841 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -43,7 +43,6 @@ MYSQL_ADD_EXECUTABLE(mysql - pattern_matcher.cc - readline.cc - client_query_attributes.cc -- multi_factor_passwordopt-vars.cc - ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc - LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} - ) -@@ -226,7 +226,6 @@ SET(MYSQLBINLOG_SOURCES - ${CMAKE_SOURCE_DIR}/sql/binlog_reader.cc - ${CMAKE_SOURCE_DIR}/sql/stream_cipher.cc - ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc -- ${CMAKE_SOURCE_DIR}/libbinlogevents/src/trx_boundary_parser.cpp - ) - - SET(MYSQLBINLOG_LIBRARIES diff --git a/vcpkg_overlays/libmysql/install-exports.patch b/vcpkg_overlays/libmysql/install-exports.patch deleted file mode 100644 index 3cf34ed3be5..00000000000 --- a/vcpkg_overlays/libmysql/install-exports.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake -index baf49cd5..c45fda71 100644 ---- a/cmake/install_macros.cmake -+++ b/cmake/install_macros.cmake -@@ -113,8 +113,30 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg) - IF(ARG_NAMELINK_SKIP) - SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP) - ENDIF() -+ if(target STREQUAL "libmysql" OR target STREQUAL "mysqlclient") -+ target_include_directories(${target} INTERFACE $) -+ if(target STREQUAL "mysqlclient") -+ set_target_properties(${target} PROPERTIES EXPORT_NAME libmysql) # uniform -+ endif() -+ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" -+"include(CMakeFindDependencyMacro) -+find_dependency(OpenSSL) -+find_dependency(Threads) -+find_dependency(ZLIB) -+find_dependency(zstd CONFIG) -+include(\"\${CMAKE_CURRENT_LIST_DIR}/unofficial-libmysql-targets.cmake\") -+if(NOT TARGET ${target}) # legacy vcpkg -+ add_library(${target} INTERFACE IMPORTED) -+ set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libmysql::libmysql) -+endif() -+") -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" DESTINATION "share/unofficial-libmysql") -+ install(EXPORT "unofficial-libmysql-targets" NAMESPACE unofficial::libmysql:: DESTINATION "share/unofficial-libmysql") -+ set(LIBRARY_EXPORT_ARGS EXPORT unofficial-libmysql-targets) -+ endif() - INSTALL(TARGETS ${target} -- RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP} -+ ${LIBRARY_EXPORT_ARGS} -+ RUNTIME DESTINATION bin ${COMP} - ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP} - LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS}) - SET(INSTALL_LOCATION ${ARG_DESTINATION} ) -diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index a5333987..c954bfb1 100644 ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -385,8 +385,12 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) - IF(ARG_NAMELINK_SKIP) - SET(INSTALL_ARGS NAMELINK_SKIP) - ENDIF() -+ if(INSTALL_STATIC_LIBRARIES) -+ set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1) -+ else() - MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} - ${INSTALL_ARGS}) -+ endif() - ENDIF() - - IF(WIN32) -@@ -563,6 +567,8 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) - ENDIF() - IF(INSTALL_STATIC_LIBRARIES) - MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) -+ else() -+ set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1) - ENDIF() - ENDIF() - ENDMACRO(MERGE_CONVENIENCE_LIBRARIES) -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index c4ef5694..8e933877 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -315,10 +315,14 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - FOREACH(lib ${TARGET_LIB_DEPENDS}) - IF (lib MATCHES "^\\-l") - SET(${var} "${${var}} ${lib} ") -+ elseif(lib MATCHES "^ext::(openssl|zlib|zstd)" AND NOT WIN32) -+ list(APPEND ext_targets "${CMAKE_MATCH_1}") - ELSEIF (lib MATCHES "^ext::") - STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}") - SET(SYSTEM_LIB ${CMAKE_MATCH_1}) - SET(${var} "${${var}} -l${SYSTEM_LIB} ") -+ elseif(TARGET "${lib}" AND NOT WIN32) -+ # merged or shared, not external - ELSEIF (lib MATCHES "^\\-L") - # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind - SET(${var} "${${var}} ${lib} ") -@@ -354,6 +358,7 @@ IF(MSVC) - GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION) - GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME) - ELSE() -+ EXTRACT_LINK_LIBRARIES(libmysql CLIENT_LIBS) - GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION) - GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME) - ENDIF() -@@ -373,6 +378,10 @@ IF (WITH_SSL STREQUAL "system") - "${CONFIG_LIBS_PRIVATE}") - ENDIF() - ENDIF() -+list(APPEND CONFIG_REQUIRES_PRIVATE ${ext_targets}) -+list(REMOVE_DUPLICATES CONFIG_REQUIRES_PRIVATE) -+list(JOIN CONFIG_REQUIRES_PRIVATE " " CONFIG_REQUIRES_PRIVATE) -+string(REPLACE "zstd" "libzstd" CONFIG_REQUIRES_PRIVATE "${CONFIG_REQUIRES_PRIVATE}" ) - - MESSAGE(STATUS "CONFIG_CLIENT_LIBS ${CONFIG_CLIENT_LIBS}") - MESSAGE(STATUS "CONFIG_LIBS_PRIVATE ${CONFIG_LIBS_PRIVATE}") -diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh -index 6e8520be..bf1a45af 100644 ---- a/scripts/mysql_config.sh -+++ b/scripts/mysql_config.sh -@@ -119,6 +119,16 @@ fi - # Create options - libs="-L$pkglibdir@RPATH_OPTION@" - libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@" -+if test -z "${PKG_CONFIG}" ; then -+ if pkg-config --version >/dev/null 2>&1 ; then -+ PKG_CONFIG=pkg-config -+ elif pkgconf --version >/dev/null 2>&1 ; then -+ PKG_CONFIG=pkgconf -+ else -+ PKG_CONFIG=false -+ fi -+fi -+libs="$libs $(${PKG_CONFIG} --libs @CONFIG_REQUIRES_PRIVATE@)" - - cflags="-I$pkgincludedir @CFLAGS@" - cxxflags="-I$pkgincludedir @CXXFLAGS@" diff --git a/vcpkg_overlays/libmysql/libmysql-config.cmake b/vcpkg_overlays/libmysql/libmysql-config.cmake deleted file mode 100644 index ea2bbbe0ab0..00000000000 --- a/vcpkg_overlays/libmysql/libmysql-config.cmake +++ /dev/null @@ -1,6 +0,0 @@ -file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) -message(WARNING "find_package(libmysql) is deprecated.\n${usage}") -include(CMakeFindDependencyMacro) -find_dependency(unofficial-libmysql CONFIG REQUIRED) -set(libmysql_FOUND 1) -set(MYSQL_LIBRARIES unofficial::libmysql::libmysql) diff --git a/vcpkg_overlays/libmysql/portfile.cmake b/vcpkg_overlays/libmysql/portfile.cmake deleted file mode 100644 index 34565231170..00000000000 --- a/vcpkg_overlays/libmysql/portfile.cmake +++ /dev/null @@ -1,160 +0,0 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") - message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mysql/mysql-server - REF mysql-${VERSION} - SHA512 5df45c1ce1e2c620856b9274666cf56738d6a0308c33c9c96583b494c987fb0e862e676301109b9e4732070d54e6086596a62ad342f35adc59ca9f749e37b561 - HEAD_REF master - PATCHES - dependencies.patch - install-exports.patch - fix_dup_symbols.patch - cross-build.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - host-tools FORCE_CMAKE_CROSSCOMPILING -) - -file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0") -list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit") -if (third_party) - file(REMOVE_RECURSE ${third_party}) -endif() - -#Skip the version check for Visual Studio -set(FORCE_UNSUPPORTED_COMPILER "") -if(VCPKG_TARGET_IS_WINDOWS) - set(FORCE_UNSUPPORTED_COMPILER 1) -endif() - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT_LINKAGE) - -set(cross_options "") -if(VCPKG_CROSSCOMPILING) - list(APPEND cross_options - -DCMAKE_CROSSCOMPILING=1 - -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} - # required, skip try_run - -DHAVE_RAPIDJSON_WITH_STD_REGEX=1 - ) - if(NOT VCPKG_TARGET_IS_WINDOWS) - list(APPEND cross_options - # optimistic, skip try_run - -DHAVE_CLOCK_GETTIME=1 - -DHAVE_CLOCK_REALTIME=1 - # pessimistic, skip try_run - -DHAVE_C_FLOATING_POINT_FUSED_MADD=1 - -DHAVE_CXX_FLOATING_POINT_FUSED_MADD=1 - -DHAVE_SETNS=0 - ) - endif() -endif() -if ("-DFORCE_CMAKE_CROSSCOMPILING=ON" IN_LIST FEATURE_OPTIONS) - list(APPEND cross_options - -DCMAKE_CROSSCOMPILING=OFF - ) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${cross_options} - -DINSTALL_INCLUDEDIR=include/mysql - -DINSTALL_DOCDIR=share/${PORT}/doc - -DINSTALL_MANDIR=share/${PORT}/doc - -DINSTALL_INFODIR=share/${PORT}/doc - -DINSTALL_DOCREADMEDIR=share/${PORT} - -DINSTALL_SHAREDIR=share - -DINSTALL_MYSQLSHAREDIR=share/${PORT} - -DWITHOUT_SERVER=ON - -DWITH_BUILD_ID=OFF - -DWITH_UNIT_TESTS=OFF - -DENABLED_PROFILING=OFF - -DWIX_DIR=OFF - -DIGNORE_BOOST_VERSION=ON - -DWITH_TEST_TRACE_PLUGIN=OFF - -DMYSQL_MAINTAINER_MODE=OFF - -DBUNDLE_RUNTIME_LIBRARIES=OFF - -DDOWNLOAD_BOOST=OFF - -DWITH_CURL=none - -DWITH_EDITLINE=bundled # not in vcpkg - -DWITH_LZ4=system - -DWITH_RAPIDJSON=system - -DWITH_SSL=system - -DWITH_SYSTEMD=OFF - -DWITH_ZLIB=system - -DWITH_ZSTD=system - -DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER} - -DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS} - -DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE} - MAYBE_UNUSED_VARIABLES - BUNDLE_RUNTIME_LIBRARIES # only on windows - LINK_STATIC_RUNTIME_LIBRARIES # only on windows - WIX_DIR # only on windows - WITH_BUILD_ID # only on windows -) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql) -vcpkg_fixup_pkgconfig() - -set(MYSQL_TOOLS - my_print_defaults - mysql - mysql_config_editor - mysql_migrate_keyring - mysql_secure_installation - mysql_ssl_rsa_setup - mysqladmin - mysqlbinlog - mysqlcheck - mysqldump - mysqlimport - mysqlpump - mysqlshow - mysqlslap - mysqltest - perror - zlib_decompress -) -if (NOT VCPKG_CROSSCOMPILING) - list(APPEND MYSQL_TOOLS - comp_err - ) -endif() -if (VCPKG_TARGET_IS_WINDOWS) - list(APPEND MYSQL_TOOLS - echo - ) -else() - list(APPEND MYSQL_TOOLS - mysql_config - ) -endif() - -vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN) - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/debug" -) - -if (NOT VCPKG_TARGET_IS_WINDOWS) - set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config") - vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config") - vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "'${CURRENT_PACKAGES_DIR}" "\"\$basedir\"\'") -endif() - -file(INSTALL "${CURRENT_PORT_DIR}/libmysql-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -set(libedit_copying "${SOURCE_PATH}/COPYING for libedit") -file(COPY_FILE "${SOURCE_PATH}/extra/libedit/libedit-20210910-3.1/COPYING" "${libedit_copying}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${libedit_copying}") diff --git a/vcpkg_overlays/libmysql/usage b/vcpkg_overlays/libmysql/usage deleted file mode 100644 index 7ea8c37e177..00000000000 --- a/vcpkg_overlays/libmysql/usage +++ /dev/null @@ -1,4 +0,0 @@ -libmysql provides CMake targets: - - find_package(unofficial-libmysql REQUIRED) - target_link_libraries(main PRIVATE unofficial::libmysql::libmysql) diff --git a/vcpkg_overlays/libmysql/vcpkg.json b/vcpkg_overlays/libmysql/vcpkg.json deleted file mode 100644 index b143f59ef7f..00000000000 --- a/vcpkg_overlays/libmysql/vcpkg.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "libmysql", - "version": "8.0.34", - "port-version": 1, - "description": "A MySQL client library for C development", - "homepage": "https://github.com/mysql/mysql-server", - "license": "GPL-2.0-or-later", - "supports": "!android & !mingw & !uwp & !xbox", - "dependencies": [ - "boost-algorithm", - "boost-functional", - "boost-geometry", - "boost-graph", - "boost-optional", - "lz4", - { - "name": "ncurses", - "platform": "!windows | mingw" - }, - "openssl", - "rapidjson", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib", - "zstd" - ], - "default-features": [ - "host-tools" - ], - "features": { - "host-tools": { - "description": "Build CLI tools", - "dependencies": [ - { - "name": "libmysql", - "host": true - } - ] - } - } -} \ No newline at end of file diff --git a/vcpkg_overlays/libxml2/disable-docs.patch b/vcpkg_overlays/libxml2/disable-docs.patch deleted file mode 100644 index 848961429d6..00000000000 --- a/vcpkg_overlays/libxml2/disable-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f922d5ab..70466bc7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -599,15 +599,5 @@ if(LIBXML2_WITH_PYTHON) - endif() - --install(FILES doc/xml2-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) --install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) --install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) --install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation -- PATTERN "Makefile.*" EXCLUDE -- PATTERN "*.1" EXCLUDE -- PATTERN "*.py" EXCLUDE -- PATTERN "*.res" EXCLUDE -- PATTERN "*.xml" EXCLUDE -- PATTERN "*.xsl" EXCLUDE) - - configure_package_config_file( - libxml2-config.cmake.cmake.in libxml2-config.cmake diff --git a/vcpkg_overlays/libxml2/fix_cmakelist.patch b/vcpkg_overlays/libxml2/fix_cmakelist.patch deleted file mode 100644 index f8c60d0f156..00000000000 --- a/vcpkg_overlays/libxml2/fix_cmakelist.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f922d5ab..685964b3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -420,15 +420,15 @@ endif() - if(LIBXML2_WITH_ICU) - target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) - if(WIN32) -- set(ICU_LIBS "-licudt -licuin -licuuc") -+ set(ICU_LIBS "icu-i18n") - else() -- set(ICU_LIBS "-licudata -licui18n -licuuc") -+ set(ICU_LIBS "icu-i18n") - endif() - endif() - - if(LIBXML2_WITH_LZMA) - target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) -- set(LZMA_LIBS "-llzma") -+ set(LZMA_LIBS "liblzma") - endif() - - if(LIBXML2_WITH_THREADS) -@@ -438,7 +438,7 @@ endif() - - if(LIBXML2_WITH_ZLIB) - target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) -- set(Z_LIBS "-lz") -+ set(Z_LIBS "zlib") - endif() - - set_target_properties( -@@ -490,23 +490,9 @@ set_target_properties( - SOVERSION ${LIBXML_MAJOR_VERSION} - ) - -+set(XML_LIB_NAME xml2) - if(MSVC) -- if(BUILD_SHARED_LIBS) -- set_target_properties( -- LibXml2 -- PROPERTIES -- DEBUG_POSTFIX d -- ) -- else() -- set_target_properties( -- LibXml2 -- PROPERTIES -- DEBUG_POSTFIX sd -- MINSIZEREL_POSTFIX s -- RELEASE_POSTFIX s -- RELWITHDEBINFO_POSTFIX s -- ) -- endif() -+ set(XML_LIB_NAME libxml2) - endif() - - install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) -@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN - - configure_package_config_file( - libxml2-config.cmake.cmake.in libxml2-config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - ) - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - COMPONENT development - ) - - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake - VERSION ${PROJECT_VERSION} -- COMPATIBILITY ExactVersion -+ COMPATIBILITY SameMinorVersion - ) - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - COMPONENT development - ) - - install( - EXPORT LibXml2 -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 - NAMESPACE LibXml2:: - FILE libxml2-export.cmake - COMPONENT development -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index 2653a7c5..2eb2f362 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -8,6 +8,7 @@ Name: libXML - Version: @VERSION@ - Description: libXML library version2. - Requires: --Libs: -L${libdir} @XML_LIBS@ --Libs.private: @XML_PRIVATE_LIBS@ @LIBS@ -+Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ -+Libs: -L${libdir} -l@XML_LIB_NAME@ -+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/vcpkg_overlays/libxml2/portfile.cmake b/vcpkg_overlays/libxml2/portfile.cmake deleted file mode 100644 index 483416031d5..00000000000 --- a/vcpkg_overlays/libxml2/portfile.cmake +++ /dev/null @@ -1,90 +0,0 @@ -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.gnome.org/ - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/libxml2 - REF f507d167f1755b7eaea09fb1a44d29aab828b6d1 - SHA512 2ac3dcab31111f608a3fe33dde492c9653ad2bd49a792373acdd03d2787e1a4ef70eeb7a3d47cf67eefd43aee2ab75ec50b36cdcd124445ca206de924abb6021 - HEAD_REF master - PATCHES - disable-docs.patch - fix_cmakelist.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "ftp" LIBXML2_WITH_FTP - "http" LIBXML2_WITH_HTTP - "iconv" LIBXML2_WITH_ICONV - "legacy" LIBXML2_WITH_LEGACY - "lzma" LIBXML2_WITH_LZMA - "zlib" LIBXML2_WITH_ZLIB - "tools" LIBXML2_WITH_PROGRAMS -) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DLIBXML2_WITH_TESTS=OFF - -DLIBXML2_WITH_HTML=ON - -DLIBXML2_WITH_C14N=ON - -DLIBXML2_WITH_CATALOG=ON - -DLIBXML2_WITH_DEBUG=ON - -DLIBXML2_WITH_ISO8859X=ON - -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR - -DLIBXML2_WITH_MEM_DEBUG=OFF - -DLIBXML2_WITH_MODULES=ON - -DLIBXML2_WITH_OUTPUT=ON - -DLIBXML2_WITH_PATTERN=ON - -DLIBXML2_WITH_PUSH=ON - -DLIBXML2_WITH_PYTHON=OFF - -DLIBXML2_WITH_READER=ON - -DLIBXML2_WITH_REGEXPS=ON - -DLIBXML2_WITH_RUN_DEBUG=OFF - -DLIBXML2_WITH_SAX1=ON - -DLIBXML2_WITH_SCHEMAS=ON - -DLIBXML2_WITH_SCHEMATRON=ON - -DLIBXML2_WITH_THREADS=ON - -DLIBXML2_WITH_THREAD_ALLOC=OFF - -DLIBXML2_WITH_TREE=ON - -DLIBXML2_WITH_VALID=ON - -DLIBXML2_WITH_WRITER=ON - -DLIBXML2_WITH_XINCLUDE=ON - -DLIBXML2_WITH_XPATH=ON - -DLIBXML2_WITH_XPTR=ON -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libxml2") -vcpkg_fixup_pkgconfig() - -vcpkg_copy_pdbs() - -if("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(_file "${CURRENT_PACKAGES_DIR}/include/libxml2/libxml/xmlexports.h") - file(READ "${_file}" _contents) - string(REPLACE "#ifdef LIBXML_STATIC" "#undef LIBXML_STATIC\n#define LIBXML_STATIC\n#ifdef LIBXML_STATIC" _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") -endif() - -file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. - -# Cleanup -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") - -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" - "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) -file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/vcpkg_overlays/libxml2/usage b/vcpkg_overlays/libxml2/usage deleted file mode 100644 index 4eb53991550..00000000000 --- a/vcpkg_overlays/libxml2/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package libxml2 is compatible with built-in CMake targets: - - find_package(LibXml2 REQUIRED) - target_link_libraries(main PRIVATE LibXml2::LibXml2) diff --git a/vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake b/vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 596a9af5fed..00000000000 --- a/vcpkg_overlays/libxml2/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,3 +0,0 @@ -list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") -_find_package(${ARGS} CONFIG) -set(LIBXML2_FOUND "${LibXml2_FOUND}") # fphsa compatibility diff --git a/vcpkg_overlays/libxml2/vcpkg.json b/vcpkg_overlays/libxml2/vcpkg.json deleted file mode 100644 index 47f4866b135..00000000000 --- a/vcpkg_overlays/libxml2/vcpkg.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "libxml2", - "version": "2.10.3", - "port-version": 1, - "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", - "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "iconv", - "lzma", - "zlib" - ], - "features": { - "ftp": { - "description": "Add the FTP support", - "supports": "!uwp" - }, - "http": { - "description": "Add the HTTP support", - "supports": "!uwp" - }, - "iconv": { - "description": "Add ICONV support", - "dependencies": [ - "libiconv" - ] - }, - "legacy": { - "description": "Add deprecated APIs for compatibility" - }, - "lzma": { - "description": "Use LZMA", - "dependencies": [ - "liblzma" - ] - }, - "tools": { - "description": "Build tools" - }, - "zlib": { - "description": "Use ZLib", - "dependencies": [ - "zlib" - ] - } - } -} diff --git a/vcpkg_overlays/libxslt/fix-gcrypt-deps.patch b/vcpkg_overlays/libxslt/fix-gcrypt-deps.patch deleted file mode 100644 index 6d91a7248d4..00000000000 --- a/vcpkg_overlays/libxslt/fix-gcrypt-deps.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6dc6501..d36a049 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -317,7 +317,9 @@ target_include_directories( - - if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) - target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt) -- set(LIBGCRYPT_LIBS "-lgcrypt") -+ # For libexslt.pc -+ set(LIBGCRYPT_LIBS "") -+ string(APPEND EXSLT_PRIVATE_REQUIRES " libgcrypt") - endif() - - target_link_libraries(LibExslt PUBLIC LibXslt LibXml2::LibXml2) -diff --git a/FindGcrypt.cmake b/FindGcrypt.cmake -index 781113d..a78fa84 100644 ---- a/FindGcrypt.cmake -+++ b/FindGcrypt.cmake -@@ -1,3 +1,20 @@ -+cmake_policy(PUSH) -+cmake_policy(SET CMP0012 NEW) -+cmake_policy(SET CMP0057 NEW) -+find_package(PkgConfig) -+if("REQUIRED" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) -+ pkg_check_modules(libxslt_gcrypt REQUIRED IMPORTED_TARGET libgcrypt) -+else() -+ pkg_check_modules(libxslt_gcrypt IMPORTED_TARGET libgcrypt) -+endif() -+set(Gcrypt_FOUND "${libxslt_gcrypt_FOUND}") # CMake standard, needed for find_dependency -+set(GCRYPT_FOUND "${libxslt_gcrypt_FOUND}") # libxslt usage -+if(libxslt_gcrypt_FOUND AND NOT TARGET Gcrypt::Gcrypt) -+ add_library(Gcrypt::Gcrypt INTERFACE IMPORTED) -+ set_target_properties(Gcrypt::Gcrypt PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::libxslt_gcrypt) -+endif() -+cmake_policy(POP) -+if(0) - include(FindPackageHandleStandardArgs) - include(SelectLibraryConfigurations) - -@@ -38,3 +53,4 @@ if(GCRYPT_FOUND AND NOT TARGET Gcrypt::Gcrypt) - INTERFACE_INCLUDE_DIRECTORIES "${GCRYPT_INCLUDE_DIRS}" - ) - endif() -+endif() diff --git a/vcpkg_overlays/libxslt/libexslt-pkgconfig.patch b/vcpkg_overlays/libxslt/libexslt-pkgconfig.patch deleted file mode 100644 index b500a8108ca..00000000000 --- a/vcpkg_overlays/libxslt/libexslt-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libexslt.pc.in b/libexslt.pc.in -index 1d60563..50089e8 100644 ---- a/libexslt.pc.in -+++ b/libexslt.pc.in -@@ -7,7 +7,8 @@ includedir=@includedir@ - Name: libexslt - Version: @LIBEXSLT_VERSION@ - Description: EXSLT Extension library --Requires: libxml-2.0, libxslt -+Requires: libxslt -+Requires.private: @EXSLT_PRIVATE_REQUIRES@ - Cflags: @EXSLT_INCLUDEDIR@ - Libs: @EXSLT_LIBDIR@ -lexslt - Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/vcpkg_overlays/libxslt/msvc-no-suffix.patch b/vcpkg_overlays/libxslt/msvc-no-suffix.patch deleted file mode 100644 index 243687fc579..00000000000 --- a/vcpkg_overlays/libxslt/msvc-no-suffix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8679fb..6dc6501 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,7 +249,7 @@ set_target_properties( - VERSION ${PROJECT_VERSION} - ) - --if(MSVC) -+if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles - if(BUILD_SHARED_LIBS) - set_target_properties( - LibXslt -@@ -327,7 +332,7 @@ set_target_properties( - VERSION ${LIBEXSLT_VERSION} - ) - --if(MSVC) -+if(0) # same reason as above - if(BUILD_SHARED_LIBS) - set_target_properties( - LibExslt diff --git a/vcpkg_overlays/libxslt/portfile.cmake b/vcpkg_overlays/libxslt/portfile.cmake deleted file mode 100644 index 6624f6a7818..00000000000 --- a/vcpkg_overlays/libxslt/portfile.cmake +++ /dev/null @@ -1,83 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/libxslt - REF v1.1.37 - SHA512 4e7a57cbe02ceea34404213a88bdbb63a756edfab63063ce3979b670816ae3f6fb3637a49508204e6e46b936628e0a3b8b77e9201530a1184225bd68da403b25 - HEAD_REF master - PATCHES - python3.patch - msvc-no-suffix.patch - libexslt-pkgconfig.patch - fix-gcrypt-deps.patch - skip-install-docs.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "python" LIBXSLT_WITH_PYTHON - "crypto" LIBXSLT_WITH_CRYPTO -) -if("python" IN_LIST FEATURES) - vcpkg_find_acquire_program(PYTHON3) - list(APPEND FEATURE_OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}") - list(APPEND FEATURE_OPTIONS_RELEASE "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/site-packages") - list(APPEND FEATURE_OPTIONS_DEBUG "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/site-packages") -endif() -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - -DLIBXSLT_WITH_TESTS:BOOL=OFF - -DLIBXSLT_WITH_THREADS:BOOL=ON - OPTIONS_RELEASE - ${FEATURE_OPTIONS_RELEASE} - -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=OFF - -DLIBXSLT_WITH_MEM_DEBUG:BOOL=OFF - -DLIBXSLT_WITH_DEBUGGER:BOOL=OFF - OPTIONS_DEBUG - ${FEATURE_OPTIONS_DEBUG} - -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=ON - -DLIBXSLT_WITH_MEM_DEBUG:BOOL=ON - -DLIBXSLT_WITH_DEBUGGER:BOOL=ON - ) -vcpkg_cmake_install() -file(GLOB config_path RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/libxslt-*") -vcpkg_cmake_config_fixup(CONFIG_PATH "${config_path}") - -file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt") -file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../.."; pwd -P)]]) -if(NOT VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../../../debug"; pwd -P)]]) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[${prefix}/include]] [[${prefix}/../include]]) -endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") -vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) - -vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "ifdef LIBXSLT_STATIC" "if 1") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "ifdef LIBEXSLT_STATIC" "if 1") -endif() - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt") - endif() -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libxslt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/vcpkg_overlays/libxslt/python3.patch b/vcpkg_overlays/libxslt/python3.patch deleted file mode 100644 index fc86d1fc56e..00000000000 --- a/vcpkg_overlays/libxslt/python3.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8679fb..6dc6501 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,11 @@ if(LIBXSLT_WITH_PYTHON) - check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL) - if(HAVE_UNISTD_H AND HAVE_F_GETFL) - find_package(Python COMPONENTS Interpreter Development REQUIRED) -+ elseif(1) -+ find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -+ add_library(Python::Python ALIAS Python3::Python) -+ set(Python_EXECUTABLE ${Python3_EXECUTABLE}) -+ set(Python_SITEARCH ${Python3_SITEARCH}) - else() - find_package(Python2 COMPONENTS Interpreter Development REQUIRED) - add_library(Python::Python ALIAS Python2::Python) diff --git a/vcpkg_overlays/libxslt/skip-install-docs.patch b/vcpkg_overlays/libxslt/skip-install-docs.patch deleted file mode 100644 index a5d59f32540..00000000000 --- a/vcpkg_overlays/libxslt/skip-install-docs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6dc6501..d36a049 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -432,10 +434,12 @@ if(LIBXSLT_WITH_PYTHON) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxslt.py DESTINATION ${LIBXSLT_PYTHON_INSTALL_DIR} COMPONENT runtime) - endif() - -+if(VCPKG_INSTALL_DOCS) - install(FILES libexslt/libexslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) - install(FILES libxslt/libxslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) - install(FILES doc/xsltproc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) - install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) -+endif() - - if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) - install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development) diff --git a/vcpkg_overlays/libxslt/usage b/vcpkg_overlays/libxslt/usage deleted file mode 100644 index 9bf987b6467..00000000000 --- a/vcpkg_overlays/libxslt/usage +++ /dev/null @@ -1,12 +0,0 @@ -The package libxslt is compatible with built-in CMake targets: - - # xslt library - find_package(LibXslt REQUIRED) - target_link_libraries(main PRIVATE LibXslt::LibXslt) - - # exslt library - find_package(LibXslt REQUIRED) - target_link_libraries(main PRIVATE LibXslt::LibExslt) - -In order to use modules, you must set environment variable LIBXSLT_PLUGINS_PATH -at runtime. diff --git a/vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake b/vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 3d9f6e3dfa8..00000000000 --- a/vcpkg_overlays/libxslt/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,5 +0,0 @@ -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") - -_find_package(${ARGS} CONFIG) diff --git a/vcpkg_overlays/libxslt/vcpkg.json b/vcpkg_overlays/libxslt/vcpkg.json deleted file mode 100644 index 8b9e8b83bc2..00000000000 --- a/vcpkg_overlays/libxslt/vcpkg.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "libxslt", - "version": "1.1.37", - "port-version": 2, - "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", - "homepage": "https://github.com/GNOME/libxslt", - "license": null, - "supports": "!uwp", - "dependencies": [ - "libxml2", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "default-features" - ], - "features": { - "crypto": { - "description": "Build with crypto support", - "supports": "!windows", - "dependencies": [ - "libgcrypt" - ] - }, - "default-features": { - "description": "default features for the current platform" - }, - "plugins": { - "description": "(deprecated)", - "supports": "!static" - }, - "python": { - "description": "Builds with python support", - "supports": "!windows" - } - } -} diff --git a/vcpkg_overlays/nlp-engine/CMakeLists.txt b/vcpkg_overlays/nlp-engine/CMakeLists.txt deleted file mode 100644 index 66dd00be7e8..00000000000 --- a/vcpkg_overlays/nlp-engine/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -# set the project name and version -project(nlp-engine) - -set(CMAKE_CXX_STANDARD 17) - -find_package(ICU REQUIRED COMPONENTS data i18n io tu uc) - -include_directories(cs/include) -include_directories(include) -include_directories(include/Api) -include_directories(include/Api/lite) -include_directories(${ICU_INCLUDE_DIRS}) - -add_subdirectory(cs) -add_subdirectory(src) - -install(DIRECTORY "${CMAKE_SOURCE_DIR}/include" DESTINATION "." FILES_MATCHING PATTERN "*.h") - -add_definitions( -DLITE_EXPORTS ) -if(WIN32) - add_definitions( -DMSVC_VERSION=${MSVC_VERSION} -D_CRT_SECURE_NO_WARNINGS ) -else() - add_definitions( -DLINUX -Wno-write-strings -Wno-deprecated ) -endif() - -file(GLOB lite_src "lite/*.h" "lite/*.cpp") -add_library(nlp-engine SHARED ${lite_src}) -target_link_libraries(nlp-engine PRIVATE - prim - kbm - consh - words - ${ICU_LIBRARIES} -) - -target_include_directories(nlp-engine - INTERFACE - $ - $ - $ -) - -install(TARGETS nlp-engine - EXPORT nlp-engine-config - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install(EXPORT nlp-engine-config - FILE nlp-engine-config.cmake - DESTINATION share/cmake/nlp-engine -) - -install( - DIRECTORY ./analyzers - DESTINATION share/nlp-engine - COMPONENT Runtime -) - -install( - DIRECTORY ./data - DESTINATION share/nlp-engine - COMPONENT Runtime -) diff --git a/vcpkg_overlays/nlp-engine/portfile.cmake b/vcpkg_overlays/nlp-engine/portfile.cmake deleted file mode 100644 index ae931ff004c..00000000000 --- a/vcpkg_overlays/nlp-engine/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO VisualText/nlp-engine - REF v${VERSION} - SHA512 a6871cb3db10a1d4bd7d5290141a82e788269da28b2d995963825dc4c50025e6099f5f872e4538054b7fb169773b6d6d3e73e3dd102bc3e0cbb5bddcd95ae484 - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH ANALYZER_PATH - REPO VisualText/analyzers - REF v1.6.2 - SHA512 07479c8ba1f36c3a0bb035af7414e96ce1477ffaa8a276256fc3749d169c0bb99f9ac9ad5c9b5b0868d634644013c46643a90598dd465e4f16bbe82a47ac60fe - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH PARSE_EN_US_PATH - REPO VisualText/parse-en-us - REF v1.1.1 - SHA512 1aa01c0befe82b8fe415576ae992b0b60fe51b816e93fd8f45da4c5ccacc3dc87c21373ba001cf0d0c503131b4b83346e86f1522795901bbceb07c63a52d6294 - HEAD_REF master -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY "${ANALYZER_PATH}/." DESTINATION "${SOURCE_PATH}/analyzers" PATTERN "*.*") -file(COPY "${PARSE_EN_US_PATH}/." DESTINATION "${SOURCE_PATH}/analyzers/parse-en-us" PATTERN "*.*") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "nlp-engine" CONFIG_PATH "share/cmake/nlp-engine") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/vcpkg_overlays/nlp-engine/vcpkg.json b/vcpkg_overlays/nlp-engine/vcpkg.json deleted file mode 100644 index f58aab2fe7b..00000000000 --- a/vcpkg_overlays/nlp-engine/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "nlp-engine", - "version-semver": "2.10.6", - "port-version": 0, - "homepage": "https://github.com/VisualText/nlp-engine", - "description": "The NLP engine is a cross-platform text analysis tool that can be accessed through a command line executable or by calling its C++ functions from another language.", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - { - "name": "icu", - "features": [ - "tools" - ] - } - ] -} \ No newline at end of file From ba0cf59f6388e219fe075cca13ce2b4ea04a8ea7 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 17 May 2024 18:04:29 +0100 Subject: [PATCH 7/8] Split off 9.0.110 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 +- helm/hpcc/templates/_helpers.tpl | 2 +- helm/hpcc/templates/dafilesrv.yaml | 2 +- helm/hpcc/templates/dali.yaml | 2 +- helm/hpcc/templates/dfuserver.yaml | 2 +- helm/hpcc/templates/eclagent.yaml | 4 +- helm/hpcc/templates/eclccserver.yaml | 4 +- helm/hpcc/templates/eclscheduler.yaml | 2 +- helm/hpcc/templates/esp.yaml | 2 +- helm/hpcc/templates/localroxie.yaml | 2 +- helm/hpcc/templates/localroxie.yaml.fixed | 161 ++++++++ helm/hpcc/templates/roxie.yaml | 8 +- helm/hpcc/templates/roxie.yaml.fixed | 479 ++++++++++++++++++++++ helm/hpcc/templates/sasha.yaml | 2 +- helm/hpcc/templates/thor.yaml | 10 +- version.cmake | 4 +- 16 files changed, 665 insertions(+), 25 deletions(-) create mode 100644 helm/hpcc/templates/localroxie.yaml.fixed create mode 100644 helm/hpcc/templates/roxie.yaml.fixed diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 35657e26738..cd689f32b18 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 9.0.109-closedown0 +version: 9.0.111-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 9.0.109-closedown0 +appVersion: 9.0.111-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index a5bce5d9fd5..34fe972ae12 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1314,7 +1314,7 @@ kind: Service metadata: name: {{ $lvars.serviceName | quote }} labels: - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }} {{- if $lvars.labels }} {{ toYaml $lvars.labels | indent 4 }} diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index ca1a1464495..478354bde26 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -50,7 +50,7 @@ spec: labels: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }} server: {{ .name | quote }} - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 annotations: checksum/config: {{ $configSHA }} spec: diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml index 35c9196b289..c73d45c4185 100644 --- a/helm/hpcc/templates/dali.yaml +++ b/helm/hpcc/templates/dali.yaml @@ -82,7 +82,7 @@ spec: run: {{ $dali.name | quote }} server: {{ $dali.name | quote }} app: dali - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} {{- end }} diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml index 03ebff6fa62..9e3ee1607ba 100644 --- a/helm/hpcc/templates/dfuserver.yaml +++ b/helm/hpcc/templates/dfuserver.yaml @@ -56,7 +56,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }} run: {{ .name | quote }} accessDali: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml index 0b39ef34864..067dddd5bdb 100644 --- a/helm/hpcc/templates/eclagent.yaml +++ b/helm/hpcc/templates/eclagent.yaml @@ -58,7 +58,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -135,7 +135,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml index c9c7a71219f..b269a2030f7 100644 --- a/helm/hpcc/templates/eclccserver.yaml +++ b/helm/hpcc/templates/eclccserver.yaml @@ -57,7 +57,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -142,7 +142,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml index 65060ed6419..a051e0a480e 100644 --- a/helm/hpcc/templates/eclscheduler.yaml +++ b/helm/hpcc/templates/eclscheduler.yaml @@ -64,7 +64,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: "no" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml index 52f7bea5e12..60668168a9a 100644 --- a/helm/hpcc/templates/esp.yaml +++ b/helm/hpcc/templates/esp.yaml @@ -117,7 +117,7 @@ spec: server: {{ .name | quote }} accessDali: "yes" app: {{ $application }} - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml index bbca43ca5fa..37f2da967e7 100644 --- a/helm/hpcc/templates/localroxie.yaml +++ b/helm/hpcc/templates/localroxie.yaml @@ -70,7 +70,7 @@ spec: server: {{ $servername | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} diff --git a/helm/hpcc/templates/localroxie.yaml.fixed b/helm/hpcc/templates/localroxie.yaml.fixed new file mode 100644 index 00000000000..26904a02308 --- /dev/null +++ b/helm/hpcc/templates/localroxie.yaml.fixed @@ -0,0 +1,161 @@ +{{/* + +--- DO NOT EDIT THIS FILE - all configuration of HPCC platform should be done via values.yaml ---- + +############################################################################## + + HPCC SYSTEMS software Copyright (C) 2021 HPCC Systems®. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +############################################################################## + +*/}} +{{/* +localroxie configmap +Pass in dict with root and me +*/}} +{{- define "hpcc.localroxieConfigMap" }} +apiVersion: v1 +metadata: + name: {{ .me.name }}-configmap +data: + {{ .me.name }}.yaml: + version: 1.0 + roxie: +{{ toYaml (omit .me "logging" "tracing" "env") | indent 6 }} +{{- include "hpcc.generateLoggingConfig" . | indent 6 }} +{{- include "hpcc.generateTracingConfig" . | indent 6 }} +{{ include "hpcc.generateVaultConfig" . | indent 6 }} + global: +{{ include "hpcc.generateGlobalConfigMap" .root | indent 6 }} +{{- end -}}{{/* define "hpcc.localroxieConfigMap */}} + +{{ range $roxie := $.Values.roxie -}} +{{- if not $roxie.disabled -}} +{{- $env := concat ($.Values.global.env | default list) (.env | default list) -}} +{{- $secretsCategories := list "system" "eclUser" "ecl" "storage" }} +{{- $enginePlaneDetails := dict -}} +{{- $_ := include "hpcc.getEnginePlanes" (dict "root" $ "me" . "result" $enginePlaneDetails) -}} +{{- $commonCtx := dict "root" $ "me" $roxie "includeCategories" $enginePlaneDetails.planeCategories "includeNames" $enginePlaneDetails.namedPlanes "secretsCategories" $secretsCategories "env" $env }} +{{- $configSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.localroxieConfigMap" "component" "roxie" "excludeKeys" "global")) }} +{{- include "hpcc.checkDefaultStoragePlane" $commonCtx }} +{{- $singleNode := (hasKey $roxie "singleNode") | ternary $roxie.singleNode ((hasKey $roxie "localAgent") | ternary $roxie.localAgent false) }} +{{- if $singleNode -}} +{{- $localAgent := ((hasKey $roxie "localAgent") | ternary $roxie.localAgent true) -}} +{{- $name := $roxie.name -}} +{{- $servername := printf "%s-server" $roxie.name -}} + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $roxie.name | quote }} +spec: + replicas: {{ $roxie.replicas | default 1 }} + selector: + matchLabels: + run: {{ $roxie.name | quote }} + server: {{ $servername | quote }} + template: + metadata: + labels: + run: {{ $roxie.name | quote }} + server: {{ $servername | quote }} + accessDali: "yes" + accessEsp: "yes" +<<<<<<< HEAD + helmVersion: 9.0.111-closedown0 +{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} +{{- if hasKey . "labels" }} +{{ toYaml .labels | indent 8 }} +{{- end }} +======= + helmVersion: 9.0.111-closedown0 + {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} +{{- if hasKey . "labels" }} +{{ toYaml .labels | indent 8 }} +{{- end }} +>>>>>>> origin/candidate-9.6.x + annotations: + checksum/config: {{ $configSHA }} +{{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }} + spec: +{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $roxie.name "target" $roxie.name "type" "roxie") | indent 6 }} + serviceAccountName: "hpcc-default" + initContainers: +{{- include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }} +{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}} + containers: + - name: {{ $roxie.name | quote }} + workingDir: /var/lib/HPCCSystems + command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] + args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }} + {{ include "hpcc.configArg" $roxie }}, + {{ include "hpcc.daliArg" (dict "root" $ "component" "Local Roxie" "optional" false) }}, + "--server=true", + "--localAgent={{ $localAgent }}", + "--resolveLocally=false" + ] + env: +{{ include "hpcc.mergeEnvironments" $env | indent 8 -}} + - name: "SENTINEL" + value: "/tmp/{{ $roxie.name }}.sentinel" +{{- $local := dict "first" true }} +{{- range $service := $roxie.services }} +{{- if ne (int $service.servicePort) 0 }} +{{- if $local.first }} +{{- $_ := set $local "first" false }} + ports: +{{- end }} + - name: {{ $service.name }} + containerPort: {{ $service.servicePort }} +{{- end }} +{{- end }} +{{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }} +{{- include "hpcc.addResources" (dict "me" $roxie.resources "root" $) | indent 8 }} +{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }} + volumeMounts: +{{ include "hpcc.addConfigMapVolumeMount" . | indent 8 }} +{{ include "hpcc.addVolumeMounts" $commonCtx | indent 8 }} +{{- include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" false) | indent 8 }} +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" true "includeRemote" true) | indent 8 }} +{{ include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "name" $roxie.name "component" "localudpkey" ) | indent 8 }} + volumes: +{{ include "hpcc.addConfigMapVolume" . | indent 6 }} +{{ include "hpcc.addVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addSecretVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" false) | indent 6 }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localroxie" "external" true "includeRemote" true) | indent 6 }} +{{ include "hpcc.addUDPCertificateVolume" (dict "root" $ "name" $roxie.name "component" "localudpkey" ) | indent 6 }} +--- +{{- range $service := $roxie.services }} +{{- if ne (int $service.servicePort) 0 }} +{{ include "hpcc.addService" ( dict "root" $ "name" $service.name "service" $service "selector" $servername "defaultPort" $service.servicePort ) }} +--- +{{- end }} +{{- end }} +kind: ConfigMap +{{ include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.localroxieConfigMap")) }} +--- +{{ include "hpcc.addCertificate" (dict "root" $ "name" $roxie.name "services" $roxie.services "component" "localroxie" "external" false) }} +{{ include "hpcc.addCertificate" (dict "root" $ "name" $roxie.name "services" $roxie.services "component" "localroxie" "external" true "includeRemote" true) }} +{{ include "hpcc.addUDPCertificate" (dict "root" $ "name" $roxie.name "component" "localudpkey") }} +--- +{{ include "hpcc.addEgress" $commonCtx }} + +{{- end }}{{/* if singleNode */}} +{{- end }}{{/* if not disabled */}} +{{- end }}{{/* range */}} diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index 05f052c5338..00f0b503d46 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -120,7 +120,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }} run: {{ $commonCtx.toponame | quote }} roxie-cluster: {{ $roxie.name | quote }} - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} @@ -180,7 +180,7 @@ kind: Service metadata: name: {{ $commonCtx.toponame | quote }} labels: - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} spec: ports: @@ -242,7 +242,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} @@ -347,7 +347,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} diff --git a/helm/hpcc/templates/roxie.yaml.fixed b/helm/hpcc/templates/roxie.yaml.fixed new file mode 100644 index 00000000000..b1a388d585c --- /dev/null +++ b/helm/hpcc/templates/roxie.yaml.fixed @@ -0,0 +1,479 @@ +{{/* + +--- DO NOT EDIT THIS FILE - all configuration of HPCC platform should be done via values.yaml ---- + +############################################################################## + + HPCC SYSTEMS software Copyright (C) 2021 HPCC Systems®. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +############################################################################## + +*/}} + +{{/* +roxie configmap +Pass in dict with root and me +*/}} +{{- define "hpcc.roxieConfigMap" -}} +apiVersion: v1 +metadata: + name: {{ .me.name }}-configmap +data: + {{ .me.name }}.yaml: + version: 1.0 + roxie: +{{- $root := .root -}} +{{- $component := .me }} + services: +{{- range $service := .me.services }} + - name: {{ $service.name }} +{{ toYaml (omit $service "tls" "name") | indent 8 }} +{{- if ne (int $service.servicePort) 0 }} +{{- include "hpcc.addTLSServiceEntries" (dict "root" $root "service" $service "component" $component "visibility" $service.visibility "remoteClients" $service.remoteClients "trustClients" $service.trustClients "includeTrustedPeers" true "incluedRoxieAndEspServices" true) | indent 6 }} +{{- end }} +{{- end }} +{{ toYaml ( omit .me "logging" "tracing" "topoServer" "encryptInTransit" "env" "services") | indent 6 }} + numChannels: {{ .numChannels }} + topologyServers: "{{ .toponame }}:{{ .topoport }}" + heartbeatInterval: {{ .heartbeatInterval }} + resolveLocally: false +{{- $mtlsEnabled := (eq (include "hpcc.isMtlsEnabled" (dict "root" .root)) "true") -}} +{{/* By default use encryption if local certificates are enabled, but allow it to be turned off via roxie .encryptInTransit value */}} +{{- if (hasKey .me "encryptInTransit") -}} +{{- if and (.me.encryptInTransit) (not $mtlsEnabled) -}} +{{- $_ := fail (printf "Roxie %s encryptInTransit requires local cert-manager configuration." .me.name ) }} +{{- end }} + encryptInTransit: {{ .me.encryptInTransit }} +{{ else }} + encryptInTransit: {{ $mtlsEnabled }} +{{ end -}} +{{- include "hpcc.generateLoggingConfig" (dict "root" .root "me" .me) | indent 6 }} +{{- include "hpcc.generateTracingConfig" (dict "root" .root "me" .me) | indent 6 }} +{{ include "hpcc.generateVaultConfig" . | indent 6 }} + global: +{{ include "hpcc.generateGlobalConfigMap" .root | indent 6 }} +{{- end -}}{{/*define "hpcc.roxieConfigMap"*/}} + +{{- define "hpcc.roxieTopoConfigMap" -}} +apiVersion: v1 +metadata: + name: {{ .toponame }}-configmap +data: + {{ .toponame }}.yaml: + version: 1.0 + toposerver: +{{ toYaml ( omit .toposerver "logging" "tracing" "env") | indent 6 }} +{{- include "hpcc.generateLoggingConfig" (dict "root" .root "me" .toposerver) | indent 6 }} +{{- include "hpcc.generateTracingConfig" (dict "root" .root "me" .toposerver) | indent 6 }} + global: +{{ include "hpcc.generateGlobalConfigMap" .root | indent 6 }} +{{- end -}}{{/*define "hpcc.roxieConfigMap"*/}} + +{{ range $roxie := $.Values.roxie -}} +{{- if not $roxie.disabled -}} +{{- $env := concat ($.Values.global.env | default list) (.env | default list) -}} +{{- $secretsCategories := list "system" "eclUser" "ecl" "storage" }} +{{- $toposerver := ($roxie.topoServer | default dict) -}} +{{- $enginePlaneDetails := dict -}} +{{- $_ := include "hpcc.getEnginePlanes" (dict "root" $ "me" . "result" $enginePlaneDetails) -}} +{{- $commonCtx := dict "root" $ "me" $roxie "includeCategories" $enginePlaneDetails.planeCategories "includeNames" $enginePlaneDetails.namedPlanes "secretsCategories" $secretsCategories "toposerver" $toposerver "env" $env }} +{{- $_ := set $commonCtx "toponame" (printf "%s-toposerver" $roxie.name) -}} +{{- $_ := set $commonCtx "numChannels" ($roxie.numChannels | int | default 1) -}} +{{- $_ := set $commonCtx "topoport" ($toposerver.port | int | default 9004) -}} +{{- $_ := set $commonCtx "heartbeatInterval" ($toposerver.heartbeatInterval | int | default 10000) -}} +{{- $_ := set $toposerver "name" $commonCtx.toponame -}} +{{- $configSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieConfigMap" "component" "roxie" "excludeKeys" "global")) }} +{{- $topoconfigSHA := include "hpcc.getConfigSHA" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieTopoConfigMap" "component" "toposerver" "excludeKeys" "global")) }} +{{- include "hpcc.checkDefaultStoragePlane" $commonCtx }} +{{- $singleNode := (hasKey $roxie "singleNode") | ternary $roxie.singleNode ((hasKey $roxie "localAgent") | ternary $roxie.localAgent false) }} +{{- if not $singleNode -}} +{{- $servername := printf "%s-server" $roxie.name -}} +{{- $udpkeyname := $roxie.name -}} +{{- range $service := $roxie.services }} +{{- range $remoteClient := $service.remoteClients }} + {{ include "hpcc.addExternalRemoteClientCertificate" (dict "root" $ "client" $remoteClient.name "organization" $remoteClient.organization "instance" $service.name "component" "roxie" "visibility" $service.visibility "secretTemplate" $remoteClient.secretTemplate) }} +{{- end }} +{{- if ne (int $service.servicePort) 0 }} +{{- $_ := set $service "port" $service.servicePort }} +{{- end }} +{{- end }} + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $commonCtx.toponame | quote }} +spec: + replicas: {{ $toposerver.replicas | default 1 }} + selector: + matchLabels: + run: {{ $commonCtx.toponame | quote }} + template: + metadata: + labels: +{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }} + run: {{ $commonCtx.toponame | quote }} + roxie-cluster: {{ $roxie.name | quote }} +<<<<<<< HEAD + helmVersion: 9.0.111-closedown0 +{{- if hasKey $.Values.global "metrics" }} +{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} +{{- end }} +{{- if hasKey $toposerver "labels" }} +{{ toYaml $toposerver.labels | indent 8 }} +{{- end }} +======= + helmVersion: 9.0.111-closedown0 +{{- if hasKey $.Values.global "metrics" }} + {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} +{{- end }} +{{- if hasKey $toposerver "labels" }} +{{ toYaml $toposerver.labels | indent 8 }} +{{- end }} +>>>>>>> origin/candidate-9.6.x + annotations: + checksum/config: {{ $topoconfigSHA }} +{{- include "hpcc.generateAnnotations" (dict "root" $commonCtx.root "me" $toposerver) | indent 8 }} +{{- if hasKey $.Values.global "metrics" }} +{{- include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }} +{{- end }} + spec: +{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $commonCtx.toponame "target" $roxie.name "type" "roxie") | indent 6 }} + serviceAccountName: "hpcc-default" +{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}} + containers: + - name: {{ $commonCtx.toponame | quote }} +{{ include "hpcc.addSentinelProbes" $toposerver | indent 8 }} +{{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }} +{{- $defaultResources := dict "cpu" "500m" "memory" "200Mi" }} +{{- include "hpcc.addResources" (dict "me" .topoResources "defaults" $defaultResources "root" $) | indent 8 }} +{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }} + workingDir: /var/lib/HPCCSystems + command: [ {{ include "hpcc.componentCommand" (dict "me" $toposerver "root" $ "process" "toposerver") }} ] + args: [ {{- include "hpcc.componentStartArgs" (dict "me" $toposerver "root" $ "process" "toposerver") | nindent 16 }} + {{ include "hpcc.configArg" $toposerver }} + ] + env: +{{ include "hpcc.mergeEnvironments" $env | indent 8 -}} + - name: "SENTINEL" + value: "/tmp/{{ $commonCtx.toponame }}.sentinel" + volumeMounts: +{{ include "hpcc.addConfigMapVolumeMount" $toposerver | indent 8 }} +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "topo" "name" $commonCtx.toponame "external" false) | indent 8 }} + volumes: +{{ include "hpcc.addConfigMapVolume" $toposerver | indent 6 }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "topo" "name" $commonCtx.toponame "external" false) | indent 6 }} + +--- +{{ include "hpcc.addCertificate" (dict "root" $ "name" $commonCtx.toponame "servicename" $commonCtx.toponame "component" "topo" "external" false) }} +{{ include "hpcc.addUDPCertificate" (dict "root" $ "name" $udpkeyname "component" "udpkey") }} + +--- +{{- range $service := $roxie.services }} +{{- if ne (int $service.servicePort) 0 }} +{{ include "hpcc.addService" ( dict "root" $ "name" $service.name "service" $service "selector" $servername "defaultPort" $service.servicePort) }} +--- +{{- end }} +{{- end }} + +apiVersion: v1 +kind: Service +metadata: + name: {{ $commonCtx.toponame | quote }} + labels: +<<<<<<< HEAD + helmVersion: 9.0.111-closedown0 +{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} +======= + helmVersion: 9.0.111-closedown0 + {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} +>>>>>>> origin/candidate-9.6.x +spec: + ports: + - port: {{ $commonCtx.topoport }} + protocol: TCP + targetPort: {{ $commonCtx.topoport }} + selector: + run: {{ $commonCtx.toponame | quote }} + clusterIP: None # Headless service +--- + +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: {{ printf "%s-internal-traffic" $roxie.name }} +spec: + podSelector: + matchLabels: + roxie-cluster: {{ $roxie.name | quote }} + policyTypes: + - Ingress + - Egress + ingress: + - from: + - podSelector: + matchLabels: + roxie-cluster: {{ $roxie.name | quote }} + egress: + - to: + - podSelector: + matchLabels: + roxie-cluster: {{ $roxie.name | quote }} + +--- +kind: ConfigMap +{{ include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieConfigMap")) }} +--- +kind: ConfigMap +{{ include "hpcc.generateConfig" ($commonCtx | merge (dict "configMapHelper" "hpcc.roxieTopoConfigMap")) }} +--- + +{{- $_ := set $commonCtx "instanceNames" list -}} +{{ if $roxie.serverReplicas -}} +{{ $_ := set $commonCtx "instanceNames" (list $servername) -}} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $servername | quote }} +spec: + replicas: {{ $roxie.serverReplicas }} + selector: + matchLabels: + run: {{ $servername | quote }} + template: + metadata: + labels: + run: {{ $servername | quote }} + server: {{ $roxie.name | quote }} + roxie-cluster: {{ $roxie.name | quote }} + accessDali: "yes" + accessEsp: "yes" +<<<<<<< HEAD + helmVersion: 9.0.111-closedown0 +{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }} +{{- if hasKey $.Values.global "metrics" }} +{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} +{{- end }} +{{- if hasKey $roxie "labels" }} +{{ toYaml $roxie.labels | indent 8 }} +{{- end }} +======= + helmVersion: 9.0.111-closedown0 + {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }} +{{- if hasKey $.Values.global "metrics" }} + {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} +{{- end }} +{{- if hasKey $roxie "labels" }} +{{ toYaml $roxie.labels | indent 8 }} +{{- end }} +>>>>>>> origin/candidate-9.6.x + annotations: + checksum/config: {{ $configSHA }} +{{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }} +{{- if hasKey $.Values.global "metrics" }} +{{- include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }} +{{- end }} +{{- if hasKey $roxie "annotations" }} +{{ toYaml $roxie.annotations | indent 8 }} +{{- end }} + spec: +{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $servername "target" $roxie.name "type" "roxie") | indent 6 }} + serviceAccountName: "hpcc-default" + initContainers: +{{- include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }} +{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}} + terminationGracePeriodSeconds: {{ add ($roxie.agentQueryReleaseDelaySeconds | default 60) 30 }} + containers: + - name: {{ $servername | quote }} + workingDir: /var/lib/HPCCSystems + command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] + args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }} + {{ include "hpcc.daliArg" (dict "root" $ "component" "Roxie" "optional" false) }}, + "--server=true" + ] + env: +{{ include "hpcc.mergeEnvironments" $env | indent 8 -}} + - name: "SENTINEL" + value: "/tmp/{{ $roxie.name }}.sentinel" +{{- $local := dict "first" true }} +{{- range $service := $roxie.services }} +{{- if ne (int $service.servicePort) 0 }} +{{- if $local.first }} +{{- $_ := set $local "first" false }} + ports: +{{- end }} + - name: {{ $service.name }} + containerPort: {{ $service.servicePort }} +{{- end }} +{{- end }} + lifecycle: + preStop: + exec: + command: ["testsocket", ".", "control:closedown"] +{{ include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }} +{{ include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }} +{{- include "hpcc.addResources" (dict "me" ($roxie.serverResources | default $roxie.resources) "root" $) | indent 8 }} +{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }} + volumeMounts: +{{ include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }} +{{ include "hpcc.addVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-server" "name" $servername "external" false) | indent 8 }} +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-server" "name" $servername "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 8 }} +{{ include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "component" "udpkey" "name" $udpkeyname ) | indent 8 }} + volumes: +{{ include "hpcc.addConfigMapVolume" $roxie | indent 6 }} +{{ include "hpcc.addVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addSecretVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-server" "name" $servername "external" false) | indent 6 }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-server" "name" $servername "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 6 }} +{{ include "hpcc.addUDPCertificateVolume" (dict "root" $ "component" "udpkey" "name" $udpkeyname) | indent 6 }} + +--- +{{ include "hpcc.addCertificate" (dict "root" $ "name" $servername "services" $roxie.services "component" "roxie-server" "external" false) }} +{{ include "hpcc.addCertificate" (dict "root" $ "name" $servername "services" $roxie.services "component" "roxie-server" "external" true "includeRemote" true) }} +--- +{{ end -}}{{/* if serverReplicas */}} + +{{- $agentPublicCertName := printf "%s-agent" $roxie.name }} +{{ include "hpcc.addCertificate" (dict "root" $ "name" $agentPublicCertName "services" $roxie.services "component" "roxie-agent" "external" true "includeRemote" true) }} + +{{ range $c, $e := until ($commonCtx.numChannels|int) -}} +{{- $channel := add $c 1 -}} +{{- $name := printf "%s-agent-%d" $roxie.name $channel }} +{{- $_ := set $commonCtx "instanceNames" (append $commonCtx.instanceNames $name) }} + +{{ include "hpcc.addCertificate" (dict "root" $ "name" $name "services" $roxie.services "component" "roxie-agent" "external" false) }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $name | quote}} +spec: + replicas: {{ (hasKey $roxie "replicas") | ternary $roxie.replicas 1 }} + selector: + matchLabels: + run: {{ $name | quote}} + template: + metadata: + labels: +{{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-agent" "name" "roxie" "instance" $name) | indent 8 }} + run: {{ $name | quote}} +{{- if not $roxie.serverReplicas }} + server: {{ $servername | quote }} +{{- end }} + roxie-cluster: {{ $roxie.name | quote }} + accessDali: "yes" + accessEsp: "yes" +<<<<<<< HEAD + helmVersion: 9.0.111-closedown0 +{{- if hasKey $.Values.global "metrics" }} +{{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} +{{- end }} +{{- if hasKey $roxie "labels" }} +{{ toYaml $roxie.labels | indent 8 }} +{{- end }} +======= + helmVersion: 9.0.111-closedown0 +{{- if hasKey $.Values.global "metrics" }} + {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} +{{- end }} +{{- if hasKey $roxie "labels" }} +{{ toYaml $roxie.labels | indent 8 }} +{{- end }} +>>>>>>> origin/candidate-9.6.x + annotations: + checksum/config: {{ $configSHA }} +{{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }} +{{- if hasKey $.Values.global "metrics" }} +{{- include "hpcc.addPrometheusScrapeAnnotations" $.Values.global.metrics | nindent 8 }} +{{- end }} + spec: +{{- include "hpcc.placementsByPodTargetType" (dict "root" $ "pod" $name "target" $roxie.name "type" "roxie") | indent 6 }} + serviceAccountName: "hpcc-default" + initContainers: +{{- include "hpcc.createConfigInitContainers" $commonCtx | indent 6 }} +{{- include "hpcc.addImagePullSecrets" $commonCtx | nindent 6 -}} + terminationGracePeriodSeconds: {{ add ($roxie.agentQueryReleaseDelaySeconds | default 60) 30 }} + containers: + - name: {{ $name | quote}} + workingDir: /var/lib/HPCCSystems + command: [ {{ include "hpcc.componentCommand" (dict "me" $roxie "root" $ "process" "roxie") }} ] + args: [ {{- include "hpcc.componentStartArgs" (dict "me" $roxie "root" $ "process" "roxie") | nindent 16 }} + {{ include "hpcc.configArg" $roxie }}, + {{ include "hpcc.daliArg" (dict "root" $ "component" "Roxie" "optional" false) }}, + "--channels={{ $channel }}", + "--server={{ not $roxie.serverReplicas }}", + ] + env: +{{ include "hpcc.mergeEnvironments" $env | indent 8 -}} + - name: "SENTINEL" + value: "/tmp/{{ $roxie.name }}.sentinel" +{{- if not $roxie.serverReplicas }} +{{- $local := dict "first" true }} +{{- range $service := $roxie.services }} +{{- if ne (int $service.servicePort) 0 }} +{{- if $local.first }} +{{- $_ := set $local "first" false }} + ports: +{{- end }} + - name: {{ $service.name }} + containerPort: {{ $service.servicePort }} +{{- end }} +{{- end }} + lifecycle: + preStop: + exec: + command: ["testsocket", ".", "control:closedown"] +{{ include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }} +{{- end }}{{/* not serverReplicas */}} +{{ include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }} +{{- include "hpcc.addResources" (dict "me" ($roxie.channelResources | default $roxie.resources) "root" $) | indent 8 }} +{{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }} + volumeMounts: +{{ include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }} +{{ include "hpcc.addVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addSecretVolumeMounts" $commonCtx | indent 8 }} +{{ include "hpcc.addVaultClientCertificateVolumeMounts" $commonCtx | indent 8 }} +{{- if not $roxie.serverReplicas }} + +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-agent" "name" $name "external" false) | indent 8 }} +{{ include "hpcc.addCertificateVolumeMount" (dict "root" $ "component" "roxie-agent" "name" $agentPublicCertName "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 8 }} +{{ include "hpcc.addUDPCertificateVolumeMount" (dict "root" $ "component" "udpkey" "name" $udpkeyname ) | indent 8 }} +{{- end }}{{/* not serverReplicas */}} + + volumes: +{{ include "hpcc.addConfigMapVolume" $roxie | indent 6 }} +{{ include "hpcc.addVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addSecretVolumes" $commonCtx | indent 6 }} +{{ include "hpcc.addVaultClientCertificateVolumes" $commonCtx | indent 6 }} +{{- if not $roxie.serverReplicas }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-agent" "name" $name "external" false) | indent 6 }} +{{ include "hpcc.addCertificateVolume" (dict "root" $ "component" "roxie-agent" "name" $agentPublicCertName "certificate" $roxie.certificate "external" true "includeRemote" true) | indent 6 }} +{{ include "hpcc.addUDPCertificateVolume" (dict "root" $ "component" "udpkey" "name" $udpkeyname) | indent 6 }} +{{- end }}{{/* not serverReplicas */}} +--- + +{{- end }} +{{- end }}{{/* if not singlenode */}} +--- +{{ include "hpcc.addEgress" (dict "root" $ "me" $roxie "labels" $commonCtx.instanceNames) }} +{{- if hasKey . "hpa" }} +{{- include "hpcc.addHorizontalPodAutoscaler" (dict "name" $roxie.name "kind" "Deployment" "hpa" $roxie.hpa) }} +{{- end }} +{{- end }}{{/* if not disabled */}} +{{- end }}{{/* range */}} + diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml index d4e484dfb65..0592ec984db 100644 --- a/helm/hpcc/templates/sasha.yaml +++ b/helm/hpcc/templates/sasha.yaml @@ -52,7 +52,7 @@ spec: run: {{ $serviceName | quote }} server: {{ $serviceName | quote }} accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }} - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- if hasKey $sasha "labels" }} {{ toYaml $sasha.labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index 709bb2c3bf4..2ec4ae3ac40 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -82,7 +82,7 @@ data: labels: accessDali: "yes" accessEsp: "yes" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }} {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} @@ -147,7 +147,7 @@ data: accessEsp: "yes" app: "thor" component: "thormanager" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }} @@ -214,7 +214,7 @@ data: accessEsp: "yes" app: "thor" component: "thorworker" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }} @@ -347,7 +347,7 @@ spec: accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }} app: "thor" component: "thor-eclagent" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 instance: {{ $commonCtx.eclAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} @@ -412,7 +412,7 @@ spec: accessEsp: "no" app: "thor" component: "thor-thoragent" - helmVersion: 9.0.109-closedown0 + helmVersion: 9.0.111-closedown0 instance: {{ $commonCtx.thorAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} diff --git a/version.cmake b/version.cmake index b3a66df0131..87c5c4c9492 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 109 ) +set ( HPCC_POINT 111 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-05-09T15:59:43Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-05-17T17:04:28Z" ) ### From b817edd0ec9ecb9fbee014df648e3b6dbeb615c2 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 17 May 2024 18:05:30 +0100 Subject: [PATCH 8/8] Split off 9.2.88 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- helm/hpcc/templates/dafilesrv.yaml | 2 +- helm/hpcc/templates/dali.yaml | 2 +- helm/hpcc/templates/dfuserver.yaml | 2 +- helm/hpcc/templates/eclagent.yaml | 4 ++-- helm/hpcc/templates/eclccserver.yaml | 4 ++-- helm/hpcc/templates/eclscheduler.yaml | 2 +- helm/hpcc/templates/esp.yaml | 2 +- helm/hpcc/templates/localroxie.yaml | 2 +- helm/hpcc/templates/roxie.yaml | 8 ++++---- helm/hpcc/templates/sasha.yaml | 2 +- helm/hpcc/templates/thor.yaml | 10 +++++----- version.cmake | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 7063d4b43c3..f5fd9c97453 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 9.2.87-closedown0 +version: 9.2.89-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 9.2.87-closedown0 +appVersion: 9.2.89-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index f180c5fdab8..e1cd6f6b0a3 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1405,7 +1405,7 @@ kind: Service metadata: name: {{ $lvars.serviceName | quote }} labels: - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }} {{- if $lvars.labels }} {{ toYaml $lvars.labels | indent 4 }} diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index 81ad342499d..f03fc0bf822 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -50,7 +50,7 @@ spec: labels: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }} server: {{ .name | quote }} - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 annotations: checksum/config: {{ $configSHA }} {{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }} diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml index b26e7e4dc6a..3a03b162d9b 100644 --- a/helm/hpcc/templates/dali.yaml +++ b/helm/hpcc/templates/dali.yaml @@ -82,7 +82,7 @@ spec: run: {{ $dali.name | quote }} server: {{ $dali.name | quote }} app: dali - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} {{- end }} diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml index 93e95b769eb..8c1e2228cfa 100644 --- a/helm/hpcc/templates/dfuserver.yaml +++ b/helm/hpcc/templates/dfuserver.yaml @@ -56,7 +56,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }} run: {{ .name | quote }} accessDali: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml index b30afe857da..a43551f19d0 100644 --- a/helm/hpcc/templates/eclagent.yaml +++ b/helm/hpcc/templates/eclagent.yaml @@ -58,7 +58,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -133,7 +133,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml index ffe3e89c463..863a8e51cc2 100644 --- a/helm/hpcc/templates/eclccserver.yaml +++ b/helm/hpcc/templates/eclccserver.yaml @@ -57,7 +57,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -140,7 +140,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml index 2ea14f2b737..6db877a2357 100644 --- a/helm/hpcc/templates/eclscheduler.yaml +++ b/helm/hpcc/templates/eclscheduler.yaml @@ -64,7 +64,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: "no" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml index fe8a67cc44f..be1c1e6a044 100644 --- a/helm/hpcc/templates/esp.yaml +++ b/helm/hpcc/templates/esp.yaml @@ -120,7 +120,7 @@ spec: accessSasha: "yes" {{- end }} app: {{ $application }} - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml index 1e32d2cbe52..c4336c49046 100644 --- a/helm/hpcc/templates/localroxie.yaml +++ b/helm/hpcc/templates/localroxie.yaml @@ -70,7 +70,7 @@ spec: server: {{ $servername | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index 96f78a4dce6..54816aea59f 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -120,7 +120,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }} run: {{ $commonCtx.toponame | quote }} roxie-cluster: {{ $roxie.name | quote }} - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} @@ -178,7 +178,7 @@ kind: Service metadata: name: {{ $commonCtx.toponame | quote }} labels: - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} spec: ports: @@ -240,7 +240,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} @@ -346,7 +346,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml index ac25132650d..98dac05b3e1 100644 --- a/helm/hpcc/templates/sasha.yaml +++ b/helm/hpcc/templates/sasha.yaml @@ -53,7 +53,7 @@ spec: server: {{ $serviceName | quote }} app: sasha accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }} - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- if hasKey $sasha "labels" }} {{ toYaml $sasha.labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index 4a8d4f61e58..b9671d31fac 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -82,7 +82,7 @@ data: labels: accessDali: "yes" accessEsp: "yes" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }} {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} @@ -145,7 +145,7 @@ data: accessEsp: "yes" app: "thor" component: "thormanager" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }} @@ -210,7 +210,7 @@ data: accessEsp: "yes" app: "thor" component: "thorworker" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }} @@ -341,7 +341,7 @@ spec: accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }} app: "thor" component: "thor-eclagent" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 instance: {{ $commonCtx.eclAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} @@ -404,7 +404,7 @@ spec: accessEsp: "no" app: "thor" component: "thor-thoragent" - helmVersion: 9.2.87-closedown0 + helmVersion: 9.2.89-closedown0 instance: {{ $commonCtx.thorAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} diff --git a/version.cmake b/version.cmake index 2052f658a43..aabb113477c 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 87 ) +set ( HPCC_POINT 89 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-05-09T15:58:25Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-05-17T17:05:29Z" ) ###