Bug 725429 - Clean up *makefiles.sh, Feb 2012 edition; rs=build
authorEd Morley <bmo@edmorley.co.uk>
Fri, 10 Feb 2012 12:40:30 +0000
changeset 89492 7bbb3087e97177eddc594ae67f86d76fb4570cf8
parent 89491 065f503a9ea2bd923c652fa8c2bdf3dbce381a87
child 89493 f8e9d1339b7b1eb85a0a7d9c229539a85aba1775
push id783
push userlsblakk@mozilla.com
push dateTue, 24 Apr 2012 17:33:42 +0000
treeherdermozilla-beta@11faed19f136 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbuild
bugs725429
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 725429 - Clean up *makefiles.sh, Feb 2012 edition; rs=build mobile/android/makefiles.sh & b2g/makefiles.sh were hg copied from mobile/makefiles.sh prior to it's original cleanup and then move, so most of the changes to them here are just to sync them with mobile/xul/makefiles.sh.
allmakefiles.sh
b2g/makefiles.sh
browser/makefiles.sh
mobile/android/makefiles.sh
mobile/xul/makefiles.sh
toolkit/toolkit-makefiles.sh
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -63,16 +63,17 @@ build/pgo/Makefile
 build/pgo/blueprint/Makefile
 build/pgo/js-input/Makefile
 config/Makefile
 config/autoconf.mk
 config/nspr/Makefile
 config/doxygen.cfg
 config/expandlibs_config.py
 config/tests/src-simple/Makefile
+mfbt/Makefile
 probes/Makefile
 extensions/Makefile
 "
 
 if [ ! "$LIBXUL_SDK" ]; then
   add_makefiles "
     memory/mozalloc/Makefile
     mozglue/Makefile
@@ -120,28 +121,34 @@ if [ "$COMPILER_DEPEND" = "" -a "$MOZ_NA
     config/mkdepend/Makefile
   "
 fi
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     build/autoconf/test/Makefile
   "
+  if [ ! "$LIBXUL_SDK" ]; then 
+    add_makefiles "
+      mozglue/tests/Makefile
+    "
+  fi
   if [ "$_MSC_VER" -a "$OS_TEST" != "x86_64" ]; then
     add_makefiles "
       build/win32/vmwarerecordinghelper/Makefile
     "
   fi
   if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then 
     add_makefiles "
       build/unix/test/Makefile
     "
   fi
   if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
     add_makefiles "
+      build/mobile/robocop/Makefile
       build/mobile/sutagent/android/Makefile
       build/mobile/sutagent/android/fencp/Makefile
       build/mobile/sutagent/android/ffxcp/Makefile
       build/mobile/sutagent/android/watcher/Makefile
     "
   fi
 fi
 
--- a/b2g/makefiles.sh
+++ b/b2g/makefiles.sh
@@ -30,26 +30,18 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
-netwerk/locales/Makefile
-dom/locales/Makefile
-toolkit/locales/Makefile
-security/manager/locales/Makefile
 b2g/app/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
+$MOZ_BRANDING_DIRECTORY/content/Makefile
+$MOZ_BRANDING_DIRECTORY/locales/Makefile
 b2g/chrome/Makefile
 b2g/components/Makefile
 b2g/installer/Makefile
 b2g/locales/Makefile
 b2g/Makefile
 "
-
-if test -n "$MOZ_UPDATE_PACKAGING"; then
-   add_makefiles "
-     tools/update-packaging/Makefile
-   "
-fi
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -62,24 +62,26 @@ browser/components/privatebrowsing/src/M
 browser/components/search/Makefile
 browser/components/sessionstore/Makefile
 browser/components/sessionstore/src/Makefile
 browser/components/sidebar/Makefile
 browser/components/shell/Makefile
 browser/components/shell/public/Makefile
 browser/components/shell/src/Makefile
 browser/components/tabview/Makefile
+browser/components/thumbnails/Makefile
 browser/devtools/Makefile
 browser/devtools/debugger/Makefile
 browser/devtools/highlighter/Makefile
 browser/devtools/scratchpad/Makefile
 browser/devtools/shared/Makefile
 browser/devtools/sourceeditor/Makefile
 browser/devtools/styleeditor/Makefile
 browser/devtools/styleinspector/Makefile
+browser/devtools/tilt/Makefile
 browser/devtools/webconsole/Makefile
 browser/fuel/Makefile
 browser/fuel/public/Makefile
 browser/fuel/src/Makefile
 browser/installer/Makefile
 browser/locales/Makefile
 browser/modules/Makefile
 browser/themes/Makefile
@@ -117,38 +119,41 @@ else
     browser/themes/winstripe/Makefile
     browser/themes/winstripe/communicator/Makefile
   "
 fi
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     browser/base/content/test/Makefile
+    browser/base/content/test/newtab/Makefile
     browser/components/certerror/test/Makefile
     browser/components/dirprovider/tests/Makefile
     browser/components/preferences/tests/Makefile
     browser/components/search/test/Makefile
     browser/components/sessionstore/test/Makefile
     browser/components/shell/test/Makefile
     browser/components/feeds/test/Makefile
     browser/components/feeds/test/chrome/Makefile
     browser/components/places/tests/Makefile
     browser/components/places/tests/chrome/Makefile
     browser/components/places/tests/browser/Makefile
     browser/components/privatebrowsing/test/Makefile
     browser/components/privatebrowsing/test/browser/Makefile
     browser/components/tabview/test/Makefile
     browser/components/test/Makefile
+    browser/components/thumbnails/test/Makefile
     browser/devtools/debugger/test/Makefile
     browser/devtools/highlighter/test/Makefile
     browser/devtools/scratchpad/test/Makefile
     browser/devtools/shared/test/Makefile
     browser/devtools/sourceeditor/test/Makefile
     browser/devtools/styleeditor/test/Makefile
     browser/devtools/styleinspector/test/Makefile
+    browser/devtools/tilt/test/Makefile
     browser/devtools/webconsole/test/Makefile
     browser/fuel/test/Makefile
     browser/modules/test/Makefile
   "
   if [ "$MOZ_SAFE_BROWSING" ]; then
     add_makefiles "
       browser/components/safebrowsing/content/test/Makefile
     "
--- a/mobile/android/makefiles.sh
+++ b/mobile/android/makefiles.sh
@@ -31,35 +31,36 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
-netwerk/locales/Makefile
-dom/locales/Makefile
-toolkit/locales/Makefile
-security/manager/locales/Makefile
+mobile/locales/Makefile
+mobile/android/Makefile
 mobile/android/app/Makefile
 mobile/android/app/profile/extensions/Makefile
 mobile/android/base/Makefile
 mobile/android/base/locales/Makefile
-mobile/locales/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
+$MOZ_BRANDING_DIRECTORY/content/Makefile
 $MOZ_BRANDING_DIRECTORY/locales/Makefile
 mobile/android/chrome/Makefile
-mobile/android/chrome/tests/Makefile
 mobile/android/components/Makefile
-mobile/android/components/build/Makefile
 mobile/android/modules/Makefile
 mobile/android/installer/Makefile
 mobile/android/locales/Makefile
-mobile/android/Makefile
 mobile/android/themes/core/Makefile
 "
 
-if test -n "$MOZ_UPDATE_PACKAGING"; then
-   add_makefiles "
-     tools/update-packaging/Makefile
-   "
+if [ ! "$LIBXUL_SDK" ]; then
+  add_makefiles "
+    mobile/android/components/build/Makefile
+  "
 fi
+
+if [ "$ENABLE_TESTS" ]; then
+  add_makefiles "
+    mobile/android/chrome/tests/Makefile
+  "
+fi
--- a/mobile/xul/makefiles.sh
+++ b/mobile/xul/makefiles.sh
@@ -31,29 +31,34 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
+mobile/locales/Makefile
+mobile/xul/Makefile
 mobile/xul/app/Makefile
 mobile/xul/app/profile/extensions/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
 $MOZ_BRANDING_DIRECTORY/content/Makefile
 $MOZ_BRANDING_DIRECTORY/locales/Makefile
 mobile/xul/chrome/Makefile
 mobile/xul/components/Makefile
-mobile/xul/components/build/Makefile
 mobile/xul/modules/Makefile
 mobile/xul/installer/Makefile
 mobile/xul/locales/Makefile
-mobile/locales/Makefile
-mobile/xul/Makefile
 mobile/xul/themes/core/Makefile
 "
 
+if [ ! "$LIBXUL_SDK" ]; then
+  add_makefiles "
+    mobile/xul/components/build/Makefile
+  "
+fi
+
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     mobile/xul/chrome/tests/Makefile
   "
 fi
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -62,36 +62,40 @@ MAKEFILES_dom="
   dom/interfaces/sidebar/Makefile
   dom/interfaces/storage/Makefile
   dom/interfaces/stylesheets/Makefile
   dom/interfaces/svg/Makefile
   dom/interfaces/traversal/Makefile
   dom/interfaces/xbl/Makefile
   dom/interfaces/xpath/Makefile
   dom/interfaces/xul/Makefile
-  dom/ipc/Makefile
   dom/base/Makefile
   dom/battery/Makefile
   dom/indexedDB/Makefile
+  dom/ipc/Makefile
+  dom/locales/Makefile
+  dom/network/Makefile
+  dom/network/interfaces/Makefile
+  dom/network/src/Makefile
+  dom/plugins/base/Makefile
+  dom/plugins/ipc/Makefile
+  dom/power/Makefile
   dom/sms/Makefile
   dom/sms/interfaces/Makefile
   dom/sms/src/Makefile
   dom/src/Makefile
   dom/src/events/Makefile
   dom/src/jsurl/Makefile
   dom/src/geolocation/Makefile
   dom/src/json/Makefile
   dom/src/offline/Makefile
   dom/src/notification/Makefile
   dom/src/storage/Makefile
   dom/system/Makefile
   dom/workers/Makefile
-  dom/locales/Makefile
-  dom/plugins/base/Makefile
-  dom/plugins/ipc/Makefile
 "
 
 MAKEFILES_editor="
   editor/Makefile
   editor/public/Makefile
   editor/idl/Makefile
   editor/txmgr/Makefile
   editor/txmgr/idl/Makefile
@@ -250,16 +254,17 @@ MAKEFILES_layout="
   layout/Makefile
   layout/base/Makefile
   layout/build/Makefile
   layout/forms/Makefile
   layout/generic/Makefile
   layout/ipc/Makefile
   layout/inspector/public/Makefile
   layout/inspector/src/Makefile
+  layout/media/Makefile
   layout/style/Makefile
   layout/style/xbl-marquee/Makefile
   layout/tables/Makefile
   layout/svg/base/src/Makefile
   layout/xul/base/public/Makefile
   layout/xul/base/src/Makefile
 "
 
@@ -463,17 +468,16 @@ MAKEFILES_xulapp="
   toolkit/components/console/Makefile
   toolkit/components/contentprefs/Makefile
   toolkit/components/cookie/Makefile
   toolkit/components/downloads/Makefile
   toolkit/components/exthelper/Makefile
   toolkit/components/filepicker/Makefile
   toolkit/components/find/Makefile
   toolkit/components/intl/Makefile
-  toolkit/components/maintenanceservice/Makefile
   toolkit/components/microformats/Makefile
   toolkit/components/parentalcontrols/Makefile
   toolkit/components/passwordmgr/Makefile
   toolkit/components/perf/Makefile
   toolkit/components/places/Makefile
   toolkit/components/prompts/Makefile
   toolkit/components/prompts/src/Makefile
   toolkit/components/startup/Makefile
@@ -709,16 +713,17 @@ fi
 #
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     caps/tests/mochitest/Makefile
     chrome/test/Makefile
     content/base/test/Makefile
     content/base/test/chrome/Makefile
+    content/base/test/websocket_hybi/Makefile
     content/canvas/test/Makefile
     content/canvas/test/crossorigin/Makefile
     content/canvas/test/webgl/Makefile
     content/events/test/Makefile
     content/html/content/test/Makefile
     content/html/content/test/bug649134/Makefile
     content/html/content/test/forms/Makefile
     content/html/document/test/Makefile
@@ -731,18 +736,21 @@ if [ "$ENABLE_TESTS" ]; then
     content/xslt/tests/mochitest/Makefile
     content/xul/content/test/Makefile
     content/xul/document/test/Makefile
     docshell/test/Makefile
     docshell/test/chrome/Makefile
     docshell/test/navigation/Makefile
     dom/battery/test/Makefile
     dom/indexedDB/test/Makefile
+    dom/indexedDB/test/unit/Makefile
+    dom/network/tests/Makefile
     dom/plugins/test/Makefile
     dom/plugins/test/testplugin/Makefile
+    dom/power/test/Makefile
     dom/sms/tests/Makefile
     dom/src/foo/Makefile
     dom/src/json/test/Makefile
     dom/src/jsurl/test/Makefile
     dom/tests/Makefile
     dom/tests/mochitest/Makefile
     dom/tests/mochitest/ajax/Makefile
     dom/tests/mochitest/ajax/jquery/Makefile
@@ -889,16 +897,17 @@ if [ "$ENABLE_TESTS" ]; then
     toolkit/components/urlformatter/tests/Makefile
     toolkit/components/viewsource/test/Makefile
     toolkit/components/viewsource/test/browser/Makefile
     toolkit/content/tests/Makefile
     toolkit/content/tests/chrome/Makefile
     toolkit/content/tests/chrome/rtlchrome/Makefile
     toolkit/content/tests/chrome/rtltest/Makefile
     toolkit/content/tests/widgets/Makefile
+    toolkit/devtools/debugger/tests/Makefile
     toolkit/mozapps/downloads/tests/Makefile
     toolkit/mozapps/downloads/tests/chrome/Makefile
     toolkit/mozapps/extensions/test/Makefile
     toolkit/mozapps/plugins/tests/Makefile
     toolkit/mozapps/shared/test/chrome/Makefile
     toolkit/mozapps/update/test_timermanager/Makefile
     toolkit/profile/test/Makefile
     toolkit/xre/test/Makefile
@@ -921,21 +930,23 @@ if [ "$ENABLE_TESTS" ]; then
       accessible/tests/mochitest/attributes/Makefile
       accessible/tests/mochitest/editabletext/Makefile
       accessible/tests/mochitest/elm/Makefile
       accessible/tests/mochitest/events/Makefile
       accessible/tests/mochitest/focus/Makefile
       accessible/tests/mochitest/hyperlink/Makefile
       accessible/tests/mochitest/hypertext/Makefile
       accessible/tests/mochitest/name/Makefile
+      accessible/tests/mochitest/pivot/Makefile
       accessible/tests/mochitest/relations/Makefile
       accessible/tests/mochitest/selectable/Makefile
       accessible/tests/mochitest/states/Makefile
       accessible/tests/mochitest/table/Makefile
       accessible/tests/mochitest/text/Makefile
+      accessible/tests/mochitest/textcaret/Makefile
       accessible/tests/mochitest/textselection/Makefile
       accessible/tests/mochitest/tree/Makefile
       accessible/tests/mochitest/treeupdate/Makefile
       accessible/tests/mochitest/value/Makefile
     "
   fi
   if [ "$BUILD_CTYPES" ]; then
     add_makefiles "
@@ -1002,16 +1013,21 @@ if [ "$ENABLE_TESTS" ]; then
     add_makefiles "
       toolkit/mozapps/update/test/Makefile
     "
     if [ "$OS_TARGET" != "Android" ]; then
       add_makefiles "
         toolkit/mozapps/update/test/chrome/Makefile
       "
     fi
+    if [ "$MOZ_MAINTENANCE_SERVICE" ]; then
+      add_makefiles "
+        toolkit/mozapps/update/test_svc/Makefile
+      "
+    fi
   fi
   if [ "$MOZ_URL_CLASSIFIER" ]; then
     add_makefiles "
       toolkit/components/url-classifier/tests/Makefile
       toolkit/components/url-classifier/tests/mochitest/Makefile
     "
   fi
   if [ "$MOZ_XTF" ]; then
@@ -1033,17 +1049,17 @@ if [ "$ENABLE_TESTS" ]; then
   if [ "$MOZ_BUILD_APP" != "mobile" ]; then
     add_makefiles "
       docshell/test/browser/Makefile
       dom/tests/browser/Makefile
       image/test/browser/Makefile
       toolkit/components/downloads/test/browser/Makefile
       toolkit/components/passwordmgr/test/browser/Makefile
       toolkit/components/places/tests/browser/Makefile
-      toolkit/components/startup/tests/Makefile
+      toolkit/components/startup/tests/browser/Makefile
       toolkit/content/tests/browser/Makefile
       toolkit/content/tests/browser/common/Makefile
       toolkit/content/tests/browser/data/Makefile
       toolkit/mozapps/extensions/test/browser/Makefile
       toolkit/mozapps/extensions/test/mochitest/Makefile
       toolkit/mozapps/extensions/test/xpinstall/Makefile
     "
   fi
@@ -1066,16 +1082,21 @@ if [ "$ENABLE_TESTS" ]; then
   fi
   if [ "$OS_ARCH" = "WINNT" ]; then
     add_makefiles "
       toolkit/xre/test/win/Makefile
       widget/windows/tests/Makefile
       xpcom/tests/windows/Makefile
     "
   fi
+  if [ "$MOZ_BUILD_APP" = "mobile/android" ]; then
+    add_makefiles "
+      testing/mochitest/roboextender/Makefile
+    "
+  fi
 fi
 
 
 #
 # Feature specific makefiles
 #
 
 if [ "$ACCESSIBILITY" ]; then
@@ -1137,16 +1158,17 @@ if [ "$MOZ_ANGLE" ]; then
     gfx/angle/src/libEGL/Makefile
   "
 fi
 
 if [ "$MOZ_B2G_RIL" ]; then
   add_makefiles "
     dom/system/b2g/Makefile
     dom/telephony/Makefile
+    dom/wifi/Makefile
     ipc/ril/Makefile
   "
 fi
 
 if [ "$MOZ_CRASHREPORTER" ]; then
   add_makefiles "
     toolkit/crashreporter/Makefile
   "
@@ -1245,16 +1267,22 @@ if [ "$MOZ_ENABLE_XREMOTE" ]; then
 fi
 
 if [ "$MOZ_FEEDS" ]; then
   add_makefiles "
     toolkit/components/feeds/Makefile
   "
 fi
 
+if [ "$MOZ_GRAPHITE" ]; then
+  add_makefiles "
+    gfx/graphite2/src/Makefile
+  "
+fi
+
 if [ "$MOZ_HELP_VIEWER" ]; then
   add_makefiles "
     toolkit/components/help/Makefile
   "
   if [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
     add_makefiles "
       toolkit/themes/pinstripe/help/Makefile
     "
@@ -1281,16 +1309,22 @@ fi
 
 if [ "$MOZ_JSDEBUGGER" ]; then
   add_makefiles "
     js/jsd/Makefile
     js/jsd/idl/Makefile
   "
 fi
 
+if [ "$MOZ_MAINTENANCE_SERVICE" ]; then
+  add_makefiles "
+    toolkit/components/maintenanceservice/Makefile
+  "
+fi
+
 if [ ! "$MOZ_NATIVE_SQLITE" ]; then
   add_makefiles "
     db/sqlite3/src/Makefile
   "
 fi
 
 if [ "$MOZ_PERMISSIONS" ]; then
   add_makefiles "
@@ -1325,31 +1359,41 @@ if [ "$MOZ_TOOLKIT_SEARCH" ]; then
   "
 fi
 
 if [ "$MOZ_UPDATER" ]; then
   add_makefiles "
     modules/libmar/Makefile
     modules/libmar/src/Makefile
     modules/libmar/tool/Makefile
-    toolkit/mozapps/readstrings/Makefile
   "
   if [ ! "$SYSTEM_BZ2" ]; then
     add_makefiles "
       modules/libbz2/Makefile
       modules/libbz2/src/Makefile
     "
   fi
   if [ "$OS_TARGET" != "Android" ]; then
     add_makefiles "
       toolkit/mozapps/update/updater/Makefile
     "
   fi
 fi
 
+if [ "$MOZ_UPDATER" -o "$MOZ_MAINTENANCE_SERVICE" ]; then
+  add_makefiles "
+    toolkit/mozapps/readstrings/Makefile
+  "
+  if [ "$OS_TARGET" != "Android" ]; then
+    add_makefiles "
+      toolkit/mozapps/update/common/Makefile
+    "
+  fi
+fi
+
 if [ "$MOZ_UPDATER" -o "$MOZ_UPDATE_PACKAGING" ]; then
   add_makefiles "
     other-licenses/bsdiff/Makefile
   "
 fi
 
 if [ "$MOZ_URL_CLASSIFIER" ]; then
   add_makefiles "