From 517ff47624f9869bfa973b7dbd1c832f638ce299 Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Fri, 24 Apr 2009 08:08:43 +0000
Subject: [PATCH] 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
---
 build/script/win_docs.bat  | 7 ++++---
 build/script/wxwidgets.iss | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index 81413b920b..720cf4e49d 100644
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -14,6 +14,7 @@ echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
 
 set WXWIN=c:\wx\wx29b
 set DAILY=c:\daily
+set INNO=c:\wx\inno\wx29b
 
 rem svn already in my path...
 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
 
 rem now inno
-cd \wx\inno\wx29b >>  c:\temp.log
+cd %INNO% >>  c:\temp.log
 rem Don't update the svn automatically
 rem svn cleanup >>  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
 
 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
 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%
 
 
-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
 cd %WXWIN%\build\script
 iscc wxwidgets.iss >> c:\temp.log
diff --git a/build/script/wxwidgets.iss b/build/script/wxwidgets.iss
index 18c7b965cd..06047a3051 100644
--- a/build/script/wxwidgets.iss
+++ b/build/script/wxwidgets.iss
@@ -1,17 +1,19 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
+#define INNODIR GetENV("INNO")
+
 #if GetEnv("WXW_VER") == "CVS"
-    #define INFOFILE  "C:\wx\inno\wx29b\BuildSVN.txt"
+    #define INFOFILE  GetENV("INNO") + "\BuildSVN.txt"
     #define WX_VERSION "SVN"
 #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")
 #endif
 
 #define SETUPFILENAME  "wxMSW-" + GetENV("WXW_VER") + "-Setup"
 
-#define INNODIR "C:\wx\inno\wx29b"
+
 
 [Setup]
 AppName=wxWidgets