Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171352718957960"
MIME-Version: 1.0
Date: Fri, 19 Apr 2024 11:46:29 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/scons4
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240419114629.2C502FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171352718957960
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Fri Apr 19 11:46:29 UTC 2024

Modified Files:
	pkgsrc/devel/scons4: build.mk

Log Message:
scons4: Add support for BUILD_DIRS and friends.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/scons4/build.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171352718957960
Content-Disposition: inline
Content-Length: 1594
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/scons4/build.mk
diff -u pkgsrc/devel/scons4/build.mk:1.6 pkgsrc/devel/scons4/build.mk:1.7
--- pkgsrc/devel/scons4/build.mk:1.6	Thu Jul 27 10:16:39 2023
+++ pkgsrc/devel/scons4/build.mk	Fri Apr 19 11:46:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.6 2023/07/27 10:16:39 adam Exp $
+# $NetBSD: build.mk,v 1.7 2024/04/19 11:46:29 nia Exp $
 #
 # This Makefile fragment supports building using the SCons build tool.
 #
@@ -18,6 +18,11 @@
 #	Default: yes
 #
 
+CONFIGURE_DIRS?=	.
+BUILD_DIRS?=		${CONFIGURE_DIRS}
+INSTALL_DIRS?=		${CONFIGURE_DIRS}
+TEST_DIRS?=		${CONFIGURE_DIRS}
+
 PYTHON_FOR_BUILD_ONLY?=		tool
 # scons4 does not support Python 2
 PYTHON_VERSIONS_INCOMPATIBLE+=	27
@@ -42,16 +47,22 @@ _SCONS_TEST_ARGS+=	${SCONS_TEST_ARGS}
 
 do-build: scons-build
 scons-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${_SCONS_BUILD_ARGS}
+.for d in ${BUILD_DIRS}
+	cd ${WRKSRC} && cd ${d} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${_SCONS_BUILD_ARGS}
+.endfor
 
 do-test: scons-test
 scons-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${SCONSBIN} ${_SCONS_TEST_ARGS} check
+.for d in ${TEST_DIRS}
+	cd ${WRKSRC} && cd ${d} && ${SETENV} ${TEST_ENV} ${SCONSBIN} ${_SCONS_TEST_ARGS} check
+.endfor
 
 .if ${SCONS_DO_INSTALL} == "yes"
 do-install: scons-install
 scons-install:
-	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${SCONSBIN} ${_SCONS_INSTALL_ARGS} ${INSTALL_TARGET}
+.for d in ${INSTALL_DIRS}
+	cd ${WRKSRC} && cd ${d} && ${SETENV} ${INSTALL_ENV} ${SCONSBIN} ${_SCONS_INSTALL_ARGS} ${INSTALL_TARGET}
+.endfor
 .endif
 
 _VARGROUPS+=		scons


--_----------=_171352718957960--