Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 7 Nov 2019 18:07:34 +0000 (UTC)
From:      Phil Shafer <phil@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r354456 - vendor/Juniper/libxo
Message-ID:  <201911071807.xA7I7Ywq063859@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: phil
Date: Thu Nov  7 18:07:34 2019
New Revision: 354456
URL: https://svnweb.freebsd.org/changeset/base/354456

Log:
  Remove oxtradoc version of documentation; move to RST/Sphinx

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==============================================================================
--- vendor/Juniper/libxo/import.sh	Thu Nov  7 18:06:44 2019	(r354455)
+++ vendor/Juniper/libxo/import.sh	Thu Nov  7 18:07:34 2019	(r354456)
@@ -26,14 +26,19 @@ GMAKE=${GMAKE:-gmake}
 
 # For consistency...
 Error() {
-	echo ERROR: ${1+"$@"} >&2
-	exit 1
+    echo ERROR: ${1+"$@"} >&2
+    exit 1
 }
 
 Cd() {
-	[ $# -eq 1 ] || Error "Cd() takes a single parameter."
-	cd $1 || Error "cannot \"cd $1\" from $PWD"
-        info "Directory =" `pwd`
+    [ $# -eq 1 ] || Error "Cd() takes a single parameter."
+    cd $1 || Error "cannot \"cd $1\" from $PWD"
+    info "Directory =" `pwd`
+         
+    if [ "$DOC" = doc ]; then
+       echo "    cd $1"
+       echo "  "
+    fi
 }
 
 siginfo() {
@@ -51,8 +56,8 @@ run() {
     CMD="$2"
 
     if [ "$DOC" = doc ]; then
-        echo " == $desc"
-        echo "     - $cmd"
+        echo "## $desc"
+        echo "     $cmd"
         echo " "
     else
         echo "===="
@@ -66,7 +71,7 @@ run() {
 }
 
 info() {
-    echo " -- " "$@"
+    echo "## -- " "$@"
 }
 
 okay() {
@@ -182,13 +187,7 @@ fi
 
 # We need the release tar ball for the HTML docs, nothing more
 DOCURL=https://github.com/Juniper/libxo/releases/download/$VERS/libxo-$VERS.tar.gz
-DOCBALL=~/tars/doc-$BASEURL
 
-if [ "$FETCH" = "yes" -o ! -f $DOCBALL ]; then
-    run "fetching doc tarball" "fetch -o $DOCBALL $DOCURL"
-    test -s ${DOCBALL} || Error need DOCBALL
-fi
-
 # BASE should match what the TARBALL contains
 BASE=`basename $TARBALL .tar.gz`
 VERSION=`echo $BASE | sed 's/libxo-//'`
@@ -196,8 +195,6 @@ VERSION=`echo $BASE | sed 's/libxo-//'`
 TF=$BASE/info
 
 run "untarring source files TARBALL" "tar zxf $TARBALL"
-run "untarring html manual" \
-    "tar zxf $DOCBALL libxo-$VERS/doc/libxo-manual.html"
 
 # List of top-level files we want to ignore
 TOPJUNKFILES="\

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