Re: Knobs for src/Make* for SVN "make update" (patch attached)

On Sun, Jun 14, 2009 at 11:08:19AM +0100, Mark Murray wrote:
> Hi
> 
> Any comments on the attached patch to allow "make update" to work with
> SVN? This time the actual patch is enclosed. :-]
> 
> Any brave soul prepared to officially review it? :-)

It basically looks fine to me.  I'm not sure why SVNFLAGS needs to be
set at all though.  Isn't -rHEAD implicit?

-- Brooks

Content-Description: src_makefile.diff
> Index: Makefile.inc1
> ===================================================================
> --- Makefile.inc1	(revision 194177)
> +++ Makefile.inc1	(working copy)
> _at__at_ -94,6 +94,8 _at__at_
>  
>  CVS?=		cvs
>  CVSFLAGS?=	-A -P -d -I!
> +SVN?=		svn
> +SVNFLAGS?=	-r HEAD
>  SUP?=		/usr/bin/csup
>  SUPFLAGS?=	-g -L 2
>  .if defined(SUPHOST)
> _at__at_ -854,11 +867,25 _at__at_
>  .endif
>  .endif
>  .if defined(CVS_UPDATE)
> -	_at_echo "--------------------------------------------------------------"
> -	_at_echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
> -	_at_echo "--------------------------------------------------------------"
> -	cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
> +	_at_cd ${.CURDIR} ; \
> +	if [ -d CVS ] ; then \
> +		echo "--------------------------------------------------------------" ; \
> +		echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
> +		echo "--------------------------------------------------------------" ; \
> +		echo ${CVS} -R -q update ${CVSFLAGS} ; \
> +		${CVS} -R -q update ${CVSFLAGS} ; \
> +	fi
>  .endif
> +.if defined(SVN_UPDATE)
> +	_at_cd ${.CURDIR} ; \
> +	if [ -d .svn ] ; then \
> +		echo "--------------------------------------------------------------" ; \
> +		echo ">>> Updating ${.CURDIR} using Subversion" ; \
> +		echo "--------------------------------------------------------------" ; \
> +		echo ${SVN} update ${SVNFLAGS} ; \
> +		${SVN} update ${SVNFLAGS} ; \
> +	fi
> +.endif
>  
>  #
>  # ------------------------------------------------------------------------

> _______________________________________________
> freebsd-current_at_freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe_at_freebsd.org"