changes for bulding daily trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2009-04-24 08:08:43 +00:00
parent d47dd1aece
commit 517ff47624
2 changed files with 9 additions and 6 deletions

View File

@@ -14,6 +14,7 @@ echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
set WXWIN=c:\wx\wx29b set WXWIN=c:\wx\wx29b
set DAILY=c:\daily set DAILY=c:\daily
set INNO=c:\wx\inno\wx29b
rem svn already in my path... rem svn already in my path...
set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1 set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
@@ -32,7 +33,7 @@ svn cleanup >> c:\temp.log
svn up >> c:\temp.log svn up >> c:\temp.log
rem now inno rem now inno
cd \wx\inno\wx29b >> c:\temp.log cd %INNO% >> c:\temp.log
rem Don't update the svn automatically rem Don't update the svn automatically
rem svn cleanup >> c:\temp.log rem svn cleanup >> c:\temp.log
rem svn up >> c:\temp.log rem svn up >> c:\temp.log
@@ -53,7 +54,7 @@ copy include\wx\univ\setup0.h include\wx\univ\setup.h
echo SVN update >> c:\temp.log echo SVN update >> c:\temp.log
rem just build the formats not in the SVN to keep down the .#makefile... rem just build the formats not in the SVN to keep down the .#makefile...
cd \wx\inno\wx29b\build\bakefiles cd %INNO%\build\bakefiles
del .bakefile_gen.state del .bakefile_gen.state
bakefile_gen -k -f dmars,dmars_smake,msevc4prj >> c:\temp.log bakefile_gen -k -f dmars,dmars_smake,msevc4prj >> c:\temp.log
@@ -79,7 +80,7 @@ zip wxWidgets-%WXW_VER%-htb.zip wx.htb
copy wxWidgets-%WXW_VER%-htb.zip %DAILY% copy wxWidgets-%WXW_VER%-htb.zip %DAILY%
mkdir c:\wx\inno\wx29b\docs\htmlhelp mkdir %INNO%\docs\htmlhelp
copy %WXWIN%\docs\doxygen\out\wx.chm \wx\inno\wx29b\docs\htmlhelp\wx.chm copy %WXWIN%\docs\doxygen\out\wx.chm \wx\inno\wx29b\docs\htmlhelp\wx.chm
cd %WXWIN%\build\script cd %WXWIN%\build\script
iscc wxwidgets.iss >> c:\temp.log iscc wxwidgets.iss >> c:\temp.log

View File

@@ -1,17 +1,19 @@
; Script generated by the Inno Setup Script Wizard. ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define INNODIR GetENV("INNO")
#if GetEnv("WXW_VER") == "CVS" #if GetEnv("WXW_VER") == "CVS"
#define INFOFILE "C:\wx\inno\wx29b\BuildSVN.txt" #define INFOFILE GetENV("INNO") + "\BuildSVN.txt"
#define WX_VERSION "SVN" #define WX_VERSION "SVN"
#else #else
#define INFOFILE "C:\wx\inno\wx29b\docs\msw\install.txt" #define INFOFILE GetENV("INNO") + "\docs\msw\install.txt"
#define WX_VERSION GetENV("WXW_VER") #define WX_VERSION GetENV("WXW_VER")
#endif #endif
#define SETUPFILENAME "wxMSW-" + GetENV("WXW_VER") + "-Setup" #define SETUPFILENAME "wxMSW-" + GetENV("WXW_VER") + "-Setup"
#define INNODIR "C:\wx\inno\wx29b"
[Setup] [Setup]
AppName=wxWidgets AppName=wxWidgets