svn rather than cvs

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

diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index a454abffd5295bac2d2dce910a9fa9e1c29bc698..50e215080ea872770fdd9a8c88b166f17535a778 100644 (file)
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,6 +1,6 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
 rem SET WXW_VER=2.9.0
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
 rem SET WXW_VER=2.9.0

-if (%WXW_VER%)==() SET WXW_VER=CVS
+if (%WXW_VER%)==() SET WXW_VER=SVN

 
 echo docs building for %WXW_VER%
 
 
 echo docs building for %WXW_VER%
 


@@ -30,24 +30,24 @@ SET >>  c:\temp.log
 rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
 c:
 cd %WXWIN%
 rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
 c:
 cd %WXWIN%

-svn cleanup
-svn up 
+svn cleanup >>  c:\temp.log
+svn up >>  c:\temp.log

 
 rem now inno
 
 rem now inno

-cd \wx\inno\wxWidgets
+cd \wx\inno\wxWidgets >>  c:\temp.log

 del c*.*
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 if exist include\wx\univ\setup.h del include\wx\univ\setup.h
 del c*.*
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 if exist include\wx\univ\setup.h del include\wx\univ\setup.h

-svn cleanup
-svn up 
+svn cleanup >>  c:\temp.log
+svn up >>  c:\temp.log

 dos2unix configure
 dos2unix config.guess
 dos2unix config.sub
 copy include\wx\msw\setup0.h include\wx\msw\setup.h
 copy include\wx\univ\setup0.h include\wx\univ\setup.h
 dos2unix configure
 dos2unix config.guess
 dos2unix config.sub
 copy include\wx\msw\setup0.h include\wx\msw\setup.h
 copy include\wx\univ\setup0.h include\wx\univ\setup.h

-echo CVS update  >>  c:\temp.log
+echo SVN update  >>  c:\temp.log

 
 

-rem just build the formats not in the CVS to keep down the .#makefile...
+rem just build the formats not in the SVN to keep down the .#makefile...

 cd \wx\inno\wxWidgets\build\bakefiles
 del .bakefile_gen.state
 bakefile_gen -f dmars,dmars_smake,msevc4prj >> c:\temp.log
 cd \wx\inno\wxWidgets\build\bakefiles
 del .bakefile_gen.state
 bakefile_gen -f dmars,dmars_smake,msevc4prj >> c:\temp.log

diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index 7b1e8ca3ed1fa48bc6991e86723d31cedd0db008..3cc8606ac53cae5a5e6002c17466f71ddffdae34 100644 (file)
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #if GetEnv("WXW_VER") == "CVS"

-    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildCVS.txt"
-    #define WX_VERSION "CVS"
+    #define INFOFILE  "C:\wx\inno\wxWidgets\BuildSVN.txt"
+    #define WX_VERSION "SVN"

 #else
     #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
     #define WX_VERSION GetENV("WXW_VER")
 #else
     #define INFOFILE "C:\wx\inno\wxWidgets\docs\msw\install.txt"
     #define WX_VERSION GetENV("WXW_VER")

diff --git a/docs/readme.txt b/docs/readme.txt
index 873ae5380555b56a07716efbb8a488bc6a877c89..643dda69321fe640c13902ce3c3ce2b7c8fbf5e0 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 2.8.1
+wxWidgets 2.9.x

 ---------------------------------------------------------
 
 Welcome to wxWidgets, a sophisticated cross-platform C++
 ---------------------------------------------------------
 
 Welcome to wxWidgets, a sophisticated cross-platform C++


@@ -22,7 +22,7 @@ for a list of important documents and samples.
 Changes in this release
 -----------------------
 
 Changes in this release
 -----------------------
 

-Please see changes.txt and "Changes since 2.6" in the manual
+Please see changes.txt and "Changes since 2.8" in the manual

 for details.
 
 Platforms supported
 for details.
 
 Platforms supported