[asterisk-commits] lmadsen: branch 10 r339586 - in /branches/10: ./ build_tools/prep_tarball

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu Oct  6 08:43:21 2011
New Revision: 339586

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339586
Log:
Merged revisions 339566 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r339566 | lmadsen | 2011-10-05 16:30:11 -0500 (Wed, 05 Oct 2011) | 8 lines
  
  Update prep_tarball script to download pre-exported documentation.
  
  I've updated the prep_tarball script to now download the pre-exported documentation
  from the Asterisk wiki. This will give us more control over what is being included
  in the tarball releases, and will make both the PDF and HTML exported documentation
  look much better (especially when viewing from a console).
  
  (Closes issue ASTERISK-18677)
........

Modified:
    branches/10/   (props changed)
    branches/10/build_tools/prep_tarball

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/build_tools/prep_tarball
URL: http://svnview.digium.com/svn/asterisk/branches/10/build_tools/prep_tarball?view=diff&rev=339586&r1=339585&r2=339586
==============================================================================
--- branches/10/build_tools/prep_tarball (original)
+++ branches/10/build_tools/prep_tarball Thu Oct  6 08:43:21 2011
@@ -7,27 +7,23 @@
 
 make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV WGET=wget DOWNLOAD=wget all
 
-if ! which wikiexport.py 2>&1 > /dev/null ; then
-	echo
-	echo "wikiexport.py not found in \${PATH}."
-	echo
-	echo "Please add repotools into PATH."
-	echo "    $ svn co http://svn.asterisk.org/svn/repotools"
-	echo
+branch=$1
+
+if [ -z "$branch" ]
+then
+	echo "No branch specified. Exiting."
 	exit 1
 fi
 
-if ! which pdftotext 2>&1 > /dev/null ; then
-	echo
-	echo "pdftotext not found.  Please install it."
-	echo
-	echo "On Debian/Ubuntu/Fedora/CentOS, install the poppler-utils package."
-	echo
-	exit 1
-fi
+hash unzip 2>&- || { echo >&2 "The unzip application is required but was not found. Aborting."; exit 1; }
 
 cd doc
-echo "Exporting Asterisk wiki to a PDF (this will take a minute) ..."
-wikiexport.py
-echo "Converting wiki export PDF to plain text ..."
-pdftotext AST.pdf
+echo "Downloading the PDF and HTML documentation from the Asterisk wiki (this will take a minute) ..."
+wget https://wiki.asterisk.org/wiki/download/attachments/19005471/Asterisk-Admin-Guide-$branch.pdf
+wget https://wiki.asterisk.org/wiki/download/attachments/19005471/Asterisk-Admin-Guide-$branch.html.zip
+echo "Extracting HTML Admin Guide"
+unzip Asterisk-Admin-Guide-$branch.html.zip
+mv AST/ Asterisk-Admin-Guide/
+mv Asterisk-Admin-Guide-1.8.pdf Asterisk-Admin-Guide.pdf
+rm -f Asterisk-Admin-Guide-$branch.html.zip
+echo "Documentation downloaded. Goodbye!"