Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 17 Oct 2014 18:06:05 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r45846 - head/share/examples
Message-ID:  <201410171806.s9HI65Fj087366@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gjb
Date: Fri Oct 17 18:06:05 2014
New Revision: 45846
URL: https://svnweb.freebsd.org/changeset/doc/45846

Log:
  Add a few tweaks to missing-manrefs.sh:
  
   - In build_manpages(), specify -DNO_ROOT to suppress
     false errors when the 'hier' target gets kicked.
  
     While here, create a tgz package containing the
     /usr/share/man and /usr/share/openssl to make it
     easier to refresh the man.cgi backend.
  
   - In add_manref(), work around a recurring issue where
     the add-manref.sh script thinks 'atf-c++-api' is
     a valid entity entry.
  
     Also fix the section ID passed to add-manref.sh,
     which by the looks of it, should have never worked
     in the first place.
  
     Use realpath(1) to when passing the target file,
     manual page, and section to add-manref.sh so using
     '.' to specify the current working directory for
     either the path to src/ or doc/ are valid.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/examples/missing-manrefs.sh

Modified: head/share/examples/missing-manrefs.sh
==============================================================================
--- head/share/examples/missing-manrefs.sh	Fri Oct 17 17:56:34 2014	(r45845)
+++ head/share/examples/missing-manrefs.sh	Fri Oct 17 18:06:05 2014	(r45846)
@@ -62,22 +62,29 @@ build_manpages() {
 	make -s -C ${srcs} DESTDIR=${outdir} \
 		SRCCONF=/dev/null __MAKE_CONF=/dev/null \
 		MANOWN=$USER MANGRP=$USER MANMODE=0666 \
-		NO_MLINKS=1 obj hier all-man maninstall
+		NO_MLINKS=1 -DNO_ROOT obj hier all-man maninstall
+	echo "Packaging manual pages..."
+	tar -zcvf ${outdir}.tgz -C ${outdir} \
+		usr/share/man usr/share/openssl
 }
 
 build_cleanup() {
 	make -s -C ${srcs} DESTDIR=${outdir} \
 		SRCCONF=/dev/null __MAKE_CONF=/dev/null \
-		NO_MLINKS=1 cleandir
+		NO_MLINKS=1 -DNO_ROOT cleandir
 }
 
 add_manref() {
 	_man=${_m}
 	_man=$(echo ${_man} | sed -e 's/\./_/g')
+	# Ugly fix to the atf-c++-api manual; I'm still not sure
+	# why add-manref.sh insists the entity should contain the '+'
+	# characters.
+	_man=$(echo ${_man} | sed -e 's/\+\+/../g')
 	_man=${_man%%_[0-9]}
-	_sec=${_man##*_}
-	yes | sh ${docs}/share/examples/add-manref.sh \
-		${docs}/share/xml/man-refs.ent ${_man} ${_sec}
+	_sec=${_m##*.}
+	yes | sh $(realpath ${docs})/share/examples/add-manref.sh \
+		$(realpath ${docs})/share/xml/man-refs.ent ${_man} ${_sec}
 }
 
 main() {
@@ -95,6 +102,7 @@ main() {
 	done
 	build_cleanup
 	rm -vr ${outdir} ${objdir}
+	echo "Packaged manual pages are in: ${outdir}.tgz"
 }
 
 main "$@"

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410171806.s9HI65Fj087366>