Add MingW as "platform"
authorNathan Letwory <nathan@letworyinteractive.com>
Sat, 28 Apr 2012 08:45:55 +0000 (08:45 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sat, 28 Apr 2012 08:45:55 +0000 (08:45 +0000)
build_files/buildbot/master_unpack.py
build_files/scons/tools/btools.py

index 3df22ad8745c2c1836be4059bdb84b4ced298f3d..f67bd294496a0e2da08166b407f753978907614c 100644 (file)
@@ -48,7 +48,8 @@ def get_platform(filename):
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
-                 'solaris')
+                 'solaris',
+                 'mingw')
     platform_tokens = []
     found = False
 
     platform_tokens = []
     found = False
 
index efc80fcd3c58c9f4ffb947d4e27538162044cf46..c9d31d75e184e377e720220754699da5d77878e4 100644 (file)
@@ -622,7 +622,13 @@ def buildslave(target=None, source=None, env=None):
     else:
         extension = '.tar.bz2'
 
     else:
         extension = '.tar.bz2'
 
-    platform = env['OURPLATFORM'].split('-')[0]
+    if env['OURPLATFORM'] == 'win32-mingw':
+        platform = 'mingw32'
+    elif env['OURPLATFORM'] == 'win32-mingw':
+        platform = 'mingw64'
+    else:
+        platform = env['OURPLATFORM'].split('-')[0]
+
     if platform == 'linux':
         import platform
 
     if platform == 'linux':
         import platform