More build/distrib updates

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

wxPython/distrib/build.py

@@ -120,7 +120,10 @@ import sys, os, string, getopt
 # This is really the wxPython version number, and will be placed in the
 # Makefiles for use with the distribution related targets.
 
-__version__ = '2.2.16'
+major_version = '2.1'
+build_version = '16'
+
+__version__ = major_version + '.' + build_version
 
 #----------------------------------------------------------------------------
 
@@ -223,6 +226,8 @@ class BuildConfig:
         base = os.path.join(base, '..')
         self.WXPYDIR = os.path.abspath(base)
         self.VERSION = __version__
+        self.MAJVER = major_version
+        self.BLDVER = build_version
         self.MODULE = ''
         self.SWIGFILES = []
         self.SWIGFLAGS = '-c++ -shadow -python -keyword -dnone -I$(WXPSRCDIR)'
@@ -287,7 +292,7 @@ class BuildConfig:
             self.LFLAGS = '-L$(WXPSRCDIR) `$(WXCONFIG) --libs`'
             self.RMCMD  = '-rm -f '
             self.WXCONFIG = 'wx-config'
-            self.USE_SONAME = '0'
+            self.USE_SONAME = '1'
 
             # **** What to do when I start supporting Motif, etc.???
             self.GENCODEDIR = 'gtk'
@@ -518,6 +523,8 @@ win32Template = '''
 
 WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
+MAJVER = %(MAJVER)s
+BLDVER = %(BLDVER)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
 CFLAGS = %(CFLAGS)s
@@ -703,10 +710,10 @@ unixTemplate = '''
 # lost if the generator is run again.  You have been warned.
 #----------------------------------------------------------------------
 
-
-
 WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
+MAJVER = %(MAJVER)s
+BLDVER = %(BLDVER)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
 CFLAGS = %(CFLAGS)s $(OPT) %(OTHERCFLAGS)s
@@ -766,7 +773,7 @@ endif
 install: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
 
 clean:
-	-rm -f *.o *$(SO) *~
+	-rm -f *.o *$(SO) *$(SO).* *~
 	-rm -f $(TARGET)
 	-rm -f $(BUILDDIR)/$(TARGET)
 %(PYCLEANUP)s
@@ -822,7 +829,6 @@ $(TARGET) : $(OBJECTS)
 	$(LDSHARED) $(OBJECTS) $(LFLAGS) $(LIBS) $(OTHERLIBS) -o $(TARGET)
 
 
-
 pycfiles : $(PYMODULES)
 	$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py -l $(TARGETDIR)
 	$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py -l $(TARGETDIR)

wxPython/distrib/makerpm

@@ -39,5 +39,5 @@ mv /usr/src/redhat/RPMS/*/wxPython*.rpm .
 mv /usr/src/redhat/SRPMS/wxPython*.rpm .
 chown rd:users wxPython*.rpm
 rm -rf /usr/lib/python1.5/site-packages/wxPython/
-rm -f /usr/lib/libwxPyHelpers.so
+rm -f /usr/lib/libwxPyHelpers*
 rm -rf rm -rf /usr/doc/wxPython-$1

wxPython/distrib/wxPython.spec

@@ -40,27 +40,31 @@ OpenGL add on for wxPython.
 %setup
 
 %build
+NOSWIG=1
+export NOSWIG
 cd src
-python ../distrib/build.py -b WXPSRCDIR=$PWD
-cd ../ogl
-python ../../distrib/build.py -b WXPSRCDIR=../../src
+python ../distrib/build.py -b WXPSRCDIR=$PWD USE_SONAME=1
+cd ../contrib/ogl
+python ../../distrib/build.py -b WXPSRCDIR=../../src USE_SONAME=1
 cd ../stc
-python ../../distrib/build.py -b WXPSRCDIR=../../src
-if [ ! -z $NOGLCANVAS ]; then
+python ../../distrib/build.py -b WXPSRCDIR=../../src USE_SONAME=1
+if [ -z $NOGLCANVAS ]; then
     cd ../glcanvas
-    python ../../distrib/build.py -b WXPSRCDIR=../../src
+    python ../../distrib/build.py -b WXPSRCDIR=../../src USE_SONAME=1
 fi
 
 #----------------------------------------------------------------------
 
 %install
+NOSWIG=1
+export NOSWIG
 cd src
 python ../distrib/build.py -i
-cd ../ogl
+cd ../contrib/ogl
 python ../../distrib/build.py -i
 cd ../stc
 python ../../distrib/build.py -i
-if [ ! -z $NOGLCANVAS ]; then
+if [ -z $NOGLCANVAS ]; then
     cd ../glcanvas
     python ../../distrib/build.py -i
 fi
@@ -77,7 +81,7 @@ fi
 
 %files
 %doc BUILD.txt CHANGES.txt README.txt gpl.txt lgpl.txt licence.txt licendoc.txt preamble.txt
-%{pref}/lib/libwxPyHelpers.so
+%{pref}/lib/libwxPyHelpers*
 %{pref}/lib/python1.5/site-packages/wxPython/*.py
 %{pref}/lib/python1.5/site-packages/wxPython/*.py?
 %{pref}/lib/python1.5/site-packages/wxPython/lib