From 99f792deeab0195ae474097fc2cb25adf2fbd500 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 20 May 2000 19:25:37 +0000 Subject: [PATCH] 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/contrib/stc/stc_.cpp | 2 +- wxPython/distrib/build.py | 18 ++++++++++++------ wxPython/distrib/makerpm | 2 +- wxPython/distrib/wxPython.spec | 22 +++++++++++++--------- wxPython/src/__version__.py | 2 +- wxPython/src/build.cfg | 24 +++++++++++++++++++----- 6 files changed, 47 insertions(+), 23 deletions(-) diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp index f305754f28..f9ac18946f 100644 --- a/wxPython/contrib/stc/stc_.cpp +++ b/wxPython/contrib/stc/stc_.cpp @@ -1,5 +1,5 @@ /* - * FILE : ./stc_.cpp + * FILE : stc_.cpp * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) diff --git a/wxPython/distrib/build.py b/wxPython/distrib/build.py index f6b080a7b7..d23a664a1a 100755 --- a/wxPython/distrib/build.py +++ b/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) diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm index 80b60d0cf9..9173bf7bf8 100755 --- a/wxPython/distrib/makerpm +++ b/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 diff --git a/wxPython/distrib/wxPython.spec b/wxPython/distrib/wxPython.spec index fa99153a9a..18a265ade8 100644 --- a/wxPython/distrib/wxPython.spec +++ b/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 diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index ebf4c4529b..d1f4e8a4f6 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1 +1 @@ -ver = '2.2.16' +ver = '2.1.16' diff --git a/wxPython/src/build.cfg b/wxPython/src/build.cfg index 356d4ff843..5e2c5c0219 100644 --- a/wxPython/src/build.cfg +++ b/wxPython/src/build.cfg @@ -37,21 +37,31 @@ __version__.py: ../distrib/build.py build.cfg """ else: - DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles' + DEFAULTRULE = 'default: $(GENCODEDIR) helperlib $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles' OTHERINSTALLTARGETS = 'installLib installHelpers ' OTHERUNINSTALLTARGETS = 'uninstallLib uninstallHelpers ' #OTHERLFLAGS = '-L. ' OTHERRULES = """ -lib$(HELPERLIB)$(SO) : helpers.o libpy.o +HELPERLIBNAME = lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER).0.0 +helperlib: $(HELPERLIBNAME) + +$(HELPERLIBNAME) : helpers.o libpy.o $(LDSHARED) helpers.o libpy.o $(LFLAGS) -o $@ + ln -s $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER) + ln -s $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO) + ln -s $(HELPERLIBNAME) lib$(HELPERLIB)$(SO) -installHelpers: $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) +installHelpers: $(HELPERLIBDIR)/$(HELPERLIBNAME) -$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) : lib$(HELPERLIB)$(SO) - cp $< $@ +$(HELPERLIBDIR)/$(HELPERLIBNAME) : $(HELPERLIBNAME) + cp $(HELPERLIBNAME) $(HELPERLIBDIR) + cd $(HELPERLIBDIR); \ + ln -sf $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER); \ + ln -sf $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO); \ + ln -sf $(HELPERLIBNAME) lib$(HELPERLIB)$(SO) @echo --------------------------------------------------------- @echo You may have to run ldconfig, or set an environment @echo variable in order for $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) @@ -81,6 +91,10 @@ uninstallLib: uninstallHelpers: rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) + rm -f $(HELPERLIBDIR)/$(HELPERLIBNAME) + rm -f $(HELPERLIBDIR)/lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER) + rm -f $(HELPERLIBDIR)/lib$(HELPERLIB).$(MAJVER)$(SO) + rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) __version__.py: ../distrib/build.py build.cfg