Remove non-existent/duplicate *makefiles.sh entries, update conditionals, style fixes (no bug); rs=build
authorEd Morley <bmo@edmorley.co.uk>
Sat, 07 Jan 2012 01:00:28 +0000
changeset 83983 9a1a4157bf4900391f3062cd07d97148ab9c5c4b
parent 83982 4b4802dc4a5b5fc7184b167073242db3370f0665
child 83984 c6566c71bea0660c6c953b54494d8410e079413e
push id4667
push userbmo@edmorley.co.uk
push dateSat, 07 Jan 2012 01:02:42 +0000
treeherdermozilla-inbound@c6566c71bea0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbuild
milestone12.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
Remove non-existent/duplicate *makefiles.sh entries, update conditionals, style fixes (no bug); rs=build
b2g/makefiles.sh
mobile/android/makefiles.sh
toolkit/toolkit-makefiles.sh
--- a/b2g/makefiles.sh
+++ b/b2g/makefiles.sh
@@ -40,15 +40,16 @@ dom/locales/Makefile
 toolkit/locales/Makefile
 security/manager/locales/Makefile
 b2g/app/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
 b2g/chrome/Makefile
 b2g/components/Makefile
 b2g/installer/Makefile
 b2g/locales/Makefile
-b2g/Makefile"
+b2g/Makefile
+"
 
 if test -n "$MOZ_UPDATE_PACKAGING"; then
    add_makefiles "
      tools/update-packaging/Makefile
    "
 fi
--- a/mobile/android/makefiles.sh
+++ b/mobile/android/makefiles.sh
@@ -49,15 +49,16 @@ mobile/android/base/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"
+mobile/android/themes/core/Makefile
+"
 
 if test -n "$MOZ_UPDATE_PACKAGING"; then
    add_makefiles "
      tools/update-packaging/Makefile
    "
 fi
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -374,18 +374,16 @@ MAKEFILES_docshell="
   docshell/shistory/Makefile
   docshell/shistory/public/Makefile
   docshell/shistory/src/Makefile
   docshell/build/Makefile
 "
 
 MAKEFILES_widget="
   widget/Makefile
-  widget/public/Makefile
-  widget/Makefile
   widget/shared/Makefile
   widget/xpwidgets/Makefile
 "
 
 MAKEFILES_xpcom="
   xpcom/string/Makefile
   xpcom/string/public/Makefile
   xpcom/string/src/Makefile
@@ -623,17 +621,17 @@ elif [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" ];
 elif [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
   add_makefiles "
     dom/plugins/base/android/Makefile
     dom/system/android/Makefile
     image/decoders/icon/android/Makefile
     netwerk/system/android/Makefile
     widget/android/Makefile
   "
-  if [ "$MOZ_BUILD_APP" = "mobile/xul" ]; then
+  if [ "$MOZ_BUILD_APP" = "mobile/xul" -o "$MOZ_BUILD_APP" = "b2g"]; then
     add_makefiles "
       embedding/android/Makefile
       embedding/android/locales/Makefile
     "
   fi
 elif [ "$MOZ_WIDGET_TOOLKIT" = "gonk" ]; then
   add_makefiles "
     widget/gonk/Makefile
@@ -674,24 +672,16 @@ if [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" -o "
     dom/system/unix/Makefile
     toolkit/system/unixproxy/Makefile
     toolkit/themes/gnomestripe/Makefile
     toolkit/themes/gnomestripe/global/Makefile
     toolkit/themes/gnomestripe/mozapps/Makefile
   "
 fi
 
-if [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" \
-  -o "$MOZ_WIDGET_TOOLKIT" = "android" \
-  -o "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
-  add_makefiles "
-    gfx/skia/Makefile
-  "
-fi
-
 if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then
   add_makefiles "
     xpcom/reflect/xptcall/src/md/unix/Makefile
   "
   if [ "$MOZ_WIDGET_TOOLKIT" != "cocoa" \
     -a "$MOZ_WIDGET_TOOLKIT" != "gtk2" \
     -a "$MOZ_WIDGET_TOOLKIT" != "qt" ]
   then
@@ -841,18 +831,16 @@ if [ "$ENABLE_TESTS" ]; then
     modules/libjar/test/chrome/Makefile
     modules/libjar/test/mochitest/Makefile
     modules/libpref/test/Makefile
     netwerk/streamconv/test/Makefile
     netwerk/test/Makefile
     netwerk/test/browser/Makefile
     netwerk/test/httpserver/Makefile
     parser/htmlparser/tests/Makefile
-    parser/htmlparser/tests/grabpage/Makefile
-    parser/htmlparser/tests/html/Makefile
     parser/htmlparser/tests/mochitest/Makefile
     parser/htmlparser/tests/mochitest/dir_bug534293/Makefile
     parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile
     parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile
     parser/xml/test/Makefile
     rdf/tests/Makefile
     rdf/tests/rdfcat/Makefile
     rdf/tests/rdfpoll/Makefile
@@ -1236,16 +1224,22 @@ if [ "$MOZ_ENABLE_LIBCONIC" ]; then
 fi
 
 if [ "$MOZ_ENABLE_QTNETWORK" ]; then
   add_makefiles "
     netwerk/system/qt/Makefile
   "
 fi
 
+if [ "$MOZ_ENABLE_SKIA" ]; then
+  add_makefiles "
+    gfx/skia/Makefile
+  "
+fi
+
 if [ "$MOZ_ENABLE_XREMOTE" ]; then
   add_makefiles "
     toolkit/components/remote/Makefile
     widget/xremoteclient/Makefile
   "
 fi
 
 if [ "$MOZ_FEEDS" ]; then