From owner-svn-src-projects@freebsd.org Sat Aug 19 18:31:02 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E272DDB1F1 for ; Sat, 19 Aug 2017 18:31:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A8CE84E4F; Sat, 19 Aug 2017 18:31:02 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7JIV1IP060465; Sat, 19 Aug 2017 18:31:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7JIV0AR060462; Sat, 19 Aug 2017 18:31:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708191831.v7JIV0AR060462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 19 Aug 2017 18:31:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322698 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 322698 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2017 18:31:02 -0000 Author: ngie Date: Sat Aug 19 18:31:00 2017 New Revision: 322698 URL: https://svnweb.freebsd.org/changeset/base/322698 Log: Complete bsd.cov.mk integration Pass through appropriate objects via COV_OBJS in bsd.lib.mk (based on SOBJS), and appropriate objects via bsd.prog.mk (OBJS). While here, do more intelligent things in terms of iterating over COV_OBJS, building lists of items to install with the GCNOS variable/adding GCNOS to FILESGROUPS, etc. This reduces the 2 unrolled .for loops into 1. Modified: projects/runtime-coverage/share/mk/bsd.cov.mk projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Sat Aug 19 17:18:27 2017 (r322697) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Sat Aug 19 18:31:00 2017 (r322698) @@ -1,31 +1,22 @@ # $FreeBSD$ -.ifdef notyet .include FILESGROUPS?= FILES -_GCNOGROUPS= -.for _obj in ${OBJS} -# XXX (ngie): this is pretty hamfisted -.if !empty(SRCS:T:M${obj:.o=.asm}) || !empty(SRCS:T:M${obj:.o=.s}) -_gcno= ${_obj:.o=.gcno} -_gcno_prefix= ${_gcno:H:tA} -_gcno_dir= ${COVERAGEDIR}${_gcno_prefix} +GCNOS= ${COV_OBJS:.o=.gcno} -_GCNO_GROUPS+= ${_gcno_prefix} -CLEANFILES+= ${_gcno} -${_gcno_prefix}+= ${_gcno} -${_gcno_prefix}DIR= ${_gcno_dir} -${_gcno}: ${_obj} -.endif -.endfor +.if !empty(GCNOS) +FILESGROUPS+= GCNOS +CLEANFILES+= ${GCNOS} -_GCNO_GROUPS:= ${_GCNO_GROUPS:O:u} -FILESGROUPS+= ${_GCNO_GROUPS} -.for _gcno_group in ${_GCNO_GROUPS} -beforeinstall: ${DESTDIR}${${_gcno_group}DIR} -${DESTDIR}${${_gcno_group}DIR}: +.for _gcno in ${GCNOS} +_gcno_dir= ${COVERAGEDIR}${_gcno:H:tA} +GCNOS_${_gcno:T}DIR= ${_gcno_dir} +.if !target(${DESTDIR}${_gcno_dir}) +beforeinstall: ${DESTDIR}${_gcno_dir} +${DESTDIR}${_gcno_dir}: ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${.TARGET} +.endif .endfor .endif Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sat Aug 19 17:18:27 2017 (r322697) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sat Aug 19 18:31:00 2017 (r322698) @@ -453,6 +453,7 @@ _libinstall: .if !defined(LIBRARIES_ONLY) .include .if defined(_COV_FLAG) +COV_OBJS= ${SOBJS} .include .endif .include Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sat Aug 19 17:18:27 2017 (r322697) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sat Aug 19 18:31:00 2017 (r322698) @@ -302,6 +302,7 @@ NLSNAME?= ${PROG} .include .if defined(_COV_FLAG) +COV_OBJS= ${OBJS} .include .endif .include