From 12886cd8688ee8ed887f361a177e40272b68fe90 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 27 Dec 2012 03:07:05 +0000 Subject: [PATCH] Use 'linux' for the platform name no matter if the real platform name is 'linux2', 'linux3' or just 'linux' git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- bin/build-sip-posix | 3 ++- build.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/build-sip-posix b/bin/build-sip-posix index 12e6c96e..f9309f80 100755 --- a/bin/build-sip-posix +++ b/bin/build-sip-posix @@ -15,7 +15,8 @@ MYBINDIR=$(dirname $(readlink -f $0)) cd $PROJECTS/sip/sip SIPVER=`$PYTHON configure.py --version | grep -v "This is SIP"` -PLATFORM=`$PYTHON -c "import sys; print sys.platform"` +PLATFORM=`$PYTHON -c "import sys; platform = 'linux' if sys.platform.startswith('linux') else sys.platform; print(platform)"` +echo $PLATFORM if [ "$PLATFORM" = "darwin" ]; then # try to ensure compatiblity back to 10.5 if we can diff --git a/build.py b/build.py index 6640e8b7..8006de7d 100755 --- a/build.py +++ b/build.py @@ -58,7 +58,7 @@ sipCurrentVersion = '4.14.1' sipMD5 = { 'darwin' : '40854cc412e486909a289c1ffcd4e633', 'win32' : 'acfd4033565c754895e658b9fa993a56', - 'linux2' : '11fe8b21434d67b024ef204351877e79', + 'linux' : '11fe8b21434d67b024ef204351877e79', } wafCurrentVersion = '1.6.11' @@ -68,7 +68,7 @@ doxygenCurrentVersion = '1.8.2' doxygenMD5 = { 'darwin' : '96a3012d97893f4e05387cda544de0e8', 'win32' : '71f97ebaa87171c824a7742de5bf3381', - 'linux2' : '6fca3d2016f8019a7737716eee4d5377', + 'linux' : '6fca3d2016f8019a7737716eee4d5377', } # And the location where they can be downloaded from @@ -397,7 +397,7 @@ def getTool(cmdName, version, MD5, envVar, platformBinary): return os.environ.get(envVar) else: if platformBinary: - platform = sys.platform + platform = 'linux' if sys.platform.startswith('linux') else sys.platform ext = '' if platform == 'win32': ext = '.exe'