d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r245757 introduced warning output if update method is set to CVS_UPDATE

Browse Source 
or SUP_UPDATE.

CVS exporter for head/ is turned off for nearly one month now.

It is finally time to swing the ax at these update methods.

Reviewed by:	eadler
MFC after:	1 month
This commit is contained in:
Glen Barber 2013-05-28 23:43:47 +00:00
parent 734b03c38d
commit 4e02fd950c
2 changed files with 25 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Makefile.inc1
View File

@ -114,15 +114,8 @@ LOCAL_TOOL_DIRS?=
BUILDENV_SHELL?=/bin/sh BUILDENV_SHELL?=/bin/sh
CVS?= cvs SVN?= /usr/local/bin/svn
CVSFLAGS?= -A -P -d -I!
SVN?= svn
SVNFLAGS?= -r HEAD SVNFLAGS?= -r HEAD
SUP?= /usr/bin/csup
SUPFLAGS?= -g -L 2
.if defined(SUPHOST)
SUPFLAGS+= -h ${SUPHOST}
.endif
MAKEOBJDIRPREFIX?= /usr/obj MAKEOBJDIRPREFIX?= /usr/obj
.if !defined(OSRELDATE) .if !defined(OSRELDATE)
@ -1080,59 +1073,18 @@ doxygen:
# latest copy. # latest copy.
# #
update: update:
.if defined(SUP_UPDATE) .if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Running ${SUP}" @echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
@echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" @exit 1
@echo "!! Update methods with ${SUP} are deprecated."
@echo "!! Please see http://www.freebsd.org/handbook/svn.html"
@echo "!! and convert your update method to SVN_UPDATE or"
@echo "!! freebsd-update(8)."
@echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!"
@sleep 5
.if defined(SUPFILE)
@${SUP} ${SUPFLAGS} ${SUPFILE}
.endif
.if defined(SUPFILE1)
@${SUP} ${SUPFLAGS} ${SUPFILE1}
.endif
.if defined(SUPFILE2)
@${SUP} ${SUPFLAGS} ${SUPFILE2}
.endif
.if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE)
@${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
.endif
.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
.endif
.endif
.if defined(CVS_UPDATE)
@cd ${.CURDIR} ; \
if [ -d CVS ] ; then \
echo "--------------------------------------------------------------" ; \
echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
echo "--------------------------------------------------------------" ; \
echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
echo "!! Update methods with CVS are deprecated." ; \
echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \
echo "!! and convert your update method to SVN_UPDATE or" ; \
echo "!! freebsd-update(8)." ; \
echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
sleep 5 ; \
echo ${CVS} -R -q update ${CVSFLAGS} ; \
${CVS} -R -q update ${CVSFLAGS} ; \
fi
.endif .endif
.if defined(SVN_UPDATE) .if defined(SVN_UPDATE)
@cd ${.CURDIR} ; \ @echo "--------------------------------------------------------------"
if [ -d .svn ] ; then \ @echo ">>> Updating ${.CURDIR} using Subversion"
echo "--------------------------------------------------------------" ; \ @echo "--------------------------------------------------------------"
echo ">>> Updating ${.CURDIR} using Subversion" ; \ @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
echo "--------------------------------------------------------------" ; \
echo ${SVN} update ${SVNFLAGS} ; \
${SVN} update ${SVNFLAGS} ; \
fi
.endif .endif
# #

28
release/doc/Makefile
View File

@ -12,26 +12,30 @@ SUBDIR+= share/xml
RELN_ROOT?= ${.CURDIR} RELN_ROOT?= ${.CURDIR}
.if defined(SUPHOST) SVN?= /usr/local/bin/svn
SUPFLAGS+= -h ${SUPHOST} SVNFLAGS?= -r HEAD
.endif
update: update:
.if defined(SUP_UPDATE) .if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
.if !defined(DOCSUPFILE) @echo "--------------------------------------------------------------"
@echo "Error: Please define DOCSUPFILE before doing make update." @echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
@echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
@echo "--------------------------------------------------------------"
@exit 1 @exit 1
.endif .endif
.if defined(SVN_UPDATE)
. if !exists(${SVN})
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Running ${SUP}" @echo ">>> Updating ${RELN_ROOT} requires ${SVN}."
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@${SUP} ${SUPFLAGS} ${DOCSUPFILE} @exit 1
.elif defined(CVS_UPDATE) . endif
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} @echo ">>> Updating ${.CURDIR} using Subversion"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
cd ${.CURDIR}; cvs -q update -P -d @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
.else .else
@echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first." @echo "Error: Please define SUP_UPDATE first."
.endif .endif
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"