git: ae0b4bec3af0 - stable/12 - release: disable the 'reldoc' target after the ASCIIDoctor switch

[Glen Barber]

The branch stable/12 has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=ae0b4bec3af0787091afb735acb060f6c616d792

commit ae0b4bec3af0787091afb735acb060f6c616d792
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2021-02-05 16:46:49 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2021-05-12 14:55:06 +0000

    release: disable the 'reldoc' target after the ASCIIDoctor switch
    
    The 'reldoc' target includes release-related documentation on
    installation medium.  Since the switch from XML to ASCIIDoctor,
    the file locations have moved, and it will take some time to sort
    out how this target should work now.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 7b1d1a1658ffb69eff93afc713f9e88ed8b20eac)
---
 release/Makefile | 72 ++++++++++++++++++++++++--------------------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index f4c640b844fa..db6a56296c6a 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -88,18 +88,9 @@ EXTRA_PACKAGES+= ports.txz
 .if !defined(NOSRC)
 EXTRA_PACKAGES+= src.txz
 .endif
-.if !defined(NODOC)
-EXTRA_PACKAGES+= reldoc
-. if !defined(SVN) || empty(SVN)
-.  for S in svn svnlite
-.   for D in /usr/local/bin /usr/bin
-.    if(exists(${D}/${S}))
-SVN?=	${D}/${S}
-.    endif
-.   endfor
-.  endfor
-. endif
-.endif
+#.if !defined(NODOC)
+#EXTRA_PACKAGES+= reldoc
+#.endif
 
 RELEASE_TARGETS= ftp
 IMAGES=
@@ -128,9 +119,9 @@ CLEANFILES+=	${I}.xz
 CLEANFILES+=	pkg-stage
 .endif
 CLEANDIRS=	dist ftp disc1 bootonly dvd
-.if !defined(NODOC)
-CLEANDIRS+=    reldoc rdoc
-.endif
+#.if !defined(NODOC)
+#CLEANDIRS+=    reldoc rdoc
+#.endif
 beforeclean:
 	chflags -R noschg .
 .include <bsd.obj.mk>
@@ -170,23 +161,22 @@ ports.txz:
 	    --exclude 'usr/ports/INDEX*' --exclude work usr/ports | \
 	    ${XZ_CMD} > ${.OBJDIR}/ports.txz
 
-reldoc:
-	cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
-	    env MAN4DIR=${WORLDDIR}/share/man/man4 \
-	    SVN=${SVN} \
-	    _BRANCH=${BRANCH} \
-	    ${MAKE} all install clean "FORMATS=html txt" \
-	    INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
-	    WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
-	mkdir -p reldoc
-.for i in hardware readme relnotes errata
-	ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \
-		reldoc/${i:tu}.TXT
-	ln -f ${.OBJDIR}/rdoc/${i:tl}.html \
-		reldoc/${i:tu}.HTML
-.endfor
-	cp ${.OBJDIR}/rdoc/docbook.css \
-		reldoc/
+#reldoc:
+#	cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
+#	    env MAN4DIR=${WORLDDIR}/share/man/man4 \
+#	    _BRANCH=${BRANCH} \
+#	    ${MAKE} all install clean "FORMATS=html txt" \
+#	    INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
+#	    WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc
+#	mkdir -p reldoc
+#.for i in hardware readme relnotes errata
+#	ln -f ${.OBJDIR}/rdoc/${i:tl}.txt \
+#		reldoc/${i:tu}.TXT
+#	ln -f ${.OBJDIR}/rdoc/${i:tl}.html \
+#		reldoc/${i:tu}.HTML
+#.endfor
+#	cp ${.OBJDIR}/rdoc/docbook.css \
+#		reldoc/
 
 disc1: packagesystem
 # Install system
@@ -204,9 +194,9 @@ disc1: packagesystem
 	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 # Copy documentation, if generated
-.if !defined(NODOC)
-	cp reldoc/* ${.TARGET}
-.endif
+#.if !defined(NODOC)
+#	cp reldoc/* ${.TARGET}
+#.endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -231,9 +221,9 @@ bootonly: packagesystem
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	cp MANIFEST ${.TARGET}/usr/freebsd-dist
 # Copy documentation, if generated
-.if !defined(NODOC)
-	cp reldoc/* ${.TARGET}
-.endif
+#.if !defined(NODOC)
+#	cp reldoc/* ${.TARGET}
+#.endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -255,9 +245,9 @@ dvd: packagesystem
 	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 # Copy documentation, if generated
-.if !defined(NODOC)
-	cp reldoc/* ${.TARGET}
-.endif
+#.if !defined(NODOC)
+#	cp reldoc/* ${.TARGET}
+#.endif
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf