Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 May 2020 09:00:47 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r537134 - in head: . Mk/Uses
Message-ID:  <202005310900.04V90lHS000197@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sun May 31 09:00:47 2020
New Revision: 537134
URL: https://svnweb.freebsd.org/changeset/ports/537134

Log:
  Add support for test-only dependencies in pyqt.mk
  
  Allow ports to only depend on a component of PyQt for testing.
  
  USES=pyqt:5
  USE_PYQT=webengine_test
  
  will add a TEST_DEPENDS on www/py-qt5-webengine
  
  Approved by:	portmgr (mat)
  Differential Revision:	https://reviews.freebsd.org/D23241

Modified:
  head/CHANGES
  head/Mk/Uses/pyqt.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Sun May 31 08:58:31 2020	(r537133)
+++ head/CHANGES	Sun May 31 09:00:47 2020	(r537134)
@@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20200531:
+AUTHOR: kde@FreeBSD.org
+
+  pyqt.mk gained support for test-only dependencies. If a component, say
+  py-qt5-gui is only required for testing, you can add
+
+    USE_PYQT=<other_deps> gui_test
+
 20200514:
 AUTHOR: mat@FreeBSD.org
 

Modified: head/Mk/Uses/pyqt.mk
==============================================================================
--- head/Mk/Uses/pyqt.mk	Sun May 31 08:58:31 2020	(r537133)
+++ head/Mk/Uses/pyqt.mk	Sun May 31 09:00:47 2020	(r537134)
@@ -15,6 +15,7 @@
 # USE_PYQT	- List of PyQt components to depend on
 #		* foo_build    only build depend
 #		* foo_run      only run depend
+#		* foo_test     only test depend
 #		* foo          both (default)
 # PYQT_SIPDIR	- where sip files will be installed to
 # PYQT_APIDIR	- where api files will be installed to
@@ -280,15 +281,17 @@ do-configure:
 .endif  # !target(do-configure)
 .endif  # defined(PYQT_DIST)
 
-# Set build and run depends -- we need to prefix them internally with "py-"
+# Set build, run and test depends -- we need to prefix them internally with "py-"
 # else we conflict with the ones defined in bsd.qt.mk with the same name
 _USE_PYQT_ALL+=			${_USE_PYQT${_PYQT_VERSION}_ONLY}
 .for comp in ${_USE_PYQT_ALL:O:u}
-_USE_PYQT_ALL_SUFFIXED+=		py-${comp} py-${comp}_build py-${comp}_run
+_USE_PYQT_ALL_SUFFIXED+=		py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test
 py-${comp}_BUILD_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
 py-${comp}_RUN_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
+py-${comp}_TEST_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
 py-${comp}_build_BUILD_DEPENDS?=	${py-${comp}_BUILD_DEPENDS}
 py-${comp}_run_RUN_DEPENDS?=		${py-${comp}_RUN_DEPENDS}
+py-${comp}_test_TEST_DEPENDS?=		${py-${comp}_TEST_DEPENDS}
 .endfor
 
 _USE_PYQT=      ${USE_PYQT:O:u}
@@ -296,6 +299,7 @@ _USE_PYQT=      ${USE_PYQT:O:u}
 .  if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
 BUILD_DEPENDS+=		${py-${comp}_BUILD_DEPENDS}
 RUN_DEPENDS+=		${py-${comp}_RUN_DEPENDS}
+TEST_DEPENDS+=		${py-${comp}_TEST_DEPENDS}
 .  else
 IGNORE?=	cannot be installed: unknown USE_PYQT component ${comp} #'
 .  endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005310900.04V90lHS000197>