public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: dotnet@gentoo.org, "Maciej Barć" <xgqt@gentoo.org>
Subject: [gentoo-dev] [PATCH 4/7] eclass/dotnet-pkg*: add dotnet-pkg_remove-bad
Date: Sat,  3 Feb 2024 17:24:15 +0100	[thread overview]
Message-ID: <20240203162422.91906-4-xgqt@gentoo.org> (raw)
In-Reply-To: <20240203162422.91906-1-xgqt@gentoo.org>

Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
 eclass/dotnet-pkg-base.eclass | 15 +++++++++++++
 eclass/dotnet-pkg.eclass      | 42 +++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/eclass/dotnet-pkg-base.eclass b/eclass/dotnet-pkg-base.eclass
index 94cb8c0e0..e4b275f81 100644
--- a/eclass/dotnet-pkg-base.eclass
+++ b/eclass/dotnet-pkg-base.eclass
@@ -310,6 +310,21 @@ dotnet-pkg-base_info() {
 	fi
 }
 
+# @FUNCTION: dotnet-pkg-base_sln-remove
+# @USAGE: <solution> <project>
+# @DESCRIPTION:
+# Remove a project from a given solution file.
+#
+# Used by "dotnet-pkg_remove-bad" from the "dotnet-pkg" eclass.
+dotnet-pkg-base_sln-remove() {
+	debug-print-function "${FUNCNAME[0]}" "${@}"
+
+	[[ -z ${1} ]] && die "${FUNCNAME[0]}: no solution file specified"
+	[[ -z ${2} ]] && die "${FUNCNAME[0]}: no project file specified"
+
+	edotnet sln "${1}" remove "${2}"
+}
+
 # @FUNCTION: dotnet-pkg-base_foreach-solution
 # @USAGE: <directory> <args> ...
 # @DESCRIPTION:
diff --git a/eclass/dotnet-pkg.eclass b/eclass/dotnet-pkg.eclass
index 9d78f463b..94f5c5a28 100644
--- a/eclass/dotnet-pkg.eclass
+++ b/eclass/dotnet-pkg.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: dotnet-pkg.eclass
@@ -48,6 +48,24 @@ inherit dotnet-pkg-base
 RDEPEND+=" ${DOTNET_PKG_RDEPS} "
 BDEPEND+=" ${DOTNET_PKG_BDEPS} "
 
+# @ECLASS_VARIABLE: DOTNET_PKG_BAD_PROJECTS
+# @DESCRIPTION:
+# List of projects to remove from all found solution (".sln") files.
+# The projects are removed in the "dotnet-pkg_src_prepare" function.
+#
+# This variable should be set after inheriting "dotnet-pkg.eclass".
+#
+# Default value is an empty array.
+#
+# Example:
+# @CODE
+# DOTNET_PKG_BAD_PROJECTS=( "${S}/BrokenTests" )
+# DOTNET_PKG_PROJECTS=( "${S}/DotnetProject" )
+# @CODE
+#
+# For more info see: "dotnet-pkg_remove-bad" function.
+DOTNET_PKG_BAD_PROJECTS=()
+
 # @ECLASS_VARIABLE: DOTNET_PKG_PROJECTS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -161,14 +179,34 @@ dotnet-pkg_src_unpack() {
 	nuget_unpack-non-nuget-archives
 }
 
+# @FUNCTION: dotnet-pkg_remove-bad
+# @USAGE: <solution>
+# @DESCRIPTION:
+# Remove all projects specified by "DOTNET_PKG_BAD_PROJECTS" from a given
+# solution file.
+#
+# Used by "dotnet-pkg_src_prepare".
+dotnet-pkg_remove-bad() {
+	debug-print-function "${FUNCNAME[0]}" "${@}"
+
+	[[ -z ${1} ]] && die "${FUNCNAME[0]}: no solution file specified"
+
+	local bad_project
+	for bad_project in "${DOTNET_PKG_BAD_PROJECTS[@]}" ; do
+		nonfatal dotnet-pkg-base_sln-remove "${1}" "${bad_project}"
+	done
+}
+
 # @FUNCTION: dotnet-pkg_src_prepare
 # @DESCRIPTION:
 # Default "src_prepare" for the "dotnet-pkg" eclass.
 # Prepare the package sources.
 #
-# Run "dotnet-pkg-base_remove-global-json".
+# Run "dotnet-pkg-base_remove-global-json"
+# and "dotnet-pkg-base_remove-bad" for each found solution file.
 dotnet-pkg_src_prepare() {
 	dotnet-pkg-base_remove-global-json
+	dotnet-pkg-base_foreach-solution "$(pwd)" dotnet-pkg_remove-bad
 
 	default
 }
-- 
2.43.0



  parent reply	other threads:[~2024-02-03 16:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-03 16:24 [gentoo-dev] [PATCH 1/7] eclass/dotnet-pkg-base.eclass: quotes and style tweaks for edge cases Maciej Barć
2024-02-03 16:24 ` [gentoo-dev] [PATCH 2/7] eclass/dotnet-pkg-base.eclass: deprecate wring-style names Maciej Barć
2024-02-03 16:53   ` Ulrich Mueller
2024-02-03 17:09     ` Maciej Barć
2024-02-03 16:24 ` [gentoo-dev] [PATCH 3/7] eclass/dotnet-pkg-base.eclass: dotnet-pkg-base_test - remove directory magic Maciej Barć
2024-02-03 16:24 ` Maciej Barć [this message]
2024-02-03 16:24 ` [gentoo-dev] [PATCH 5/7] eclass/dotnet-pkg.eclass: add dotnet-pkg_force-compat Maciej Barć
2024-02-03 16:55   ` Ulrich Mueller
2024-02-03 16:24 ` [gentoo-dev] [PATCH 6/7] eclass/dotnet-pkg-base.eclass: set DOTNET_ROOT Maciej Barć
2024-02-03 16:24 ` [gentoo-dev] [PATCH 7/7] eclass/dotnet-pkg.eclass: prepare for safely using Nuget Maciej Barć
2024-02-03 16:57   ` Ulrich Mueller
2024-02-03 17:07     ` Maciej Barć
2024-02-03 16:51 ` [gentoo-dev] [PATCH 1/7] eclass/dotnet-pkg-base.eclass: quotes and style tweaks for edge cases Ulrich Mueller
2024-02-08  7:02 ` Sam James
2024-02-08  8:36   ` Maciej Barć

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240203162422.91906-4-xgqt@gentoo.org \
    --to=xgqt@gentoo.org \
    --cc=dotnet@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox