fixed deadlock when calling wxPostEvent() from worker thread

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index ecad3115509bc0c57c5c716096037a44acbf974b..78c8654efe031147b5020d3e11519f2416a51505 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -1,4 +1,16 @@
-#!/bin/sh
+#!/bin/bash
+
+# Are we using bash on win32?  If so source that file and then exit.
+if [ "$OSTYPE" = "cygwin" ]; then
+    source b.win32
+    exit
+fi
+
+# make it easy to switch versions of SWIG
+if [ "$SWIG" = "" ]; then
+  SWIG=/opt/swig/bin/swig-1.3.29
+fi
+

 
 function getpyver {
     if [ "$1" = "15" ]; then
 
 function getpyver {
     if [ "$1" = "15" ]; then


@@ -9,6 +21,12 @@ function getpyver {
        PYVER=2.1
     elif [ "$1" = "22" ]; then
        PYVER=2.2
        PYVER=2.1
     elif [ "$1" = "22" ]; then
        PYVER=2.2

+    elif [ "$1" = "23" ]; then
+       PYVER=2.3
+    elif [ "$1" = "24" ]; then
+       PYVER=2.4
+    elif [ "$1" = "25" ]; then
+       PYVER=2.5

     else
        echo You must specify Python version as first parameter.
         exit
     else
        echo You must specify Python version as first parameter.
         exit


@@ -22,53 +40,71 @@ python$PYVER -c "import sys;print '\n', sys.version, '\n'"
 
 
 SETUP="python$PYVER -u setup.py"
 
 
 SETUP="python$PYVER -u setup.py"

-FLAGS="USE_SWIG=1 IN_CVS_TREE=1" # BUILD_GLCANVAS=0"
+FLAGS="USE_SWIG=1 SWIG=$SWIG" 

 OTHERFLAGS=""
 OTHERFLAGS=""

+PORTFLAGS=""
+UNIFLAG="UNICODE=1"
+
+
+
+if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
+    PORTFLAGS="WXPORT=gtk"
+    UNIFLAG="UNICODE=0"
+    shift
+elif [ "$1" = "gtk2" ]; then 
+    PORTFLAGS="WXPORT=gtk2"
+    UNIFLAG="UNICODE=1"
+    shift
+fi
+
+for p in $*; do
+    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
+       UNIFLAG=""
+       break
+    fi
+done
+
+FLAGS="$FLAGS $PORTFLAGS $UNIFLAG"

 
 
 
 # "c" --> clean
 if [ "$1" =  "c" ]; then
     shift
 
 
 
 # "c" --> clean
 if [ "$1" =  "c" ]; then
     shift

-    CMD="$SETUP $FLAGS $OTHERFLAGS clean"
-    OTHERCMD="rm -f wxPython/*.so"
+    CMD="$SETUP $FLAGS $OTHERFLAGS clean $*"
+    OTHERCMD="rm -f wx/*.so"

 
 # "d" --> clean extension modules only
 elif [ "$1" = "d" ]; then
     shift
 
 # "d" --> clean extension modules only
 elif [ "$1" = "d" ]; then
     shift

-    CMD="rm -f wxPython/*.so"
+    CMD="rm -f wx/*.so"

 
 # "t" --> touch *.i files
 elif [ "$1" = "t" ]; then
     shift
 
 # "t" --> touch *.i files
 elif [ "$1" = "t" ]; then
     shift

-    #CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i"
-    CMD='find . -name "*.i" | xargs -l touch'
+    CMD='find . -name "*.i" | xargs touch'

 
 # "i" --> install
 elif [ "$1" = "i" ]; then
     shift
 
 # "i" --> install
 elif [ "$1" = "i" ]; then
     shift

-    CMD="$SETUP build $OTHERFLAGS install"
+    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext install $*"

 
 # "s" --> source dist
 elif [ "$1" = "s" ]; then
     shift
 
 # "s" --> source dist
 elif [ "$1" = "s" ]; then
     shift

-    CMD="$SETUP $OTHERFLAGS sdist"
+    CMD="$SETUP $OTHERFLAGS sdist $*"

 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
     WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
     WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`

-    for VER in 15 20 21; do
+    for VER in 21 22; do

        getpyver $VER
 
        echo "*****************************************************************"
        echo "*******      Building wxPython for Python $PYVER"
        echo "*****************************************************************"
 
        getpyver $VER
 
        echo "*****************************************************************"
        echo "*******      Building wxPython for Python $PYVER"
        echo "*****************************************************************"
 

-       # NOTE:  This assumes that /usr/local/bin is BEFORE /usr/bin on the PATH
-       #        AND that you have write access to it.
-       rm -f /usr/local/bin/python
-       ln -s /usr/bin/python$PYVER /usr/local/bin/python
-       SETUP="/usr/local/bin/python -u setup.py"
+       SETUP="python$PYVER -u setup.py"

 
        # save the original
        cp setup.py setup.py.save
 
        # save the original
        cp setup.py setup.py.save


@@ -78,13 +114,15 @@ elif [ "$1" = "r" ]; then
        sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
 
        # build wxPython-gl RPM
        sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
 
        # build wxPython-gl RPM

-       $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt
+       $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt --python=python$PYVER
+                       ### --requires=python$PYVER

        rm dist/wxPython-gl*.tar.gz
 
        # Build wxPython RPM
        cp setup.py setup.py.temp
        sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
        rm dist/wxPython-gl*.tar.gz
 
        # Build wxPython RPM
        cp setup.py setup.py.temp
        sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py

-       $SETUP $OTHERFLAGS bdist_rpm --binary-only
+       $SETUP $OTHERFLAGS bdist_rpm --binary-only --python=python$PYVER
+                       ### --requires=python$PYVER

 
        # put the oringal setup.py back
        cp setup.py.save setup.py
 
        # put the oringal setup.py back
        cp setup.py.save setup.py


@@ -95,8 +133,8 @@ elif [ "$1" = "r" ]; then
        mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm
 
     done
        mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm
 
     done

+

     # rebuild the source dists without the munched up setup.py
     # rebuild the source dists without the munched up setup.py

-    $SETUP $OTHERFLAGS sdist

     $SETUP $OTHERFLAGS bdist_rpm --source-only
     exit 0
 
     $SETUP $OTHERFLAGS bdist_rpm --source-only
     exit 0
 


@@ -114,10 +152,12 @@ fi
 
 echo $CMD
 eval $CMD
 
 echo $CMD
 eval $CMD

+RC=$?

 
 

-
-if [ "$OTHERCMD" != "" ]; then
+if [ "$RC" = "0" -a  "$OTHERCMD" != "" ]; then

     echo $OTHERCMD
     $OTHERCMD
     echo $OTHERCMD
     $OTHERCMD

+    RC=$?

 fi
 
 fi
 

+exit $RC