Some build tweaks

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

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index 24f66ead48a8b412fa7c8399093ec76c6c38e4b3..45ca897cff0521df555bf54057f31985081b0319 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -64,7 +64,6 @@ config.UPLOAD_PREVIEW_ROOT = "/home/crew/robind/public_html/wxPython/preview"
 
 # defaults for build options
 config.KIND = "dryrun"
 
 # defaults for build options
 config.KIND = "dryrun"

-config.PYVER = "2.3"

 config.skipsource = "no"
 config.onlysource = "no"
 config.skipdocs = "no"
 config.skipsource = "no"
 config.onlysource = "no"
 config.skipdocs = "no"


@@ -94,7 +93,9 @@ initialTask = Task([ Job("", ["distrib/all/build-setup", CFGFILE]),
 # Build tasks.  Anything that can be done in parallel (depends greatly
 # on the nature of the build machine configurations...) is a separate
 # task.
 # Build tasks.  Anything that can be done in parallel (depends greatly
 # on the nature of the build machine configurations...) is a separate
 # task.

-windowsTask = Task( Job("beast", ["distrib/all/build-windows", CFGFILE]) )
+windowsTask = Task( [Job("beast", ["distrib/all/build-windows", CFGFILE, "2.3"]),
+                     Job("beast", ["distrib/all/build-windows", CFGFILE, "2.4"])
+                    ])

 
 jaguarTask =  Task( Job(config.OSX_HOST_jaguar,
                         ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_jaguar, "jaguar"]) )
 
 jaguarTask =  Task( Job(config.OSX_HOST_jaguar,
                         ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_jaguar, "jaguar"]) )


@@ -102,16 +103,24 @@ jaguarTask =  Task( Job(config.OSX_HOST_jaguar,
 pantherTask =  Task( Job(config.OSX_HOST_panther,
                          ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther"]) )
 
 pantherTask =  Task( Job(config.OSX_HOST_panther,
                          ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther"]) )
 

-rpmTask = Task([ Job("co-rh9",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "config"]),
-                 Job("co-fc2",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.3"]),
-                 Job("co-mdk92",  ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.3"]),
-                 Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
-                 ])
+rpmTask1 = Task([ Job("co-rh9",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "2.3"]),
+                  Job("co-rh9",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "2.4"]),
+                  Job("co-fc2",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.3"]),
+                  Job("co-fc2",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.4"]),
+                  ])
+
+rpmTask2 = Task([
+                  Job("co-mdk92",  ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.3"]),
+                  Job("co-mdk92",  ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.4"]),
+                  Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
+                  Job("co-mdk101", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.4"]),
+                  ])

 
 buildTasks = [ windowsTask,
                jaguarTask,
                pantherTask,
 
 buildTasks = [ windowsTask,
                jaguarTask,
                pantherTask,

-               rpmTask,
+               rpmTask1,
+               rpmTask2,

                ]
 
 # Finalization.  This is for things that must wait until all the
                ]
 
 # Finalization.  This is for things that must wait until all the


@@ -132,10 +141,6 @@ def usage():
     print "   release      Do a normal release (cantidate) build, copy to starship"
     print ""
     print "optional command flags:"
     print "   release      Do a normal release (cantidate) build, copy to starship"
     print ""
     print "optional command flags:"

-    print "   2.2          Build for Python 2.2 (default=off)"
-    print "   2.3          Build for Python 2.3 (default=on)"
-    print "   all          Build for all supported Python versions"
-    print ""

     print "   skipsource   Don't build the source archives, use the ones"
     print "                already in the staging dir."
     print "   onlysource   Exit after building the source and docs archives"
     print "   skipsource   Don't build the source archives, use the ones"
     print "                already in the staging dir."
     print "   onlysource   Exit after building the source and docs archives"


@@ -163,11 +168,6 @@ def main(args):
         if flag in ["dryrun", "daily", "release"]:
             config.KIND = flag
 
         if flag in ["dryrun", "daily", "release"]:
             config.KIND = flag
 

-        elif flag in ["2.2", "2.3"]:
-            config.PYVER = flag
-        elif flag == "all":
-            config.PYVER = "2.2 2.3"
-

         elif flag == "skipsource":
             config.skipsource = "yes"
             
         elif flag == "skipsource":
             config.skipsource = "yes"
             

diff --git a/wxPython/distrib/all/build-windows b/wxPython/distrib/all/build-windows
index d8b70d2db46b0e4d979fd856925f84c69f66bde7..989e4e2eba632d2d7bfaa263a05ddca8ad675941 100755 (executable)
--- a/wxPython/distrib/all/build-windows
+++ b/wxPython/distrib/all/build-windows
@@ -6,6 +6,7 @@ set -o errexit
 # read the config variables from the file given on the command line
 . $1
 
 # read the config variables from the file given on the command line
 . $1
 

+PYVER=$2

 
 if [ $skipwin != yes ]; then
     # test if the target machine is online
 
 if [ $skipwin != yes ]; then
     # test if the target machine is online

diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows
index cd40bdb2bffc44868022898b4eaca6012251be50..66ebe3cc2f44b9dff54b5f2e3cda2673422b23dc 100755 (executable)
--- a/wxPython/distrib/all/do-build-windows
+++ b/wxPython/distrib/all/do-build-windows
@@ -27,8 +27,7 @@ WXDIR=$1
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4

-shift;shift;shift;shift
-PYVER=$@
+PYVER=$5

 
 
 # WXDIR is the cygwin path, WXWIN is the DOS path
 
 
 # WXDIR is the cygwin path, WXWIN is the DOS path


@@ -45,6 +44,17 @@ export WXWIN
 # echo "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 # exit 0
 
 # echo "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 # exit 0
 

+# setup the compiler
+if [ $PYVER = 2.3 ]; then
+    echo "Using MSVC ver 6"
+    . msvcset local 6
+    echo `which cl.exe`
+else
+    echo "Using MSVC ver 7"
+    . msvcset local 7
+    echo `which cl.exe`
+fi
+

 
 # untar the source 
 echo "Unarchiving wxPython-src-$VERSION.tar.gz"
 
 # untar the source 
 echo "Unarchiving wxPython-src-$VERSION.tar.gz"


@@ -64,6 +74,7 @@ unix2dos -D $names
 echo "Setting up for the build..."
 cd $WXDIR/build/msw
 cp $WXDIR/wxPython/distrib/msw/.m* .
 echo "Setting up for the build..."
 cd $WXDIR/build/msw
 cp $WXDIR/wxPython/distrib/msw/.m* .

+chmod +x .m*

 
 
 # replace some settings in setup0.h and write to setup.h
 
 
 # replace some settings in setup0.h and write to setup.h