Rename the objdir to objdir-tb so we are correctly ignored by the
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Tue, 15 Jul 2008 17:19:35 -0400
changeset 154 1d192d31873a31463553fecb6e4aef3d801264dc
parent 153 1447b0b143f1c2a7d5931251273754668703dff3
child 155 5746c4dd1bed67fc77657e4478ca51c3e62d7431
push id122
push usergozer@mozillamessaging.com
push dateTue, 15 Jul 2008 21:19:53 +0000
bugs422817
Rename the objdir to objdir-tb so we are correctly ignored by the .hgignore settings (objdir-*) Bug 422817
thunderbird/master.cfg
thunderbird/mozconfig-common
--- a/thunderbird/master.cfg
+++ b/thunderbird/master.cfg
@@ -123,26 +123,26 @@ trunk_unix_steps = [
     s(Configure,
       workdir="mozilla",
       command=["make", "-f", "client.mk", "configure",]),
     s(Compile, 
       workdir="mozilla",
       command=["make", "-f", "client.mk", "build",]),
 #    s(ShellCommand, name="make buildsymbols",
 #      command=["make", "buildsymbols"],
-#      workdir="mozilla/objdir",
+#      workdir="mozilla/objdir-tb",
 #    ),
     s(MozillaCheck,
       warnOnWarnings=True,
       timeout=60*30,
-      workdir="mozilla/objdir/mailnews",
+      workdir="mozilla/objdir-tb/mailnews",
     ),
 #    s(ShellCommand, name="make package",
 #        command=["make", "package"],
-#        workdir="mozilla/objdir"),
+#        workdir="mozilla/objdir-tb"),
 ]
 
 trunk_unix_builder = {
     'name': "TB-Linux-Dep-Check",
     'slavenames': ['momo-vm-02'],
     'builddir': "trunk-unix",
     'factory': factory.BuildFactory(trunk_unix_steps),
     'category': "default",
@@ -173,26 +173,26 @@ trunk_osx_steps = [
     s(Configure,
       workdir="mozilla",
       command=["make", "-f", "client.mk", "configure",]),
     s(Compile,
       workdir="mozilla",
       command=["make", "-f", "client.mk", "build",]),
 #    s(ShellCommand, name="make buildsymbols",
 #      command=["make", "buildsymbols"],
-#      workdir="mozilla/objdir",
+#      workdir="mozilla/objdir-tb",
 #    ),
     s(MozillaCheck,
       warnOnWarnings=True,
       timeout=60*30,
-      workdir="mozilla/objdir/mailnews",
+      workdir="mozilla/objdir-tb/mailnews",
     ),
 #    s(ShellCommand, name="make package",
 #        command=["make", "package"],
-#        workdir="mozilla/objdir"),
+#        workdir="mozilla/objdir-tb"),
 ]
 
 trunk_osx_builder = {
     'name': "TB-Darwin-Dep-Check",
     'slavenames': ['momo-vm-05'],
     'builddir': "trunk-osx",
     'factory': factory.BuildFactory(trunk_osx_steps),
     'category': "default",
@@ -221,22 +221,22 @@ trunk_win32_steps = [
     s(Configure,
       workdir="mozilla",
       command=["make", "-f", "client.mk", "configure",]),
     s(Compile,
       workdir="mozilla",
       command=["make", "-f", "client.mk", "build",]),
 #    s(ShellCommand, name="make buildsymbols",
 #      command=["make", "buildsymbols"],
-#      workdir="mozilla/objdir",
+#      workdir="mozilla/objdir-tb",
 #    ),
     s(MozillaCheck,
       warnOnWarnings=True,
       timeout=60*30,
-      workdir="mozilla/objdir/mailnews",
+      workdir="mozilla/objdir-tb/mailnews",
     ),
 
 ]
 
 trunk_win32_builder = {
     'name': "TB-Win32-Dep-Check",
     'slavenames': ['momo-vm-04'],
     'builddir': "trunk-win32",
--- a/thunderbird/mozconfig-common
+++ b/thunderbird/mozconfig-common
@@ -1,13 +1,13 @@
 . $topsrcdir/mail/config/mozconfig
 
 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_MAKE_FLAGS=-j3
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb
 
 ac_add_options --enable-application=mail
 
 ac_add_options --enable-tests
 ac_add_options --enable-shared
 ac_add_options --disable-static
 
 ac_add_options --enable-optimize