From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 10:25:15 2024 Received: (at submit) by debbugs.gnu.org; 15 Apr 2024 14:25:15 +0000 Received: from localhost ([127.0.0.1]:37544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNGj-00073H-QT for submit@debbugs.gnu.org; Mon, 15 Apr 2024 10:25:15 -0400 Received: from lists.gnu.org ([2001:470:142::17]:57714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwNGc-00070p-0S for submit@debbugs.gnu.org; Mon, 15 Apr 2024 10:25:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwNGK-0002FH-Hk for guix-patches@gnu.org; Mon, 15 Apr 2024 10:24:48 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199] helo=lyrion.ch) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwNGH-0004tc-JE for guix-patches@gnu.org; Mon, 15 Apr 2024 10:24:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713191079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=2aeKX/KeAlh6GCQeB/j9qoS+3Pe6VRjBZcevcHgjwP4=; b=F160V81xwWgIKUjgRBwhCnK5LdwlWKwTlbf0Kh7SI+44ay+h2uvPwZiLYo1Utd9Enaj1bp SN0fqDqqfBu4PxnicuS1b6YwCxGf59ZCdhd+zbgDv2om3ASKyyRlKwcDhwvly1LpBtzBll fT8y5f0578cwoq18C939bPJ2mH33wpj9wN4IkenxYtTuOzVaQbzuR7tsoJVyYU3ZbHoQrX 33YJy6k5mWPMa7dYs7j8MVGI2QJ87X6rtHPPvuf6Mb6bkNoNhnr8x9jH2gkIXs72q5ITB4 VyehaO0CEVZibdKBfKD3IasTgyFtXE1U7t5UBk/k2ihWTjyzfatnZkKuTA1QZg== Received: from localhost ( [2a00:1f:99c0:3c01:8fc9:e8ec:45e0:6cde]) by lyrion.ch (OpenSMTPD) with ESMTPSA id e07c2790 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Apr 2024 14:24:39 +0000 (UTC) Message-ID: <922b1372b2b1e8b1ea642fe85d33e9fd@lyrion.ch> From: Daniel Ziltener Date: Mon, 15 Apr 2024 16:23:09 +0200 Subject: [PATCH] gnu: cppdap: Add cppdap to debug.scm. To: guix-patches@gnu.org Received-SPF: pass client-ip=195.15.241.199; envelope-from=dziltener@lyrion.ch; helo=lyrion.ch X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: dziltener@lyrion.ch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --- gnu/packages/debug.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 6d4567acc4..7865dc32f4 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -185,6 +185,37 @@ (define-public c-reduce tools that process C/C++ code.") (license license:ncsa))) +(define-public cppdap + (package + (name "cppdap") + (version "1.58.0-a") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/google/cppdap") + (commit (string-append "dap-" version)))) + (sha256 + (base32 + "0fq2w35fw1lb5wya1nny45pk3a13b689k48calk1cmqmqpbcjn2b")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON") + #:phases #~(modify-phases %standard-phases + (delete 'check)))) + (propagated-inputs + (list nlohmann-json)) + (home-page "https://github.com/google/cppdap") + (synopsis "C++ library for the Debug Adapter Protocol") + (description + "cppdap is a C++11 library (\"SDK\") implementation of the Debug Adapter Protocol, +providing an API for implementing a DAP client or server. +cppdap provides C++ type-safe structures for the full DAP specification, and provides + a simple way to add custom protocol messages.") + (license license:expat))) + (define-public c-vise (package (name "c-vise") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 12:27:15 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 16:27:16 +0000 Received: from localhost ([127.0.0.1]:38203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwPAm-0000fR-Ju for submit@debbugs.gnu.org; Mon, 15 Apr 2024 12:27:15 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:58798 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwPAg-0000cc-7l for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 12:27:10 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-03 (Coremail) with SMTP id rQCowACHqiw+VR1mgQOuAw--.13064S2; Tue, 16 Apr 2024 00:26:39 +0800 (CST) From: Zheng Junjie To: 70397@debbugs.gnu.org Subject: [PATCH] gnu: Add cppdap. Date: Tue, 16 Apr 2024 00:26:36 +0800 Message-ID: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowACHqiw+VR1mgQOuAw--.13064S2 X-Coremail-Antispam: 1UD129KBjvJXoW3JF4rGr4ftF15Ar4UCry3urg_yoW3tr1Upr 4fGF1Yvw48GFyfXrs7A3Z2gry3W3ykGr1xJ3y7Gr4Syr15CrWUGrWIya15ArsrGwn5uw17 Gw15K3WkWw4DK3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyqb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr 0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48J MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4 v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AK xVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUcDDGUUUUU X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70397 Cc: Daniel Ziltener X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Daniel Ziltener * gnu/packages/debug.scm (cppdap): New variable. * gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Signed-off-by: Zheng Junjie Change-Id: I328ca0c01787defcc9d18f4ccd7762c86412cca7 --- gnu/local.mk | 1 + gnu/packages/debug.scm | 50 +++++++++ ...dd-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch | 101 ++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch diff --git a/gnu/local.mk b/gnu/local.mk index 64efee901f..a8cc5de803 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ + %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 6d4567acc4..7a7eafddab 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -46,6 +46,7 @@ (define-module (gnu packages debug) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages c) + #:use-module (gnu packages cpp) #:use-module (gnu packages check) #:use-module (gnu packages code) #:use-module (gnu packages compression) @@ -185,6 +186,55 @@ (define-public c-reduce tools that process C/C++ code.") (license license:ncsa))) +(define-public cppdap + (package + (name "cppdap") + (version "1.58.0-a") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/google/cppdap") + (commit (string-append "dap-" version)))) + (modules '((guix build utils))) + (snippet + '(delete-file-recursively "third_party")) + (patches (search-patches + "cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch")) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fq2w35fw1lb5wya1nny45pk3a13b689k48calk1cmqmqpbcjn2b")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list + "-DCPPDAP_BUILD_TESTS=ON" + "-DCPPDAP_USE_EXTERNAL_GTEST_PACKAGE=ON" + ;; Only one of the following three can be enabled at the same time + ;; "-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=ON" + ;; "-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=ON" + "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON"))) + (native-inputs + (list googletest)) + ;; see lib/cmake/cppdap/cppdapConfig.cmake + (propagated-inputs + (list + ;; Only one of the following three can be enabled at the same time + ;; rapidjson + ;; jsoncpp + nlohmann-json)) + (home-page "https://github.com/google/cppdap") + (synopsis "C++ library for the Debug Adapter Protocol") + (description + "cppdap is a C++11 library (\"SDK\") implementation of the Debug Adapter +Protocol, providing an API for implementing a DAP client or server. cppdap +provides C++ type-safe structures for the full DAP specification, and provides a +simple way to add custom protocol messages.") + (license license:expat))) + (define-public c-vise (package (name "c-vise") diff --git a/gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch b/gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch new file mode 100644 index 0000000000..62df0634ce --- /dev/null +++ b/gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch @@ -0,0 +1,101 @@ +From 40d9eaf3b6eca2ab8d5558e8935d56a75bd97183 Mon Sep 17 00:00:00 2001 +From: topazus +Date: Wed, 27 Dec 2023 19:56:49 +0800 +Subject: [PATCH] CMake: add CPPDAP_USE_EXTERNAL_GTEST_PACKAGE option + +--- + CMakeLists.txt | 35 +++++++++++++++++++++++++---------- + 1 file changed, 25 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b3c321..7292f3c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,6 +40,7 @@ option_if_not_defined(CPPDAP_INSTALL_VSCODE_EXAMPLES "Build and install dap exam + option_if_not_defined(CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE "Use nlohmann_json with find_package() instead of building internal submodule" OFF) + option_if_not_defined(CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE "Use RapidJSON with find_package()" OFF) + option_if_not_defined(CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE "Use JsonCpp with find_package()" OFF) ++option_if_not_defined(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE "Use googletest with find_package()" OFF) + + ########################################################### + # Directories +@@ -59,7 +60,7 @@ set_if_not_defined(CPPDAP_GOOGLETEST_DIR ${CPPDAP_THIRD_PARTY_DIR}/googletest) + ########################################################### + # Submodules + ########################################################### +-if(CPPDAP_BUILD_TESTS) ++if(CPPDAP_BUILD_TESTS AND NOT CPPDAP_USE_EXTERNAL_GTEST_PACKAGE) + if(NOT EXISTS ${CPPDAP_GOOGLETEST_DIR}/.git) + message(WARNING "third_party/googletest submodule missing.") + message(WARNING "Run: `git submodule update --init` to build tests.") +@@ -161,7 +162,7 @@ function(cppdap_set_json_links target) + target_link_libraries(${target} PRIVATE JsonCpp::JsonCpp) + else() + target_include_directories(${target} PRIVATE "${CPPDAP_JSON_DIR}/include/") +- endif() ++ endif() + endfunction(cppdap_set_json_links) + + function(cppdap_set_target_options target) +@@ -247,7 +248,7 @@ write_basic_package_version_file( + ) + configure_package_config_file( + ${CPPDAP_CMAKE_CONFIG_TEMPLATE} +- "${CPPDAP_CMAKE_PROJECT_CONFIG_FILE}" ++ "${CPPDAP_CMAKE_PROJECT_CONFIG_FILE}" + INSTALL_DESTINATION ${CPPDAP_CONFIG_INSTALL_DIR} + ) + +@@ -276,6 +277,8 @@ DESTINATION ${CPPDAP_CONFIG_INSTALL_DIR}) + + # tests + if(CPPDAP_BUILD_TESTS) ++ enable_testing() ++ + set(DAP_TEST_LIST + ${CPPDAP_SRC_DIR}/any_test.cpp + ${CPPDAP_SRC_DIR}/chan_test.cpp +@@ -290,16 +293,24 @@ if(CPPDAP_BUILD_TESTS) + ${CPPDAP_SRC_DIR}/traits_test.cpp + ${CPPDAP_SRC_DIR}/typeinfo_test.cpp + ${CPPDAP_SRC_DIR}/variant_test.cpp +- ${CPPDAP_GOOGLETEST_DIR}/googletest/src/gtest-all.cc + ) + +- set(DAP_TEST_INCLUDE_DIR +- ${CPPDAP_GOOGLETEST_DIR}/googlemock/include/ +- ${CPPDAP_GOOGLETEST_DIR}/googletest/ +- ${CPPDAP_GOOGLETEST_DIR}/googletest/include/ +- ) ++ if(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE) ++ find_package(GTest REQUIRED) ++ else() ++ list(APPEND DAP_TEST_LIST ++ ${CPPDAP_GOOGLETEST_DIR}/googletest/src/gtest-all.cc ++ ) ++ ++ set(DAP_TEST_INCLUDE_DIR ++ ${CPPDAP_GOOGLETEST_DIR}/googlemock/include/ ++ ${CPPDAP_GOOGLETEST_DIR}/googletest/ ++ ${CPPDAP_GOOGLETEST_DIR}/googletest/include/ ++ ) ++ endif() + + add_executable(cppdap-unittests ${DAP_TEST_LIST}) ++ add_test(NAME cppdap-unittests COMMAND cppdap-unittests) + + target_include_directories(cppdap-unittests PUBLIC ${DAP_TEST_INCLUDE_DIR} ) + set_target_properties(cppdap-unittests PROPERTIES +@@ -312,7 +323,11 @@ if(CPPDAP_BUILD_TESTS) + endif() + + cppdap_set_target_options(cppdap-unittests) +- target_link_libraries(cppdap-unittests PRIVATE cppdap) ++ if(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE) ++ target_link_libraries(cppdap-unittests PRIVATE cppdap GTest::gtest) ++ else() ++ target_link_libraries(cppdap-unittests PRIVATE cppdap) ++ endif() + endif(CPPDAP_BUILD_TESTS) + + # fuzzer base-commit: a8353e9d6b34fd8d42d2e8f14ce844849fe9c293 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 12:43:17 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 16:43:18 +0000 Received: from localhost ([127.0.0.1]:38276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwPQG-0002n8-Q5 for submit@debbugs.gnu.org; Mon, 15 Apr 2024 12:43:17 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:60602 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwPQ5-0002k2-PC for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 12:43:09 -0400 Received: from m (unknown [111.0.51.68]) by APP-03 (Coremail) with SMTP id rQCowABXdyT8WB1mdKiuAw--.34115S2; Tue, 16 Apr 2024 00:42:38 +0800 (CST) From: Zheng Junjie To: Daniel Ziltener , 70397@debbugs.gnu.org Subject: Re: [bug#70397] [PATCH] gnu: cppdap: Add cppdap to debug.scm. In-Reply-To: <922b1372b2b1e8b1ea642fe85d33e9fd@lyrion.ch> (Daniel Ziltener via Guix-patches via's message of "Mon, 15 Apr 2024 16:23:09 +0200") References: <922b1372b2b1e8b1ea642fe85d33e9fd@lyrion.ch> User-Agent: mu4e 1.12.2; emacs 30.0.50 Date: Tue, 16 Apr 2024 00:42:33 +0800 Message-ID: <878r1e60hy.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowABXdyT8WB1mdKiuAw--.34115S2 X-Coremail-Antispam: 1UD129KBjvJXoW7KFyfXw4xtr1fZF4DJF4UCFg_yoW8KFyDpw 4rGF4Ykw1rG347Jws3u3WIgr15W395Gry5X3y2kw18CF45ZFWkJrWIkFZIqrsrZr1fAa17 WayS93WkWF4DCFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487M2AExVA0 xI801c8C04v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGw Av7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxAI w28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr 4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0EwIxG rwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8Jw CI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2 z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUgg_TUUUUU X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70397 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable hellow, i review this patch, and have some comment Daniel Ziltener via Guix-patches via writes: > --- > gnu/packages/debug.scm | 31 +++++++++++++++++++++++++++++++ Usually our message goes something like this: gnu: Add cppdap. * gnu/packages/debug.scm (cppdap): New variable. > 1 file changed, 31 insertions(+) > > diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm > index 6d4567acc4..7865dc32f4 100644 > --- a/gnu/packages/debug.scm > +++ b/gnu/packages/debug.scm > @@ -185,6 +185,37 @@ (define-public c-reduce > tools that process C/C++ code.") > (license license:ncsa))) >=20=20 > +(define-public cppdap > + (package > + (name "cppdap") > + (version "1.58.0-a") > + (source > + (origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://github.com/google/cppdap") > + (commit (string-append "dap-" version)))) usually we add (file-name (git-file-name name version)),=20 and it have a "third_party" directory, we need remove it. and see https://github.com/google/cppdap/pull/124 , it add a CPPDAP_USE_EXTERNAL_GTEST_PACKAGE option to use system gtest. so we can pick it. > + (sha256 > + (base32 > + "0fq2w35fw1lb5wya1nny45pk3a13b689k48calk1cmqmqpbcjn2b")))) > + (build-system cmake-build-system) > + (arguments > + (list > + #:configure-flags #~(list "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PAC= KAGE=3DON") > + #:phases #~(modify-phases %standard-phases > + (delete 'check)))) if no test target, please use "#:tests? #f" and add commit about it. and it have CPPDAP_BUILD_TESTS, so we can enable it. > + (propagated-inputs > + (list nlohmann-json)) need add some commit about why propagate nlohmann-json. and need add (gnu packages cpp) module. > + (home-page "https://github.com/google/cppdap") > + (synopsis "C++ library for the Debug Adapter Protocol") > + (description > + "cppdap is a C++11 library (\"SDK\") implementation of the Debug Ad= apter Protocol, > +providing an API for implementing a DAP client or server. > +cppdap provides C++ type-safe structures for the full DAP specification,= and provides > + a simple way to add custom protocol messages.") It's a little over the line count > + (license license:expat))) > + > (define-public c-vise > (package > (name "c-vise") The end result should be similar https://issues.guix.gnu.org/70397#1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYdWPkACgkQO1qpk+Gi 3/BBhg/+NKZ4aD8iMDYlg5rjLYLxLAuBLKu13J+UUsiJyZE3QIhnu17W7teuU0JR 1Zn14mOLPoILPZzBPQtSxrh2yK7CV/bTU/PnN7cPqY823/dAme+O3NMZQwLx532q aVe+rCS1u3X2x9SrjCp9TrpX2LjlS0CsDzEXAsQzR6d7PyY1z7AlJkACJWqvsOcc hDgZTC/LIQQLqcfCywSiqfKv4w0wTAKufnq8NLK4lYUnxeNnFLAoYxN3bgCfMbXM DRzwc94g2drbxWDoADkPZnmVINpxlZj1kfFIBGkByVIw8WfLVDBRaOsJNdyQdEKN mAOkT98ckQ+M8btH+rFl9NHzFiquNIc9uXw6ogK6gYoRDJz3JhCX6uRQ2aYLdhXC KSg7kbs1QdzsRMuJ7ZcmamQhGzXA0N+Y8D9mFWhd2mUglGUF+6iSPbCR9tjlFmID r4yfzupGqc5UBtDLqlCyVy9ee63arwIVS8FSkk8lrIinL/yL9Z1Zw61W3Onrr5EB hvjcvUMr2jCDf2jD6lFAkRfo8Hj4DUrJMedUyf+7yxi3f1fOLRQjluiB1Qw6vWH9 +QiWhY+krDQ/f87E59rRPB1mMsw7KtsVb0+O8MbtC90u2guB+40mqTZsETV9Ao6Q UDrMsaLzHrQAWQaW0hsjxHVB1M9IJ3+JknsyNH5YtxCVevgus9I= =TtwT -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 17:54:36 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 21:54:36 +0000 Received: from localhost ([127.0.0.1]:39799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUHa-0003Z4-Ou for submit@debbugs.gnu.org; Mon, 15 Apr 2024 17:54:36 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199]:35640 helo=lyrion.ch) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUHX-0003Xm-9c for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 17:54:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713218055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kdGfVz7L9pt7ed+cEtJr+XHj8L1fwK58ZDe/5Y9Biow=; b=u1HRBtYsAVonRmEK0yWhyHLg5jAHkU9y39IFWLRzjYZGehD6vr0c34F7gCcNPM/wRGYraJ QH2h85otE+aamKm0rnfMmYjNV5jkjvvjF2SU4x8vhT9KKnjCbFrUtBaagZULfPJHZEDh/Y cCQZWip1tUispxK4ITtZ+syXwqMj8DUM0hyqgtgYMrIs1DvvOSAzXoI2g4gbv5Om34LOH/ nAK0aLrFNWc2aev4Q4NSdcJQ27X2ZULi5olQ8PaCyFy6O6GFM8jeHvw5IKkpqrfWxKzYGU cla//KxSIOEpWoPfj/yPJOg3oqRQ8CVx4pPhJemDPgd5CQ2zHPk3QQ8jdYjcGQ== Received: from localhost ( [2a06:6880:42c:1600:23cf:27ad:e59d:8816]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 7a3e17ce (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Apr 2024 21:54:15 +0000 (UTC) From: Daniel Ziltener To: Zheng Junjie , 70397@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add cppdap. In-Reply-To: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> References: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> Date: Mon, 15 Apr 2024 23:54:14 +0200 Message-ID: <87a5lu9trt.fsf@lyrion.ch> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 70397 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) Thank you very much! As I understand and see it, you have fixed the commit for me, and there is nothing more to do for me? I will make a note to myself about the correct commit message format for the future. Best regards, Daniel From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 17:54:46 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 21:54:46 +0000 Received: from localhost ([127.0.0.1]:39803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUHl-0003b2-8A for submit@debbugs.gnu.org; Mon, 15 Apr 2024 17:54:46 -0400 Received: from [2001:1600:10:100::3c3] (port=25339 helo=lyrion.ch) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUHh-0003YG-Tf for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 17:54:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713218069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kdGfVz7L9pt7ed+cEtJr+XHj8L1fwK58ZDe/5Y9Biow=; b=aspXz4IwBbj/NITnzbBuBOQ4+VMVG0E2PlOApl//HfYWAlFPGONZTGBcinP3tSQ7kEJNhW kufikwHL5+mTGEVE2LP+e8aSg1OCoTKA4LahRnFaikklGsBHZxdw4VsuT6M7xrUM93ImY/ +uadOvZPPPpymeHBu0jUpkJP/Y270fD+SnjNIuueBH/T0qucWQbE3PqYm4f82A1DTot3P1 mcT7oSqSujfjcN6L+MlLHpNMqzAP+wurXGIbqFuiwIfvfPx/S5BxmTQE6u36WVttSw/oPM OEZktlg5WTJHOajeocvU+2xyEQapo31wwz6+AiE55FrdjgQkN/44BMgRrDBejw== Received: from localhost ( [2a06:6880:42c:1600:23cf:27ad:e59d:8816]) by lyrion.ch (OpenSMTPD) with ESMTPSA id cb27502f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Apr 2024 21:54:29 +0000 (UTC) From: Daniel Ziltener To: Zheng Junjie , 70397@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add cppdap. In-Reply-To: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> References: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> Date: Mon, 15 Apr 2024 23:54:28 +0200 Message-ID: <878r1e9trf.fsf@lyrion.ch> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Thank you very much! As I understand and see it, you have fixed the commit for me, and there is nothing more to do for me? I will make a note to myself about the correct commit message format for the [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Debbugs-Envelope-To: 70397 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Thank you very much! As I understand and see it, you have fixed the commit for me, and there is nothing more to do for me? I will make a note to myself about the correct commit message format for the future. Best regards, Daniel From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 17:57:20 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 21:57:20 +0000 Received: from localhost ([127.0.0.1]:39817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUKF-00041p-RP for submit@debbugs.gnu.org; Mon, 15 Apr 2024 17:57:20 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199]:58602 helo=lyrion.ch) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUKD-00041T-EH for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 17:57:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713218224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kdGfVz7L9pt7ed+cEtJr+XHj8L1fwK58ZDe/5Y9Biow=; b=C3Q5Vqjgiu8+D4EiWyhXlyDdkTpwygNoGmTtfXVgskfE/+ZdldUUslrM/D1Y2bJnoXRvnh n7o0WvcwfzHUr42cpn2swB4NBHsBVCT671T9H39ybjx53idqLbVoAt4HWTvW2qKbxgoUoB /jGWRf/G1ZIdTsPP2TdjTb7SoNiIGSb1B1GmmdlFSo1ITTBOOTurs4O+qIRq2YIT/ruUUs gvds+/bF4xNzEaKu3Ewi/HfAlmTR6my5GWW8GQvkZR/UMlG/1jZkykIrehlqM3G145iGBM oSHhUe+1+7d0FividIeew5yWTkW9SsEiIePKv1sDtVwEzVLsU4RQPNjd1zNTPw== Received: from localhost ( [2a06:6880:42c:1600:23cf:27ad:e59d:8816]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 48feab65 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Apr 2024 21:57:04 +0000 (UTC) From: Daniel Ziltener To: Zheng Junjie , 70397@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add cppdap. In-Reply-To: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> References: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> Date: Mon, 15 Apr 2024 23:57:03 +0200 Message-ID: <877cgy9tn4.fsf@lyrion.ch> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 70397 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) Thank you very much! As I understand and see it, you have fixed the commit for me, and there is nothing more to do for me? I will make a note to myself about the correct commit message format for the future. Best regards, Daniel From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 17:57:54 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 21:57:54 +0000 Received: from localhost ([127.0.0.1]:39822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUKn-000468-5P for submit@debbugs.gnu.org; Mon, 15 Apr 2024 17:57:54 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199]:13869 helo=lyrion.ch) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwUKj-00045a-Ky for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 17:57:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713218256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kdGfVz7L9pt7ed+cEtJr+XHj8L1fwK58ZDe/5Y9Biow=; b=IYaJ/mU9bWvEra+dFYUDYvNuWUtgrE8uu5AvCPfu3YF0PEmTr61aMlsHLGMeZ0H+Vs+tp9 qpIYexCUhfBnTwxmRqzjlbWe6qfS1BR+6s4tDjHarGZ4r8WWugj8cS0YX0tKcM2f+qBiOs U1q2PxEuqeMigwHuaNFPBkPvthySvHCLKSwnZLVB1S0AvG2v4rzuqzDSUYUoxWKSl718uT 9EimYRzV2wv3Xsrg09ALR+K1ATn6uVlhUZyvmMM4ZLuv2UHE9eIztPK/Cx0pFUZ8LIYP6x qlt1EGXSd8rmuGzGUM8pi3OROVsITz2qhJhmJsgNUTsq0GjvUN1336P2Ohh3xw== Received: from localhost ( [2a06:6880:42c:1600:23cf:27ad:e59d:8816]) by lyrion.ch (OpenSMTPD) with ESMTPSA id da09272d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Apr 2024 21:57:36 +0000 (UTC) From: Daniel Ziltener To: Zheng Junjie , 70397@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add cppdap. In-Reply-To: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> References: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> Date: Mon, 15 Apr 2024 23:57:36 +0200 Message-ID: <875xwi9tm7.fsf@lyrion.ch> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 70397 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) Thank you very much! As I understand and see it, you have fixed the commit for me, and there is nothing more to do for me? I will make a note to myself about the correct commit message format for the future. Best regards, Daniel From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 18:04:58 2024 Received: (at 70397) by debbugs.gnu.org; 15 Apr 2024 22:04:59 +0000 Received: from localhost ([127.0.0.1]:39868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwURd-0005C0-CI for submit@debbugs.gnu.org; Mon, 15 Apr 2024 18:04:58 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199]:39820 helo=lyrion.ch) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwURb-0005Bg-5c for 70397@debbugs.gnu.org; Mon, 15 Apr 2024 18:04:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1713218681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kdGfVz7L9pt7ed+cEtJr+XHj8L1fwK58ZDe/5Y9Biow=; b=ojWqCDHGyB+5gNlNeYL/2p+15Y69RL8wzCG/BtvP5hRwDZpdKuQPRm7DzsJ73atyWNLDLR Bp72IHJ2YcVlIJVvYZxQhKcIrXJHfTlJ3mQhCYdkS2PUekUH5qOTMZ+9ZKKHtim1SNf8Wx Z2xLxP5xNUy0ssugJU2ogJMZwaPfJv68EBGzgyHiXRDuUhH3t5y1OzZu0XgwVUuSPxNDE3 +R3MEoXcqOXVEawcpN5lE1RcNLmuCdAsQGPlaENduUt/rU7cdJnjuUrz7bN5Ahg0TL40cR k/eR8sB3fyfjYRKUWB0aNNz0FH23F/RKozBV9qYm+3ePkXTWDn7MwgH5TnnDTg== Received: from localhost ( [2a06:6880:42c:1600:23cf:27ad:e59d:8816]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 4448d694 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Apr 2024 22:04:41 +0000 (UTC) From: Daniel Ziltener To: Zheng Junjie , 70397@debbugs.gnu.org Subject: Re: [PATCH] gnu: Add cppdap. In-Reply-To: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> References: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> Date: Tue, 16 Apr 2024 00:04:40 +0200 Message-ID: <8734rm9taf.fsf@lyrion.ch> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 70397 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) Thank you very much! As I understand and see it, you have fixed the commit for me, and there is nothing more to do for me? I will make a note to myself about the correct commit message format for the future. Best regards, Daniel From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 23 04:58:40 2024 Received: (at 70397-done) by debbugs.gnu.org; 23 Apr 2024 08:58:40 +0000 Received: from localhost ([127.0.0.1]:50876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzBz0-0000mN-7L for submit@debbugs.gnu.org; Tue, 23 Apr 2024 04:58:39 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81]:51084 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzByt-0000jy-Gy for 70397-done@debbugs.gnu.org; Tue, 23 Apr 2024 04:58:32 -0400 Received: from m (unknown [183.247.5.102]) by APP-03 (Coremail) with SMTP id rQCowAAXOCUWeCdmyzxvBQ--.2841S2; Tue, 23 Apr 2024 16:57:58 +0800 (CST) From: Z572 To: 70397-done@debbugs.gnu.org Subject: Re: [bug#70397] [PATCH] gnu: Add cppdap. In-Reply-To: <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> (Zheng Junjie's message of "Tue, 16 Apr 2024 00:26:36 +0800") References: <922b1372b2b1e8b1ea642fe85d33e9fd@lyrion.ch> <5e9db8a53c3f429461c4e6012bbf09a948765e6f.1713198396.git.zhengjunjie@iscas.ac.cn> User-Agent: mu4e 1.12.2; emacs 30.0.50 Date: Tue, 23 Apr 2024 16:57:58 +0800 Message-ID: <8734rcjw15.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAAXOCUWeCdmyzxvBQ--.2841S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Jry8ur15AF4ruryfXr1rtFb_yoWfGF15pr WfJF4Yvw48GFyrXrs7J3ZFqry3W395Gr1xZ3y7Gr1Iyr43CrWUJrWIka15ArsrGw1rXw17 G3WYkan5uw4Dt37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk0b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21le4C267I2x7xF 54xIwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I 8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IY c2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s 026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF 0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0x vE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv 6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUgVHqDUUUU X-Originating-IP: [183.247.5.102] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70397-done Cc: Daniel Ziltener X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Zheng Junjie writes: > From: Daniel Ziltener > > * gnu/packages/debug.scm (cppdap): New variable. > * gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch= : New > patch. > * gnu/local.mk (dist_patch_DATA): Register it. > > Signed-off-by: Zheng Junjie > Change-Id: I328ca0c01787defcc9d18f4ccd7762c86412cca7 > --- > gnu/local.mk | 1 + > gnu/packages/debug.scm | 50 +++++++++ > ...dd-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch | 101 ++++++++++++++++++ > 3 files changed, 152 insertions(+) > create mode 100644 gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_G= TEST_PACKAGE.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 64efee901f..a8cc5de803 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1078,6 +1078,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/cool-retro-term-wctype.patch \ > %D%/packages/patches/coreutils-gnulib-tests.patch \ > %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ > + %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patc= h\ > %D%/packages/patches/cpuinfo-system-libraries.patch \ > %D%/packages/patches/cpulimit-with-glib-2.32.patch \ > %D%/packages/patches/crawl-upgrade-saves.patch \ > diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm > index 6d4567acc4..7a7eafddab 100644 > --- a/gnu/packages/debug.scm > +++ b/gnu/packages/debug.scm > @@ -46,6 +46,7 @@ (define-module (gnu packages debug) > #:use-module (gnu packages bash) > #:use-module (gnu packages bison) > #:use-module (gnu packages c) > + #:use-module (gnu packages cpp) > #:use-module (gnu packages check) > #:use-module (gnu packages code) > #:use-module (gnu packages compression) > @@ -185,6 +186,55 @@ (define-public c-reduce > tools that process C/C++ code.") > (license license:ncsa))) >=20=20 > +(define-public cppdap > + (package > + (name "cppdap") > + (version "1.58.0-a") > + (source > + (origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://github.com/google/cppdap") > + (commit (string-append "dap-" version)))) > + (modules '((guix build utils))) > + (snippet > + '(delete-file-recursively "third_party")) > + (patches (search-patches > + "cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch")) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0fq2w35fw1lb5wya1nny45pk3a13b689k48calk1cmqmqpbcjn2b")))) > + (build-system cmake-build-system) > + (arguments > + (list > + #:configure-flags > + #~(list > + "-DCPPDAP_BUILD_TESTS=3DON" > + "-DCPPDAP_USE_EXTERNAL_GTEST_PACKAGE=3DON" > + ;; Only one of the following three can be enabled at the same t= ime > + ;; "-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=3DON" > + ;; "-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=3DON" > + "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=3DON"))) > + (native-inputs > + (list googletest)) > + ;; see lib/cmake/cppdap/cppdapConfig.cmake > + (propagated-inputs > + (list > + ;; Only one of the following three can be enabled at the same time > + ;; rapidjson > + ;; jsoncpp > + nlohmann-json)) > + (home-page "https://github.com/google/cppdap") > + (synopsis "C++ library for the Debug Adapter Protocol") > + (description > + "cppdap is a C++11 library (\"SDK\") implementation of the Debug Ad= apter > +Protocol, providing an API for implementing a DAP client or server. cpp= dap > +provides C++ type-safe structures for the full DAP specification, and pr= ovides a > +simple way to add custom protocol messages.") > + (license license:expat))) > + > (define-public c-vise > (package > (name "c-vise") > diff --git a/gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PA= CKAGE.patch b/gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PAC= KAGE.patch > new file mode 100644 > index 0000000000..62df0634ce > --- /dev/null > +++ b/gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.p= atch > @@ -0,0 +1,101 @@ > +From 40d9eaf3b6eca2ab8d5558e8935d56a75bd97183 Mon Sep 17 00:00:00 2001 > +From: topazus > +Date: Wed, 27 Dec 2023 19:56:49 +0800 > +Subject: [PATCH] CMake: add CPPDAP_USE_EXTERNAL_GTEST_PACKAGE option > + > +--- > + CMakeLists.txt | 35 +++++++++++++++++++++++++---------- > + 1 file changed, 25 insertions(+), 10 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 1b3c321..7292f3c 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -40,6 +40,7 @@ option_if_not_defined(CPPDAP_INSTALL_VSCODE_EXAMPLES "= Build and install dap exam > + option_if_not_defined(CPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE "Use nl= ohmann_json with find_package() instead of building internal submodule" OFF) > + option_if_not_defined(CPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE "Use RapidJ= SON with find_package()" OFF) > + option_if_not_defined(CPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE "Use JsonCpp = with find_package()" OFF) > ++option_if_not_defined(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE "Use googletest= with find_package()" OFF) > +=20 > + ########################################################### > + # Directories > +@@ -59,7 +60,7 @@ set_if_not_defined(CPPDAP_GOOGLETEST_DIR ${CPPDAP_THI= RD_PARTY_DIR}/googletest) > + ########################################################### > + # Submodules > + ########################################################### > +-if(CPPDAP_BUILD_TESTS) > ++if(CPPDAP_BUILD_TESTS AND NOT CPPDAP_USE_EXTERNAL_GTEST_PACKAGE) > + if(NOT EXISTS ${CPPDAP_GOOGLETEST_DIR}/.git) > + message(WARNING "third_party/googletest submodule missing.") > + message(WARNING "Run: `git submodule update --init` to build te= sts.") > +@@ -161,7 +162,7 @@ function(cppdap_set_json_links target) > + target_link_libraries(${target} PRIVATE JsonCpp::JsonCpp) > + else() > + target_include_directories(${target} PRIVATE "${CPPDAP_JSON_DIR= }/include/") > +- endif()=20=20=20=20 > ++ endif() > + endfunction(cppdap_set_json_links) > +=20 > + function(cppdap_set_target_options target) > +@@ -247,7 +248,7 @@ write_basic_package_version_file( > + ) > + configure_package_config_file( > + ${CPPDAP_CMAKE_CONFIG_TEMPLATE} > +- "${CPPDAP_CMAKE_PROJECT_CONFIG_FILE}"=20 > ++ "${CPPDAP_CMAKE_PROJECT_CONFIG_FILE}" > + INSTALL_DESTINATION ${CPPDAP_CONFIG_INSTALL_DIR} > + ) > +=20 > +@@ -276,6 +277,8 @@ DESTINATION ${CPPDAP_CONFIG_INSTALL_DIR}) > +=20 > + # tests > + if(CPPDAP_BUILD_TESTS) > ++ enable_testing() > ++ > + set(DAP_TEST_LIST > + ${CPPDAP_SRC_DIR}/any_test.cpp > + ${CPPDAP_SRC_DIR}/chan_test.cpp > +@@ -290,16 +293,24 @@ if(CPPDAP_BUILD_TESTS) > + ${CPPDAP_SRC_DIR}/traits_test.cpp > + ${CPPDAP_SRC_DIR}/typeinfo_test.cpp > + ${CPPDAP_SRC_DIR}/variant_test.cpp > +- ${CPPDAP_GOOGLETEST_DIR}/googletest/src/gtest-all.cc > + ) > +=20 > +- set(DAP_TEST_INCLUDE_DIR > +- ${CPPDAP_GOOGLETEST_DIR}/googlemock/include/ > +- ${CPPDAP_GOOGLETEST_DIR}/googletest/ > +- ${CPPDAP_GOOGLETEST_DIR}/googletest/include/ > +- ) > ++ if(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE) > ++ find_package(GTest REQUIRED) > ++ else() > ++ list(APPEND DAP_TEST_LIST > ++ ${CPPDAP_GOOGLETEST_DIR}/googletest/src/gtest-all.cc > ++ ) > ++ > ++ set(DAP_TEST_INCLUDE_DIR > ++ ${CPPDAP_GOOGLETEST_DIR}/googlemock/include/ > ++ ${CPPDAP_GOOGLETEST_DIR}/googletest/ > ++ ${CPPDAP_GOOGLETEST_DIR}/googletest/include/ > ++ ) > ++ endif() > +=20 > + add_executable(cppdap-unittests ${DAP_TEST_LIST}) > ++ add_test(NAME cppdap-unittests COMMAND cppdap-unittests) > +=20 > + target_include_directories(cppdap-unittests PUBLIC ${DAP_TEST_INCLU= DE_DIR} ) > + set_target_properties(cppdap-unittests PROPERTIES > +@@ -312,7 +323,11 @@ if(CPPDAP_BUILD_TESTS) > + endif() > +=20 > + cppdap_set_target_options(cppdap-unittests) > +- target_link_libraries(cppdap-unittests PRIVATE cppdap) > ++ if(CPPDAP_USE_EXTERNAL_GTEST_PACKAGE) > ++ target_link_libraries(cppdap-unittests PRIVATE cppdap GTest::gt= est) > ++ else() > ++ target_link_libraries(cppdap-unittests PRIVATE cppdap) > ++ endif() > + endif(CPPDAP_BUILD_TESTS) > +=20 > + # fuzzer > > base-commit: a8353e9d6b34fd8d42d2e8f14ce844849fe9c293 push. see https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D2d19e505f= 6f9f82aebc9ba8c74ba223818acd9bc=20 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmYneBYACgkQO1qpk+Gi 3/DDYBAAg0Ury61nSLqnRdeH9+toRQOLr7WQ3IZQU3U5x7FH7iqf0X78tj7hew41 226XpTg7eNZZULepy9nx2XEHNEDDNK2yuiaKY1sA5UDiibgvxv6/jBWThLlh9YEs LxgUAJfE2E0SGUU0fUTL2z+6kEAW24LLsRRMydk789dD5/wONEe8TKmVLypmAano AYI9CKEuQ6hp2AdWhfWbnHYa8BrcSmLszWlp6BndemebYfFU4FbnL3A39+JZuxRO ZW8UctzAl0JHQRvJgyyBg6FiYnWhgmG473ZTCH8Bvw0dPe49o17M9182Br3XoTWl D2s7XBrolvwOElGNXh07kJ7qgt34io/IweqmFjbdOWww54k/VU8rfk8LzLKtEXQL e1PRzh6A0HJb7XK+QhLGREqJgKZ2B/Q8UEPoSV3FTs8DvIak2LFFZ8kN7+43cvON g8+k06smb3atRS1i/q3MIPSr+XSbwvJ7BexLxJKQlko1NIqiVQc6n6ULqZ2DcnWt yyRKdMKYEoDsXW7SUs2dI2gTongRGjOj1r+D0JxW5X3Iewwrov0hSGvzuy4DYagy lWJZKQYYBjUC3tZ4aII++AtbJ2PQaMnaRSxGjT+9V3dcxSwaQlsx4/AFL7cqEty1 GrdDkZvzqbGcpcyM0U6i847PBIJLdYDH89nOKp7ONt7316W+St8= =xq+y -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Aug 15 17:22:30 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 21 May 2024 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator