Adding Linux and Mac build steps, and updating some build-environ.cfg options.

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

diff --git a/distrib/scripts/build-environ.cfg b/distrib/scripts/build-environ.cfg
index 51c3c10a6ea3994a1d21b252194aa05966332d10..e2073c7c976feb36f6c1572138542c94626c1d8e 100644 (file)
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -3,14 +3,18 @@
 # you should create your own settings file and specify that to create-release.sh.
 
 # host name of the machine to use for windows builds
-WIN_HOST=192.168.1.105
+WIN_HOST=192.168.1.104
 
 # Where is the build dir from the remote machine's perspective?
-WIN_BUILD="/cygdrive/c/wx2dev"
+WIN_BUILD=/cygdrive/c/wx2dev
 
-LINUX_HOST=192.168.1.106
+LINUX_HOST=192.168.1.105
 
-LINUX_BUILD=/home/kevino/wx2dev
+LINUX_BUILD=~/wx2dev
+
+MAC_HOST=192.168.1.103
+
+MAC_BUILD=~/wx2dev
 
 # the local spot that we put everything when done, before possibly copying 
 # to remote hosts
@@ -26,11 +30,18 @@ WX_TEMP_DIR=/tmp/wx-temp
 BUILD_VERSION=2.7.0
 BUILD_TAG=HEAD
 
-KIND="daily"
+KIND=daily
+
+### Windows defines ###
 
 # so we can setup the Windows dev environment if it is not already done
 MSVS7_DIR="C:/Program Files/Microsoft Visual Studio 2003"
-MSVC_VERSION=7
+NET_FrameworkDir="C:/Windows/Microsoft.NET/Framework"
+
+MSVS6_DIR="C:/Program Files/Microsoft Visual Studio"
+MSPSDK_DIR="C:/Program Files/Microsoft Platform SDK"
+
+### End Windows defines ###
 
 # Default build settings
 skipwin=no
@@ -39,7 +50,7 @@ skiplinux=no
 setup_msvc_for_cygwin=yes
 
 # this can take time too, so turn it off if we know we don't need to.
-rebake="no"
+rebake=yes
 
 # If building is successful, delete temp files?
-delete_temps="no"
\ No newline at end of file
+delete_temps=no
\ No newline at end of file

diff --git a/distrib/scripts/build_controller.py b/distrib/scripts/build_controller.py
index 736c545be73197450fe0f19e37e9846c060359f9..d960eb71a83efdcacd66470e9cb36761b92ab4b3 100644 (file)
--- a/distrib/scripts/build_controller.py
+++ b/distrib/scripts/build_controller.py
@@ -45,6 +45,8 @@ if myconfig:
     
 tasks = Task([ Job("pre-flight", "./scripts/pre-flight.sh", env=config_env), 
                Job("win_build", "./scripts/build-windows.sh", env=config_env),
+               Job("lin_build", "./scripts/build-linux.sh", env=config_env),
+               Job("mac_build", "./scripts/build-mac.sh", env=config_env),
              ])
              
 print "Build getting started at: ", time.ctime()