Date: Mon, 15 Jun 2009 13:32:07 -0500 From: Brooks Davis <brooks@freebsd.org> To: Mark Murray <markm@freebsd.org> Cc: current@freebsd.org Subject: Re: Knobs for src/Make* for SVN "make update" (patch attached) Message-ID: <20090615183207.GC7180@lor.one-eyed-alien.net> In-Reply-To: <E1MFmdP-000Ieu-F2@greatest.grondar.org> References: <E1MFmdP-000Ieu-F2@greatest.grondar.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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)
> @@ -94,6 +94,8 @@
>
> CVS?= cvs
> CVSFLAGS?= -A -P -d -I!
> +SVN?= svn
> +SVNFLAGS?= -r HEAD
> SUP?= /usr/bin/csup
> SUPFLAGS?= -g -L 2
> .if defined(SUPHOST)
> @@ -854,11 +867,25 @@
> .endif
> .endif
> .if defined(CVS_UPDATE)
> - @echo "--------------------------------------------------------------"
> - @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
> - @echo "--------------------------------------------------------------"
> - cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
> + @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)
> + @cd ${.CURDIR} ; \
> + if [ -d .svn ] ; then \
> + echo "--------------------------------------------------------------" ; \
> + echo ">>> Updating ${.CURDIR} using Subversion" ; \
> + echo "--------------------------------------------------------------" ; \
> + echo ${SVN} update ${SVNFLAGS} ; \
> + ${SVN} update ${SVNFLAGS} ; \
> + fi
> +.endif
>
> #
> # ------------------------------------------------------------------------
> _______________________________________________
> freebsd-current@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)
iD8DBQFKNpOnXY6L6fI4GtQRAg5iAKCrDtotqxInQMnK2wqLpj3mfLNRFgCdFy2O
xlVJ9B0MVvBhukYAjU9Gnjg=
=CK+U
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090615183207.GC7180>