Build/distrib updates

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

diff --git a/wxPython/distrib/DIRLIST b/wxPython/distrib/DIRLIST
index da60abe3b531a8e70187149da588ea6a85bc6874..bff0cf78569949a716b43d0d9aef867f28cc9675 100644 (file)
--- a/wxPython/distrib/DIRLIST
+++ b/wxPython/distrib/DIRLIST
@@ -56,6 +56,11 @@ wxPython/include/wx/wxPython
 wxPython/licence
 wxPython/samples
 wxPython/samples/StyleEditor
+wxPython/samples/docview
+wxPython/samples/docview/activegrid
+wxPython/samples/docview/activegrid/tool
+wxPython/samples/docview/activegrid/tool/data
+wxPython/samples/docview/activegrid/tool/images
 wxPython/samples/doodle
 wxPython/samples/embedded
 wxPython/samples/frogedit

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index 45ca897cff0521df555bf54057f31985081b0319..2fd6d3204804ceb94a8da721013269c70773c0d1 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python -u
 #----------------------------------------------------------------------
 # Name:        build-all.py
 # Purpose:     Master build script for building all the installers and
@@ -73,7 +73,7 @@ config.skiplinux = "no"
 config.skipclean = "no"
 config.skipupload = "no"
 config.skipnewdocs = "no"
-
+config.startcohost = "yes"
 
 #----------------------------------------------------------------------
 # Define all the build tasks
@@ -93,34 +93,31 @@ 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.
-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"]) )
+                        ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_jaguar, "jaguar", "2.3"]) )
 
 pantherTask =  Task( Job(config.OSX_HOST_panther,
-                         ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther"]) )
-
-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,
+                         ["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther", "2.3"]) )
+
+beastTask1 = Task( [Job("beast.23",     ["distrib/all/build-windows", CFGFILE, "2.3"]),
+                    Job("co-rh9.23",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "2.3"]),
+                    Job("beast.24",     ["distrib/all/build-windows", CFGFILE, "2.4"]),
+                    Job("co-rh9.24",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9",   "rh9",   "2.4"]),
+                    ])
+
+beastTask2 = Task([ Job("co-mdk92.23",  ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.3"]),
+                    Job("co-mdk101.23", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
+                    Job("co-fc2.23",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.3"]),
+                    Job("co-mdk92.24",  ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk92", "mdk92", "2.4"]),
+                    Job("co-mdk101.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.4"]),
+                    Job("co-fc2.24",    ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2",   "fc2",   "2.4"]),
+                    ])
+
+buildTasks = [ jaguarTask,
                pantherTask,
-               rpmTask1,
-               rpmTask2,
+               beastTask1,
+               beastTask2,
                ]
 
 # Finalization.  This is for things that must wait until all the
@@ -151,6 +148,9 @@ def usage():
     print "   skipclean    Don't do the cleanup step on the remote builds"
     print "   skipupload   Don't upload the builds to starship"
     print ""
+    print "   nocohost     Don't start the coLinux sessions if they are"
+    print "                not already online"
+    print ""
     
 
 #----------------------------------------------------------------------
@@ -194,6 +194,9 @@ def main(args):
             
         elif flag == "skipupload":
             config.skipupload = "yes"
+
+        elif flag == "nocohost":
+            config.startcohost = "no"
             
         else:
             print 'Unknown flag: "%s"' % flag

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index 3bbb287c2688b4cf338c104f47037c60f68b599c..eb4dae3f61f6701942b4d332dbb0bd360dd3dc71 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -9,6 +9,7 @@ set -o errexit
 
 host=$2
 flavor=$3
+pyver=$4
 
 if [ $skiposx != yes ]; then
     # test if the target machine is online
@@ -31,7 +32,7 @@ if [ $skiposx != yes ]; then
     echo "Running build script on $host..."
     wxdir=$OSX_BUILD/wxPython-src-$VERSION
     cmd=./do-build-osx
-    ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $flavor $PYVER && rm $cmd"
+    ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $flavor $pyver && rm $cmd"
     
     echo "Fetching the results..."
     scp "root@$host:$OSX_BUILD/wxPython*-osx*"  $STAGING_DIR

diff --git a/wxPython/distrib/all/build-rpm b/wxPython/distrib/all/build-rpm
index f53be94cdcb8d80062a500e95705f927bf3069a2..66e9afaed7ba785b8d768eb95b9276899ea2fb83 100755 (executable)
--- a/wxPython/distrib/all/build-rpm
+++ b/wxPython/distrib/all/build-rpm
@@ -39,14 +39,14 @@ if [ $skiplinux != yes ]; then
        hostAvailable=yes
     else
        # Attempt to start the host via it's coLinux host, if there is one
-       if [ $coHost != none ]; then 
+       if [ $coHost != none -a $startcohost == yes ]; then 
            if TestOnline $coHost; then
                echo "Attempting to start $host via coLinux on $coHost..."
                ssh $coHost "/c/coLinux/VMs/$host.bat -d > /dev/null 2>&1 &"
 
                # Give it time to boot and be ready for conenctions,
                # and then test with ssh, limiting retries.
-               for x in `seq 12`; do
+               for x in `seq 36`; do
                    sleep 5
                    echo "checking..."
                    if ssh root@$host "true" >/dev/null 2>&1; then

diff --git a/wxPython/distrib/all/do-build-rpm b/wxPython/distrib/all/do-build-rpm
index 910f09a6ca6e736df756a23d7d8ab59e77ab2327..6a0bf692de5f8e4701b416ba904c920fff5d006a 100755 (executable)
--- a/wxPython/distrib/all/do-build-rpm
+++ b/wxPython/distrib/all/do-build-rpm
@@ -74,9 +74,12 @@ cp wxPython-src-$VERSION.tar.gz $rpmtop/SOURCES
 echo "******************** PYVER = " $PYVER
 for ver in $PYVER; do 
     echo "Building the RPMs for Python $ver..."
-    DoRPMBuild $ver gtk  0
-    DoRPMBuild $ver gtk2 1
+
+    ## for now let's just do the gtk2 builds
+    ##DoRPMBuild $ver gtk  0
+
     DoRPMBuild $ver gtk2 0
+    DoRPMBuild $ver gtk2 1
 done
 
 

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index 079418659f9de41ea453a16a50ea9542e3903568..cec6f78b3c7fd494357693c4e2a4119c572dae3f 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -230,9 +230,9 @@ if [ $skipbuild != yes ]; then
     if [ "$UID" = "0" ]; then
        chmod a+w lib
        if [ "$CHARTYPE" = "ansi" ]; then
-           su robind -c "make lib/libwx_macd-2.5.3.r"
+           su robind -c "make lib/libwx_macd-2.5.4.r"
        else
-           su robind -c "make lib/libwx_macud-2.5.3.r"
+           su robind -c "make lib/libwx_macud-2.5.4.r"
        fi
     fi
 

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 488099633c800bab866835e41562c0bad7d900f6..1e917eb165eaebef9c66e7f3059e77e96e2dbea5 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -405,6 +405,12 @@ Source: "samples\doodle\*.bat";             DestDir: "{app}\samples\doodle";
 Source: "samples\doodle\sample.ddl";        DestDir: "{app}\samples\doodle"; 
 Source: "samples\doodle\superdoodle.iss";   DestDir: "{app}\samples\doodle"; 
 
+Source: "samples\docview\*.py";                          DestDir: "{app}\samples\docview"; 
+Source: "samples\docview\activegrid\*.py";               DestDir: "{app}\samples\docview\activegrid"; 
+Source: "samples\docview\activegrid\tool\*.py";          DestDir: "{app}\samples\docview\activegrid\tool"; 
+Source: "samples\docview\activegrid\tool\data\*.txt";    DestDir: "{app}\samples\docview\activegrid\tool\data"; 
+Source: "samples\docview\activegrid\tool\images\*.jpg";  DestDir: "{app}\samples\docview\activegrid\tool\images"; 
+
 Source: "samples\embedded\*.py";            DestDir: "{app}\samples\embedded"; 
 Source: "samples\embedded\*.cpp";           DestDir: "{app}\samples\embedded"; 
 Source: "samples\embedded\*.txt";           DestDir: "{app}\samples\embedded";