Remove the need for the PyPen class

[wxWidgets.git] / wxPython / distrib / makedocs

diff --git a/wxPython/distrib/makedocs b/wxPython/distrib/makedocs
index 2677728d4a21fbf4a4e4a802f5394df0fe8ef6ed..4fb5faf345bfeee8a5d6873f6579d33b999f60f4 100755 (executable)
--- a/wxPython/distrib/makedocs
+++ b/wxPython/distrib/makedocs
@@ -22,8 +22,10 @@ WXDIR=../..
 # **** 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
+$WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/docs/latex/wx/manual.tex $DEST/wx/wx.html -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.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 +33,8 @@ 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
+    $WXDIR/utils/tex2rtf/src/tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $WXDIR/docs/latex/wx/tex2rtf.ini
+    cp $DEST/$c/$c.html $DEST/$c/index.html || cp $DEST/$c/${c}_contents.html $DEST/$c/index.html
 done
 
 
@@ -53,6 +55,7 @@ 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