Manul version number update

Script updates

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

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 71ccf06b97966fca4dfdcd9f5d16721ce95520f9..9829e18a840a9604237a92063c9c514ddba41170 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -25,7 +25,7 @@ PROGNAME=$0
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version

-VERSION=2.5.5
+VERSION=2.6.0

 
 . $SCRIPTDIR/setup.var
 
 
 . $SCRIPTDIR/setup.var
 


@@ -287,7 +287,7 @@ dospinwxall()
     cd $DESTDIR
 
     rm -f $DESTDIR/wxWidgets-$VERSION-all.zip
     cd $DESTDIR
 
     rm -f $DESTDIR/wxWidgets-$VERSION-all.zip

-    zip $ZIPFLAGS -r wxAll-$VERSION.zip wxWidgets-$VERSION/*
+    zip $ZIPFLAGS -r wxWidgets-$VERSION.zip wxWidgets-$VERSION/*

 }
 
 dospinbase()
 }
 
 dospinbase()

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 2157cf6d5aec688189297842897ba49c517b4838..634e7c250920734989b49aedf14f7b8ef1e9e5d3 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -234,7 +234,7 @@ echo Tarring wxAll...
 cd $WXSRC
 cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/wince.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/palmos.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
 expandlines /tmp/wxall_in.txt /tmp/wxall.txt
 cd $WXSRC
 cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/wince.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/palmos.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt
 expandlines /tmp/wxall_in.txt /tmp/wxall.txt

-$TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}.tar -T /tmp/wxall.txt

 
 echo Re-tarring wxAll in a subdirectory...
 cd $WXDEST
 
 echo Re-tarring wxAll in a subdirectory...
 cd $WXDEST


@@ -274,7 +274,7 @@ else
   echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
   echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 

-$TAR xf ../wxAll-${WXVER}.tar
+$TAR xf ../wxWidgets-${WXVER}.tar

 
 # Translate all .dsp and .dsw files to DOS format
 unix2dos --unix2dos `cat $WXSRC/distrib/msw/vc.rsp`
 
 # Translate all .dsp and .dsw files to DOS format
 unix2dos --unix2dos `cat $WXSRC/distrib/msw/vc.rsp`


@@ -297,11 +297,11 @@ cp $WXSRC/docs/palmos/readme.txt README-PALMOS.txt
 cp $WXSRC/docs/os2/install.txt INSTALL-OS2.txt
 
 cd ..
 cp $WXSRC/docs/os2/install.txt INSTALL-OS2.txt
 
 cd ..

-rm -f wxAll-${WXVER}.tar
-$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
+rm -f wxWidgets-${WXVER}.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}.tar wxWidgets-${WXVER}/*

 rm -f -r wxWidgets-${WXVER}
 rm -f -r wxWidgets-${WXVER}

-gzip -c $WXDEST/wxAll-${WXVER}.tar > $WXDEST/wxAll-${WXVER}.tar.gz
-bzip2 $WXDEST/wxAll-${WXVER}.tar
+gzip -c $WXDEST/wxWidgets-${WXVER}.tar > $WXDEST/wxWidgets-${WXVER}.tar.gz
+bzip2 $WXDEST/wxWidgets-${WXVER}.tar

 }
 
 domakedocs()
 }
 
 domakedocs()

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index cd0523d9611154e9b0313f67a77cf8b368a9bce4..43c32b56191481a6e01a1dca2328f18e2024703d 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,7 +26,7 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt

-\title{wxWidgets 2.5.5: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.6.0: A portable C++ and Python GUI toolkit}

 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}