Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor build tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-01-04 04:19:46 +00:00
parent 5c38b2916b
commit 3b4cc84765
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wxPython/b
View File

@@ -9,6 +9,8 @@ function getpyver {
PYVER=2.1 PYVER=2.1
elif [ "$1" = "22" ]; then elif [ "$1" = "22" ]; then
PYVER=2.2 PYVER=2.2
elif [ "$1" = "23" ]; then
PYVER=2.3
else else
echo You must specify Python version as first parameter. echo You must specify Python version as first parameter.
exit exit
@@ -30,7 +32,7 @@ OTHERFLAGS=""
# "c" --> clean # "c" --> clean
if [ "$1" = "c" ]; then if [ "$1" = "c" ]; then
shift shift
CMD="$SETUP $FLAGS $OTHERFLAGS clean" CMD="$SETUP $FLAGS $OTHERFLAGS clean $*"
OTHERCMD="rm -f wxPython/*.so" OTHERCMD="rm -f wxPython/*.so"
# "d" --> clean extension modules only # "d" --> clean extension modules only
@@ -47,12 +49,12 @@ elif [ "$1" = "t" ]; then
# "i" --> install # "i" --> install
elif [ "$1" = "i" ]; then elif [ "$1" = "i" ]; then
shift shift
CMD="$SETUP $FLAGS $OTHERFLAGS install" CMD="$SETUP $FLAGS $OTHERFLAGS install $*"
# "s" --> source dist # "s" --> source dist
elif [ "$1" = "s" ]; then elif [ "$1" = "s" ]; then
shift shift
CMD="$SETUP $OTHERFLAGS sdist" CMD="$SETUP $OTHERFLAGS sdist $*"
# "r" --> rpm dist # "r" --> rpm dist
elif [ "$1" = "r" ]; then elif [ "$1" = "r" ]; then

18
wxPython/setup.py
View File

@@ -240,11 +240,7 @@ if FINAL:
HYBRID = 0 HYBRID = 0
if UNICODE and WXPORT not in ['msw', 'gtk2']: if UNICODE and WXPORT not in ['msw', 'gtk2']:
raise SystemExit, "UNICODE mode not surrently supported on this WXPORT." raise SystemExit, "UNICODE mode not surrently supported on this WXPORT: "+WXPORT
if UNICODE:
BUILD_BASE = BUILD_BASE + '.unicode'
VERSION = VERSION + 'u'
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@@ -389,9 +385,12 @@ elif os.name == 'posix':
WXPLAT = '__WXGTK__' WXPLAT = '__WXGTK__'
GENDIR = 'gtk' # no code differences so use the same generated sources GENDIR = 'gtk' # no code differences so use the same generated sources
portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1] portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1]
BUILD_BASE = BUILD_BASE + '-' + WXPORT
print "got here..."
elif WXPORT == 'x11': elif WXPORT == 'x11':
WXPLAT = '__WXX11__' WXPLAT = '__WXX11__'
portcfg = '' portcfg = ''
BUILD_BASE = BUILD_BASE + '-' + WXPORT
else: else:
raise SystemExit, "Unknown WXPORT value: " + WXPORT raise SystemExit, "Unknown WXPORT value: " + WXPORT
@@ -429,6 +428,15 @@ else:
raise 'Sorry Charlie...' raise 'Sorry Charlie...'
#----------------------------------------------------------------------
# post platform setup checks and tweaks
#----------------------------------------------------------------------
if UNICODE:
BUILD_BASE = BUILD_BASE + '.unicode'
VERSION = VERSION + 'u'
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Check if the version file needs updated # Check if the version file needs updated
#---------------------------------------------------------------------- #----------------------------------------------------------------------