bug 425003: do packaging correctly for mac UB builds. r=rhelmer, patch=me
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 28 Mar 2008 08:05:14 -0400
changeset 13 35a946cb785e6d9742a46668d342ba8215343d0e
parent 12 c2aeed592c379f90752a0a98221c62b54ded4492
child 14 9ebc9aa43402909518e4fed6bb4b66de62d660af
push id1
push userbhearsum@mozilla.com
push dateMon, 07 Apr 2008 12:22:19 +0000
reviewersrhelmer
bugs425003
bug 425003: do packaging correctly for mac UB builds. r=rhelmer, patch=me
mozilla2/master.cfg
--- a/mozilla2/master.cfg
+++ b/mozilla2/master.cfg
@@ -167,21 +167,30 @@ for name in BRANCHES.keys():
         mozilla2_dep_factory.addStep(ShellCommand(
             command=['cat', '.mozconfig'],
         ))
         mozilla2_dep_factory.addStep(Compile(
             command=['make', '-f', 'client.mk', 'build'],
             env=branch['platforms'][platform]['env'],
             haltOnFailure=True
         ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['make', 'package'],
-            workdir='build/%s' % OBJDIR,
-            haltOnFailure=True
-        ))
+        # Getting more conditionals in this loop :(
+        # OS X needs 'make package' run here for universal builds
+        if platform == "macosx":
+            mozilla2_dep_factory.addStep(ShellCommand(
+                command=['make', 'package'],
+                workdir='build/%s/ppc' % OBJDIR,
+                haltOnFailure=True
+            ))
+        else:
+            mozilla2_dep_factory.addStep(ShellCommand(
+                command=['make', 'package'],
+                workdir='build/%s' % OBJDIR,
+                haltOnFailure=True
+            ))
         if platform == "win32":
             mozilla2_dep_factory.addStep(ShellCommand(
                 command=['make', 'installer'],
                 workdir='build/%s' % OBJDIR,
                 haltOnFailure=True
             ))
         mozilla2_dep_factory.addStep(GetBuildID(
                 objdir=OBJDIR
@@ -253,21 +262,30 @@ for name in BRANCHES.keys():
         mozilla2_nightly_factory.addStep(ShellCommand(
             command=['cat', '.mozconfig'],
         ))
         mozilla2_nightly_factory.addStep(Compile(
             command=['make', '-f', 'client.mk', 'build'],
             env=branch['platforms'][platform]['env'],
             haltOnFailure=True
         ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['make', 'package'],
-            workdir='build/%s' % OBJDIR,
-            haltOnFailure=True
-        ))
+        # Getting more conditionals in this loop :(
+        # OS X needs 'make package' run here for universal builds
+        if platform == "macosx":
+            mozilla2_dep_factory.addStep(ShellCommand(
+                command=['make', 'package'],
+                workdir='build/%s/ppc' % OBJDIR,
+                haltOnFailure=True
+            ))
+        else:
+            mozilla2_nightly_factory.addStep(ShellCommand(
+                command=['make', 'package'],
+                workdir='build/%s' % OBJDIR,
+                haltOnFailure=True
+            ))
         if platform == "win32":
             mozilla2_nightly_factory.addStep(ShellCommand(
                 command=['make', 'installer'],
                 workdir='build/%s' % OBJDIR,
                 haltOnFailure=True
             ))
         mozilla2_nightly_factory.addStep(GetBuildID(
                 objdir=OBJDIR