From c8f010354b80acab1c1313ebf6e931d024b81183 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 7 Dec 2023 17:58:18 +0000 Subject: [PATCH 01/34] Split off 8.12.76 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 963d894e..44f4e51a 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 75 ) +set ( HPCC_POINT 77 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 7ce6fe8d9663fd97b3b8c1f2c7e4f4c57349763a Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 7 Dec 2023 18:00:13 +0000 Subject: [PATCH 02/34] Split off 9.0.66 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index f0f99136..bcd22cc3 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 65 ) +set ( HPCC_POINT 67 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From cd116eacfef09728fe952efb61c59c0e6d569f1f Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 7 Dec 2023 18:01:57 +0000 Subject: [PATCH 03/34] Split off 9.2.44 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index ff229b94..3d947b4c 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 43 ) +set ( HPCC_POINT 45 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From b7bbc2ce153e2b44d1ee63d88cb222a2af3ad7cf Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 14 Dec 2023 17:11:25 +0000 Subject: [PATCH 04/34] Split off 8.12.78 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 44f4e51a..b0a7feac 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 77 ) +set ( HPCC_POINT 79 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 448a7cc7503c2217408c1634d6269e3b2322a539 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 14 Dec 2023 17:12:44 +0000 Subject: [PATCH 05/34] Split off 9.0.68 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index bcd22cc3..26c0ec97 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 67 ) +set ( HPCC_POINT 69 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 48b9942d297da86c03b993a57f922fd50ec897c0 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 14 Dec 2023 17:14:00 +0000 Subject: [PATCH 06/34] Split off 9.2.46 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 3d947b4c..9edf1614 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 45 ) +set ( HPCC_POINT 47 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From fb2c349c602fe8450d224a1843e53a8b478a2a87 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 21 Dec 2023 11:25:28 +0000 Subject: [PATCH 07/34] Split off 8.12.80 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index b0a7feac..13c83f53 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 79 ) +set ( HPCC_POINT 81 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From a75df95c1eec6cc7c09d4d5041013c389347d990 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 21 Dec 2023 11:27:08 +0000 Subject: [PATCH 08/34] Split off 9.0.70 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 26c0ec97..8021c1d6 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 69 ) +set ( HPCC_POINT 71 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 38babb28c744910d580cd8b4e4c60183d8a1db39 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 21 Dec 2023 11:27:55 +0000 Subject: [PATCH 09/34] Split off 9.2.48 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 9edf1614..47a65269 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 47 ) +set ( HPCC_POINT 49 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From b43c0a436d5e9e24630765e035793042d914db05 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Jan 2024 16:54:38 +0000 Subject: [PATCH 10/34] Split off 8.12.82 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 13c83f53..07db1b73 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 81 ) +set ( HPCC_POINT 83 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From ade1da3571467f105b7984a55ac8c5b0540fdd99 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Jan 2024 16:56:13 +0000 Subject: [PATCH 11/34] Split off 9.0.72 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 8021c1d6..6e1d7a56 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 71 ) +set ( HPCC_POINT 73 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 19baadd8a432e43d19f2c9e0b81f8674569fdcda Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Jan 2024 16:57:40 +0000 Subject: [PATCH 12/34] Split off 9.2.50 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 47a65269..cda1d8be 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 49 ) +set ( HPCC_POINT 51 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From b46b49882cd2c4265f03056a01bdb0c71d8493be Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 11 Jan 2024 17:47:35 +0000 Subject: [PATCH 13/34] Split off 9.0.74 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 6e1d7a56..4b4da18a 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 73 ) +set ( HPCC_POINT 75 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 8c5d846ed29c22afc772b025f94be351fd66d25d Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 11 Jan 2024 17:48:37 +0000 Subject: [PATCH 14/34] Split off 9.2.52 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index cda1d8be..25c6682f 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 51 ) +set ( HPCC_POINT 53 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From d00364652b34e6ac1cfbad0f2bd51dc499b13826 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 11 Jan 2024 17:55:22 +0000 Subject: [PATCH 15/34] Split off 8.12.84 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 07db1b73..7ab215b3 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 83 ) +set ( HPCC_POINT 85 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 58b8cc2123faf733c2f536fb4559651511b408fe Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 19 Jan 2024 17:46:44 +0000 Subject: [PATCH 16/34] Split off 8.12.86 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 7ab215b3..0825566d 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 85 ) +set ( HPCC_POINT 87 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From fc9b6382149d5e7f7ad17e2ee2e8726dece46579 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 19 Jan 2024 17:49:35 +0000 Subject: [PATCH 17/34] Split off 9.0.76 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 4b4da18a..0512e605 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 75 ) +set ( HPCC_POINT 77 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 657615c500b8d6d51b8899e49d308d24df7a9c28 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 19 Jan 2024 17:51:39 +0000 Subject: [PATCH 18/34] Split off 9.2.54 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 25c6682f..05b107c2 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 53 ) +set ( HPCC_POINT 55 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 88daf100d86d1c2f4408af78036da95d5459b427 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 25 Jan 2024 17:21:55 +0000 Subject: [PATCH 19/34] Split off 8.12.88 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 0825566d..ae560f4e 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 87 ) +set ( HPCC_POINT 89 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From ffa1c29ee6391e244ab649c7f2d9221d2c5439fe Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 25 Jan 2024 17:22:48 +0000 Subject: [PATCH 20/34] Split off 9.0.78 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 0512e605..07c2cb53 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 77 ) +set ( HPCC_POINT 79 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 14f9ab50040fd34f67592cd23c35fa0bf8ce6f61 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 25 Jan 2024 17:23:56 +0000 Subject: [PATCH 21/34] Split off 9.2.56 Signed-off-by: Jake Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 05b107c2..0109ac04 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 55 ) +set ( HPCC_POINT 57 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 96c73813ad2113a005b5b243dc86745d58d02796 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 2 Feb 2024 14:44:00 +0000 Subject: [PATCH 22/34] Split off 9.2.58 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 0109ac04..0c2c859f 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 57 ) +set ( HPCC_POINT 59 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From a818994bf21a65ec4fb9f41ad176b7eb3f025554 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 2 Feb 2024 14:47:03 +0000 Subject: [PATCH 23/34] Split off 9.0.80 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 07c2cb53..a11f7a94 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 79 ) +set ( HPCC_POINT 81 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 356e9c1752b5ae846956d0b38861c9296e851275 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 2 Feb 2024 14:48:44 +0000 Subject: [PATCH 24/34] Split off 8.12.90 Signed-off-by: Gavin Halliday --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index ae560f4e..de3fc8c7 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 89 ) +set ( HPCC_POINT 91 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 017875ce4842ad0723babe912ff7335d0c4c51f7 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Wed, 7 Feb 2024 17:09:23 +0000 Subject: [PATCH 25/34] IDE-1130 Add cmake presets and vcpkg configuration files Improve the build system by adding cmake presets and vcpkg configuration Gordon Smith --- CMakeLists.txt | 5 +-- CMakePresets.json | 90 ++++++++++++++++++++++++++++++++++++++++ vcpkg-configuration.json | 15 +++++++ vcpkg.json | 12 +++--- 4 files changed, 113 insertions(+), 9 deletions(-) create mode 100644 CMakePresets.json create mode 100644 vcpkg-configuration.json diff --git a/CMakeLists.txt b/CMakeLists.txt index bac4d2a9..cf8dd719 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,10 @@ -# CMakeLists.txt --- -CMAKE_MINIMUM_REQUIRED(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.0) set(VCPKG_FILES_DIR "${CMAKE_BINARY_DIR}" CACHE STRING "Folder for vcpkg download, build and installed files") set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake) set(VCPKG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg) -set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg_overlays;${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/overlays) set(VCPKG_INSTALLED_DIR "${VCPKG_FILES_DIR}/vcpkg_installed") set(VCPKG_INSTALL_OPTIONS "--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages") -set(VCPKG_VERBOSE OFF) PROJECT(ECLIDE) diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 00000000..8e00d4a8 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,90 @@ +{ + "version": 4, + "cmakeMinimumRequired": { + "major": 3, + "minor": 23, + "patch": 0 + }, + "configurePresets": [ + { + "name": "vcpkg", + "displayName": "vcpkg ", + "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake", + "binaryDir": "${sourceDir}/build", + "installDir": "${sourceDir}/build/stage", + "cacheVariables": { + "VCPKG_INSTALLED_DIR": "${sourceDir}/build/vcpkg_installed", + "VCPKG_INSTALL_OPTIONS": "--downloads-root=${sourceDir}/build/vcpkg_downloads;--x-buildtrees-root=${sourceDir}/build/vcpkg_buildtrees;--x-packages-root=${sourceDir}/build/vcpkg_packages" + }, + "hidden": true + }, + { + "name": "Ninja", + "generator": "Ninja", + "architecture": { + "strategy": "external", + "value": "x86" + }, + "hidden": true + }, + { + "name": "VS-16", + "generator": "Visual Studio 16 2019", + "architecture": { + "strategy": "set", + "value": "Win32" + }, + "hidden": true + }, + { + "name": "VS-17", + "generator": "Visual Studio 17 2022", + "architecture": { + "strategy": "set", + "value": "Win32" + }, + "hidden": true + }, + { + "name": "vcpkg-Ninja", + "inherits": [ + "vcpkg", + "Ninja" + ] + }, + { + "name": "vcpkg-VS-16", + "inherits": [ + "vcpkg", + "VS-16" + ] + }, + { + "name": "vcpkg-VS-17", + "inherits": [ + "vcpkg", + "VS-17" + ] + } + ], + "buildPresets": [ + { + "name": "VS-16-Debug", + "configurePreset": "vcpkg-VS-16", + "configuration": "Debug", + "nativeToolOptions": ["-m"] + }, + { + "name": "VS-17-Debug", + "configurePreset": "vcpkg-VS-17", + "configuration": "Debug", + "nativeToolOptions": ["-m"] + }, + { + "name": "VS-17-RelWithDebInfo", + "configurePreset": "vcpkg-VS-17", + "configuration": "RelWithDebInfo", + "nativeToolOptions": ["-m"] + } + ] +} \ No newline at end of file diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json new file mode 100644 index 00000000..0162baaa --- /dev/null +++ b/vcpkg-configuration.json @@ -0,0 +1,15 @@ +{ + "default-registry": { + "kind": "builtin", + "baseline": "0d7603c4efc351da97b43c1952ba943e76f9b35f" + }, + "registries": [], + "overlay-ports": [ + "./vcpkg_overlays", + "./vcpkg/overlays" + ], + "overlay-triplets": [ + "./vcpkg_overlays", + "./vcpkg/overlays" + ] +} \ No newline at end of file diff --git a/vcpkg.json b/vcpkg.json index 989fb62c..557afd70 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", - "name": "hpcc-platform", - "version": "8.12.0", + "name": "eclide", + "version": "9.4", "dependencies": [ { "name": "boost-crc", @@ -71,7 +71,9 @@ "name": "bugtrap", "version>=": "1.4.9" }, - "webview2" - ], - "builtin-baseline": "0d7603c4efc351da97b43c1952ba943e76f9b35f" + { + "name":"webview2", + "version>=": "1.0.1210.39#1" + } + ] } \ No newline at end of file From 6403d8be9ed8f640d9e9668f792f9700b2d2967a Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Mon, 12 Feb 2024 15:48:10 +0000 Subject: [PATCH 26/34] Split off 8.12.92 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index de3fc8c7..8d716b3a 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 91 ) +set ( HPCC_POINT 93 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 3115213058a5aebf8d29f107f234434d82686ef5 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Mon, 12 Feb 2024 15:49:53 +0000 Subject: [PATCH 27/34] Split off 9.0.82 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index a11f7a94..d7cf62ac 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 81 ) +set ( HPCC_POINT 83 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 6c52521fd0a8ccff8075c2146f4536e083ff5021 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Mon, 12 Feb 2024 15:57:41 +0000 Subject: [PATCH 28/34] Split off 9.2.60 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 0c2c859f..3b6e0381 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 59 ) +set ( HPCC_POINT 61 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From efed50c007d33a64de0db6b3e282d32c80754e5c Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 15 Feb 2024 16:50:23 +0000 Subject: [PATCH 29/34] Split off 8.12.94 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 8d716b3a..13128bea 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 93 ) +set ( HPCC_POINT 95 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From f7fd4b90516c4678c649e000d4fe4d948da2b85c Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 15 Feb 2024 16:51:40 +0000 Subject: [PATCH 30/34] Split off 9.0.84 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index d7cf62ac..c7032f5b 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 0 ) -set ( HPCC_POINT 83 ) +set ( HPCC_POINT 85 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 86f057278c0cb3476fafb30befeae5542677e589 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 15 Feb 2024 16:52:57 +0000 Subject: [PATCH 31/34] Split off 9.2.62 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index 3b6e0381..8a4a5f85 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 2 ) -set ( HPCC_POINT 61 ) +set ( HPCC_POINT 63 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From bb0d32e00d1a9d4b9236678958de3f299e0cfdb4 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 15 Feb 2024 16:54:32 +0000 Subject: [PATCH 32/34] Split off 9.4.36 Signed-off-by: Gordon Smith --- version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cmake b/version.cmake index aa933e05..d507f0a6 100644 --- a/version.cmake +++ b/version.cmake @@ -6,7 +6,7 @@ set ( HPCC_PROJECT "eclide" ) set ( HPCC_AUDIENCE "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 4 ) -set ( HPCC_POINT 35 ) +set ( HPCC_POINT 37 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 98b5fc190852925f4b202a74981359959d4389e3 Mon Sep 17 00:00:00 2001 From: David de Hilster Date: Thu, 15 Feb 2024 11:53:30 -0500 Subject: [PATCH 33/34] IDE-1126 Open ECL in workunit context menu failing for GenData Signed-off-by: David de Hilster --- comms/Dali.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/comms/Dali.cpp b/comms/Dali.cpp index 4b73763b..71ac5a9b 100644 --- a/comms/Dali.cpp +++ b/comms/Dali.cpp @@ -1085,6 +1085,7 @@ class CDali : public IDali, public CUnknown request.IncludeTimers = true; request.IncludeVariables = false; request.IncludeWorkflows = false; + request.TruncateEclTo64k = false; request.SuppressResultSchemas = false; _ns6__WUInfoResponse response; From f0cb2652c42ad555702ac373d2a6bd045b75bd73 Mon Sep 17 00:00:00 2001 From: David de Hilster Date: Fri, 16 Feb 2024 11:37:23 -0500 Subject: [PATCH 34/34] IDE-1132 Unprotect menu item in WU context menu not working Signed-off-by: David de Hilster --- comms/Dali.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/comms/Dali.cpp b/comms/Dali.cpp index 71ac5a9b..71e238eb 100644 --- a/comms/Dali.cpp +++ b/comms/Dali.cpp @@ -321,6 +321,7 @@ bool ProtectWorkunits(const CString & url, IWorkunitVector *workunits, bool prot _ns6__WUProtect request; ns6__EspStringArray espStringArray; request.Wuids = &espStringArray; + request.Protect = protect; for (unsigned i = 0; i < workunits->size(); ++i) espStringArray.Item.push_back(stringPool.Create((*workunits)[i]->GetWuid()));