From d1640f9bd569cb381733983153fd917a49755c16 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 16 Oct 2000 23:08:16 +0000
Subject: [PATCH] More tweaking.  Demo shows python version in about box, build
 script easier to use but lots smarter...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/b             | 40 +++++++++++++++++++++++++++++++++++++++-
 wxPython/demo/About.py | 10 +++++++---
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/wxPython/b b/wxPython/b
index 8efbf89407..a8966dbf2c 100755
--- a/wxPython/b
+++ b/wxPython/b
@@ -1,3 +1,41 @@
 #!/bin/sh
-python -u setup.py USE_SWIG=1 IN_CVS_TREE=1 build_ext --inplace $*
+
+SETUP="python$PYVER -u setup.py"
+FLAGS="USE_SWIG=1 IN_CVS_TREE=1"
+
+# "c" --> clean
+if [ "$1" =  "c" ]; then
+    shift
+    CMD="$SETUP $FLAGS clean"
+    OTHERCMD="rm -f wxPython/*.so"
+
+# "i" --> install
+elif [ "$1" = "i" ]; then
+    shift
+    CMD="$SETUP build install"
+
+# "s" --> source dist
+elif [ "$1" = "s" ]; then
+    shift
+    CMD="$SETUP sdist"
+
+# "r" --> rpm dist
+elif [ "$1" = "r" ]; then
+    shift
+    CMD="$SETUP bdist_rpm"
+
+# (no command arg) --> normal build for development
+else
+    CMD="$SETUP $FLAGS build_ext --inplace $*"
+fi
+
+
+echo $CMD
+$CMD
+
+
+if [ "$OTHERCMD" != "" ]; then
+    echo $OTHERCMD
+    $OTHERCMD
+fi
 
diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index dff908655f..baf208298c 100644
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -1,3 +1,4 @@
+import sys, string
 
 from   wxPython.wx       import *
 from   wxPython.html     import *
@@ -12,7 +13,9 @@ class MyAboutBox(wxDialog):
 <center><table bgcolor="#458154" width="100%%" cellspacing="0"
 cellpadding="0" border="1">
 <tr>
-    <td align="center"><h1>wxPython %s</h1></td>
+    <td align="center"><h1>wxPython %s</h1>
+    Running on Python %s
+    </td>
 </tr>
 </table>
 
@@ -42,9 +45,10 @@ demo item so you can learn how to use the classes yourself.</p>
     def __init__(self, parent):
         wxDialog.__init__(self, parent, -1, 'About the wxPython demo',)
         html = wxHtmlWindow(self, -1, size=(420, -1))
-        html.SetPage(self.text % wx.__version__)
+        py_version = string.split(sys.version)[0]
+        html.SetPage(self.text % (wx.__version__, py_version))
         ir = html.GetInternalRepresentation()
-        html.SetSize( (ir.GetWidth(), ir.GetHeight()) )
+        html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
         self.SetClientSize(html.GetSize())
         self.CentreOnParent(wxBOTH)