Warning fixes after char->wxChar in wxVariant.

[wxWidgets.git] / wxPython / distrib / makedocs

diff --git a/wxPython/distrib/makedocs b/wxPython/distrib/makedocs
index 2677728d4a21fbf4a4e4a802f5394df0fe8ef6ed..c530a6d868f82d12e1114de60623be21d00f3bb8 100755 (executable)
--- a/wxPython/distrib/makedocs
+++ b/wxPython/distrib/makedocs
@@ -9,21 +9,27 @@ fi
 
 
 VERSION=`python -c "import setup;print setup.VERSION"`
-CONTRIBS="ogl gizmos"
+CONTRIBS="gizmos"
 DEST=wxPython-$VERSION/docs
 
+
 # **** Make a directory to build up a distribution tree
 mkdir -p _build_docs/$DEST
 cd _build_docs
 mkdir $DEST/wx
+DEST=`abspath.py $DEST`
 
-WXDIR=../..
+WXDIR=`abspath.py ../..`
+INI=$WXDIR/docs/latex/wx/tex2rtf_css.ini
 
 # **** Build the main docs using tex2rtf
 echo "****" main "****"
 cp $WXDIR/docs/latex/wx/*.gif $DEST/wx
-$WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.htm -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
-cp $DEST/wx/wx.htm $DEST/wx/index.htm
+cp $WXDIR/docs/latex/wx/*.css $DEST/wx
+echo tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $INI
+tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $INI
+cp $DEST/wx/wx_contents.html $DEST/wx/index.html
+cp $DEST/wx/* $WXDIR/docs/html/wx
 
 # **** and the contribs
 for c in $CONTRIBS; do
@@ -31,8 +37,9 @@ for c in $CONTRIBS; do
     mkdir $DEST/$c
     cp $WXDIR/contrib/docs/latex/$c/*.gif $DEST/$c
     cp $WXDIR/contrib/docs/latex/$c/*.bmp $DEST/$c
-    $WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.htm -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
-    cp $DEST/$c/$c.htm $DEST/$c/index.htm || cp $DEST/$c/${c}_contents.html $DEST/$c/index.htm
+    tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $INI      
+    #tex2rtf $WXDIR/contrib/docs/latex/$c/manual.tex $DEST/$c/$c.html -twice -html -macros $INI 
+    cp $DEST/$c/$c.html $DEST/$c/index.html || cp $DEST/$c/${c}_contents.html $DEST/$c/index.html
 done
 
 
@@ -53,10 +60,11 @@ done
 popd
 cp ../distrib/viewdocs.py $DEST
 cp ../distrib/README.viewdocs.txt $DEST/README.txt
+##cp ../docs/xml/wxPython-metadata.xml $DEST
 
-rm -f ../dist/wxPythonDocs-$VERSION.tar.gz
-tar cvf ../dist/wxPythonDocs-$VERSION.tar $DEST
-gzip -9 ../dist/wxPythonDocs-$VERSION.tar
+rm -f ../dist/wxPython-docs-$VERSION.tar.bz2
+tar cvf ../dist/wxPython-docs-$VERSION.tar wxPython-$VERSION
+bzip2 -9 ../dist/wxPython-docs-$VERSION.tar
 
 
 # **** Cleanup