From 720286111be7203bff5f01fa81248ef0b4c8f9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= <jaakko.keranen@iki.fi>
Date: Mon, 28 Apr 2014 07:05:04 +0300
Subject: [PATCH] Fixed|Builder: Generate feed with the new OS X Apps packages

---
 distrib/builder/event.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/distrib/builder/event.py b/distrib/builder/event.py
index 21e6c44a91..41cd2bcd5a 100644
--- a/distrib/builder/event.py
+++ b/distrib/builder/event.py
@@ -41,6 +41,7 @@ def __init__(self, build=None, latestAvailable=False):
         self.packages = ['doomsday', 'doomsday_app', 'doomsday_shell_app', 'fmod']
         
         self.packageName = {'doomsday':           'Doomsday',
+                            'doomsday_apps':      'OS X Apps',
                             'doomsday_app':       'Doomsday Engine.app',
                             'doomsday_shell_app': 'Doomsday Shell.app',
                             'fmod':               'FMOD Ex Audio Plugin'}
@@ -48,10 +49,8 @@ def __init__(self, build=None, latestAvailable=False):
         if self.num >= 816: # Added Mac OS X 10.8.
             # Platforms:  Name                              File ext          sys_id()
             self.oses = [('Windows (x86)',                 '.exe',           'win32-32bit'),
-                         ('OS X 10.8+ Apps (x86_64)',      'apps-macx8.dmg', 'macx8-64bit'),
-                         ('OS X 10.8+ (x86_64)',           '.dmg',           'macx8-64bit'),
-                         ('OS X 10.6+ Apps (x86_64/i386)', 'apps-macx6.dmg', 'darwin-64bit'),
-                         ('OS X 10.6+ (x86_64/i386)',      'mac10_6.dmg',    'darwin-64bit'),
+                         ('OS X 10.8+ (x86_64)',           ('.dmg', 'macx8.dmg'), 'macx8-64bit'),
+                         ('OS X 10.6+ (x86_64/i386)',      ('mac10_6.dmg', 'macx6.dmg'), 'darwin-64bit'),
                          ('OS X 10.4+ (ppc/i386)',         '32bit.dmg',      'darwin-32bit'),
                          ('Ubuntu (x86_64)',               'amd64.deb',      'linux2-64bit'),
                          ('Ubuntu (x86)',                  'i386.deb',       'linux2-32bit'),
@@ -95,6 +94,7 @@ def package_type(self, name):
             return 'distribution'
 
     def package_from_filename(self, name):
+        if 'apps-macx' in name: return 'doomsday_apps'
         if name.endswith('.zip'):
             if 'doomsday_osx' in name:
                 return 'doomsday_app'
@@ -107,9 +107,14 @@ def package_from_filename(self, name):
     
     def os_from_filename(self, name):
         found = None
-        for n, ext, ident in self.oses:
-            if name.endswith(ext) or ident in name:
-                found = (n, ext, ident)
+        for n, osExt, ident in self.oses:
+            if type(osExt) == 'tuple':
+                exts = osExt
+            else:
+                exts = [osExt]
+            for ext in exts:
+                if name.endswith(ext) or ident in name:
+                    found = (n, ext, ident)
             if n.startswith('OS X 10.') and name.endswith('.zip'):
                 osx = '_osx' + n[8] + '_'
                 if osx in name: