[svn-commits] russell: trunk r294741 - in /trunk: ./ build_tools/ doc/ doc/tex/

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Nov 11 16:14:25 2010
New Revision: 294741

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

........
  r294740 | russell | 2010-11-11 16:13:38 -0600 (Thu, 11 Nov 2010) | 11 lines
  
  Remove most of the contents of the doc dir in favor of the wiki content.
  
  This merge does the following things:
  
   * Removes most of the contents from the doc/ directory in favor
     of the wiki - http://wiki.asterisk.org/
  
   * Updates the build_tools/prep_tarball script to know how to export
     the contents of the wiki in both PDF and plain text formats so that
     the documentation is still included in Asterisk release tarballs.
........

Added:
    trunk/doc/README.txt
      - copied unchanged from r294740, branches/1.8/doc/README.txt
Removed:
    trunk/doc/CODING-GUIDELINES
    trunk/doc/HOWTO_collect_debug_information.txt
    trunk/doc/India-CID.txt
    trunk/doc/PEERING
    trunk/doc/advice_of_charge.txt
    trunk/doc/asterisk-mib.txt
    trunk/doc/backtrace.txt
    trunk/doc/building_queues.txt
    trunk/doc/callfiles.txt
    trunk/doc/chan_sip-perf-testing.txt
    trunk/doc/cli.txt
    trunk/doc/codec-64bit.txt
    trunk/doc/database_transactions.txt
    trunk/doc/datastores.txt
    trunk/doc/digium-mib.txt
    trunk/doc/distributed_devstate-XMPP.txt
    trunk/doc/distributed_devstate.txt
    trunk/doc/externalivr.txt
    trunk/doc/followme.txt
    trunk/doc/google-soc2009-ideas.txt
    trunk/doc/hoard.txt
    trunk/doc/jabber.txt
    trunk/doc/janitor-projects.txt
    trunk/doc/jingle.txt
    trunk/doc/ldap.txt
    trunk/doc/macroexclusive.txt
    trunk/doc/manager_1_1.txt
    trunk/doc/modules.txt
    trunk/doc/osp.txt
    trunk/doc/queue.txt
    trunk/doc/realtimetext.txt
    trunk/doc/res_config_sqlite.txt
    trunk/doc/rtp-packetization.txt
    trunk/doc/sip-retransmit.txt
    trunk/doc/siptls.txt
    trunk/doc/smdi.txt
    trunk/doc/sms.txt
    trunk/doc/snmp.txt
    trunk/doc/speechrec.txt
    trunk/doc/ss7.txt
    trunk/doc/tex/
    trunk/doc/timing.txt
    trunk/doc/unistim.txt
    trunk/doc/valgrind.txt
    trunk/doc/video.txt
    trunk/doc/video_console.txt
    trunk/doc/voicemail_odbc_postgresql.txt
Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/build_tools/prep_tarball

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

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=294741&r1=294740&r2=294741
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Nov 11 16:14:25 2010
@@ -922,14 +922,6 @@
 	@cat sounds/sounds.xml >> $@
 	@echo "</menu>" >> $@
 
-pdf: asterisk.pdf
-asterisk.pdf:
-	$(MAKE) -C doc/tex asterisk.pdf
-
-txt: asterisk.txt
-asterisk.txt:
-	$(MAKE) -C doc/tex asterisk.txt
-
 .PHONY: menuselect
 .PHONY: main
 .PHONY: sounds
@@ -942,7 +934,6 @@
 .PHONY: uninstall
 .PHONY: _uninstall
 .PHONY: uninstall-all
-.PHONY: pdf
 .PHONY: dont-optimize
 .PHONY: badshell
 .PHONY: installdirs

Modified: trunk/build_tools/prep_tarball
URL: http://svnview.digium.com/svn/asterisk/trunk/build_tools/prep_tarball?view=diff&rev=294741&r1=294740&r2=294741
==============================================================================
--- trunk/build_tools/prep_tarball (original)
+++ trunk/build_tools/prep_tarball Thu Nov 11 16:14:25 2010
@@ -8,18 +8,8 @@
 make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV WGET=wget DOWNLOAD=wget all
 make AWK=awk GREP=grep menuselect-tree
 
-make_tex_docs() {
-    # make backup of asterisk.tex because we are going to alter it
-    cp asterisk.tex asterisk.tex.orig
-    sed -e "s/ASTERISKVERSION/${VERSION}/" asterisk.tex > asterisk_local.tex
-    mv asterisk_local.tex asterisk.tex
-    rubber --pdf asterisk.tex
-    latex2html asterisk.tex
-    latex asterisk.tex
-    catdvi -e 1 -U asterisk.dvi | sed -re "s/\[U\+2022\]/*/g" | sed -re "s/\[U\+02C6\]/^/g" | sed -re "s/([^^[:space:]])\s+/\1 /g" > asterisk.txt
-    # restore backup of asterisk.tex
-    mv asterisk.tex.orig asterisk.tex
-}
-
-VERSION=`cat .version`
-cd doc/tex && make_tex_docs
+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