[svn-commits] russell: branch russell/1.8-docdir r294732 - in /team/russell/1.8-docdir: ./ ...

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Nov 11 15:55:14 2010
New Revision: 294732

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294732
Log:
Remove doc/tex, update prep_tarball

Removed:
    team/russell/1.8-docdir/doc/tex/
Modified:
    team/russell/1.8-docdir/Makefile
    team/russell/1.8-docdir/build_tools/prep_tarball

Modified: team/russell/1.8-docdir/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/russell/1.8-docdir/Makefile?view=diff&rev=294732&r1=294731&r2=294732
==============================================================================
--- team/russell/1.8-docdir/Makefile (original)
+++ team/russell/1.8-docdir/Makefile Thu Nov 11 15:55:14 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: team/russell/1.8-docdir/build_tools/prep_tarball
URL: http://svnview.digium.com/svn/asterisk/team/russell/1.8-docdir/build_tools/prep_tarball?view=diff&rev=294732&r1=294731&r2=294732
==============================================================================
--- team/russell/1.8-docdir/build_tools/prep_tarball (original)
+++ team/russell/1.8-docdir/build_tools/prep_tarball Thu Nov 11 15:55:14 2010
@@ -8,18 +8,6 @@
 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
+wikiexport.py
+pdftotext AST.pdf