Script tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 0703eb1052a3f46df83dc8dd02cec3ac0e786c1e..66efa9328ed613d2af9a91270dd79479cead3eb5 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -1183,6 +1183,7 @@ samples/taskbar/*.def
 samples/taskbar/*.bmp
 samples/taskbar/*.ico
 samples/taskbar/*.txt
+samples/taskbar/*.xpm
 
 samples/text/*.cpp
 samples/text/*.h

diff --git a/distrib/msw/maketarballs b/distrib/msw/maketarballs
index b69d37736a509f8d58579757760e91352e70926e..5c9267566f94d1f5a2bacde5674ed0c72249ca6b 100755 (executable)
--- a/distrib/msw/maketarballs
+++ b/distrib/msw/maketarballs
@@ -159,6 +159,32 @@ docopydocs()
   cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
 }
 
+dospindocs()
+{
+  mkdir -p $WXSRC/docs/html/wx
+  mkdir -p $WXSRC/docs/html/tex2rtf
+  mkdir -p $WXSRC/docs/html/fl
+  mkdir -p $WXSRC/docs/html/ogl
+  mkdir -p $WXSRC/docs/htb
+
+  rm -f -r $WXSRC/docs/html/wx/*.htm*
+  rm -f -r $WXSRC/docs/htb/wx.htb
+
+  echo Making HTML wxWidgets manual...
+  cd $WXSRC/docs/latex/wx
+  cp *.gif $WXSRC/docs/html/wx
+  tex2rtf manual.tex $WXSRC/docs/html/wx/wx.htm -twice -html
+
+  echo Making HTB wxWidgets manual...
+  cd $WXSRC/docs/html/wx
+  zip -q $WXSRC/docs/htb/wx.htb *.html *.gif *.hhp *.hhc *.hhk
+
+  echo Archiving manuals...
+  # TODO
+
+  echo Done making manuals.
+}
+
 PROGNAME=$0
 WXSRC=$1
 WXDEST=$2
@@ -169,6 +195,7 @@ SPINWXGTK=0
 SPINWXMOTIF=0
 SPINWXMAC=0
 SPINWXBASE=0
+SPINDOCS=0
 SPINEVERYTHING=0
 UPDATECVS=0
 
@@ -182,6 +209,7 @@ usage()
     echo "    --wxx11        Spin wxX11"
     echo "    --wxmotif      Spin wxMotif"
     echo "    --wxmac        Spin wxMac"
+    echo "    --docs         Spin docs"
     echo "    --all          Spin EVERYTHING"
     echo "    --updatecvs    Update from CVS"
 
@@ -251,4 +279,8 @@ if [ "$SPINWXMAC" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
   dospinwxmac
 fi
 
+if [ "$SPINDOCS" = "1" ] || [ "$SPINEVERYTHING" = "1" ]; then
+  dospindocs
+fi
+
 docopydocs

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index b296d4be494864e29d4b90ba9ed20e7ceac5f341..2c719e736ebae5b955c93528a67d0671d6631ae2 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -251,6 +251,22 @@ else
   echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-VC.zip"
 fi
 
+# If we have the full set of eVC++ project files,
+# get them
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-eVC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-eVC.zip
+else
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-eVC.zip"
+fi
+
+# If we have the full set of DMC project files,
+# get them
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-DMC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-DMC.zip
+else
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-DMC.zip"
+fi
+
 # If we have the full set of Mac CW project files,
 # get them
 if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
@@ -288,8 +304,34 @@ gzip -c $WXDEST/wxAll-${WXVER}.tar > $WXDEST/wxAll-${WXVER}.tar.gz
 bzip2 $WXDEST/wxAll-${WXVER}.tar
 }
 
+domakedocs()
+{
+  mkdir -p $WXSRC/docs/html/wx
+  mkdir -p $WXSRC/docs/html/tex2rtf
+  mkdir -p $WXSRC/docs/html/fl
+  mkdir -p $WXSRC/docs/html/ogl
+  mkdir -p $WXSRC/docs/htb
+
+  rm -f -r $WXSRC/docs/html/wx/*.htm*
+  rm -f -r $WXSRC/docs/htb/wx.htb
+
+  echo Making HTML wxWidgets manual...
+  cd $WXSRC/docs/latex/wx
+  cp *.gif $WXSRC/docs/html/wx
+  tex2rtf manual.tex $WXSRC/docs/html/wx/wx.htm -twice -html
+
+  echo Making HTB wxWidgets manual...
+  cd $WXSRC/docs/html/wx
+  zip -q $WXSRC/docs/htb/wx.htb *.html *.gif *.hhp *.hhc *.hhk
+
+  echo Done making manuals.
+}
+
 dospinwxdocs()
 {
+  # First make the docs
+  domakedocs
+
 echo Tarring wxDocs...
 
 ### Doc sources

diff --git a/distrib/msw/wx_html.rsp b/distrib/msw/wx_html.rsp
index c711734c717c684c327262bdd34c681b226e94c5..5d2c7aa963ab76e745b3dd7e381bab4cd9af3d14 100644 (file)
--- a/distrib/msw/wx_html.rsp
+++ b/distrib/msw/wx_html.rsp
@@ -1,10 +1,11 @@
 docs/html/*.htm
 docs/html/*.gif
 
-docs/html/wx/*.htm
+docs/html/wx/*.html
 docs/html/wx/*.gif
 
 docs/html/tex2rtf/*.htm
+docs/html/tex2rtf/*.html
 docs/html/tex2rtf/*.gif
 
 docs/html/odbc/*.htm
@@ -12,9 +13,6 @@ docs/html/odbc/*.htm
 docs/html/gettext/*.html
 
 contrib/docs/html/ogl/*.htm
+contrib/docs/html/ogl/*.html
 contrib/docs/html/ogl/*.gif
-contrib/docs/html/mmedia/*.htm
-contrib/docs/html/mmedia/*.gif
-contrib/docs/html/stc/*.htm
-contrib/docs/html/stc/*.gif