Backed out changeset 9da8bc670c03 (bug 957241) for frequent intermittent m-bc orange
authorWes Kocher <wkocher@mozilla.com>
Thu, 09 Jan 2014 19:08:25 -0800
changeset 162837 623b7361abfa7c199390eebb3fa36371d5aaad1b
parent 162836 11a2f3e6b284e58733059d6c8756fcc049486041
child 162838 644748325099452cbe6721404484cf9621d9d233
push idunknown
push userunknown
push dateunknown
bugs957241
milestone29.0a1
backs out9da8bc670c0336331b89785f71191cf1730d4dbd
Backed out changeset 9da8bc670c03 (bug 957241) for frequent intermittent m-bc orange
addon-sdk/Makefile.in
addon-sdk/copy_source.py
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -1,22 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/config.mk
 
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-MOZ_B2G=1
-else
-MOZ_B2G=0
-endif
-
 libs::
-	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs $(MOZ_B2G) >copy_source.mk
+	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk
 	$(MAKE) -f copy_source.mk libs
 
 include $(topsrcdir)/config/rules.mk
 
 TEST_FILES = \
   source/app-extension \
   source/bin \
   source/python-lib \
--- a/addon-sdk/copy_source.py
+++ b/addon-sdk/copy_source.py
@@ -1,24 +1,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import sys
 
-if len(sys.argv) != 5:
+if len(sys.argv) != 4:
     print >> sys.stderr, "Usage: copy_source.py " \
-                         "<topsrcdir> <source directory> <target directory> <isb2g>"
+                         "<topsrcdir> <source directory> <target directory>"
     sys.exit(1)
 
 topsrcdir = sys.argv[1]
 source_dir = sys.argv[2]
 target_dir = sys.argv[3]
-isB2G = sys.argv[4]
 
 print """
 DEPTH     = ..
 topsrcdir = %(topsrcdir)s
 srcdir    = %(topsrcdir)s/addon-sdk
 VPATH     = %(topsrcdir)s/addon-sdk
 
 include $(topsrcdir)/config/config.mk
@@ -31,32 +30,16 @@ if not os.path.exists(real_source):
 elif not os.path.isdir(real_source):
     print >> sys.stderr, "Error: Source %s is not a directory" % real_source
     sys.exit(1)
 for dirpath, dirnames, filenames in os.walk(real_source):
     if not filenames:
         continue
     dirpath = dirpath.replace(os.sep, '/')
     relative = dirpath[len(source_dir):]
-    if isB2G and relative in [
-        '/method/test',
-        '/sdk/ui',
-        '/sdk/ui/button',
-        '/sdk/ui/sidebar',
-        '/sdk/places',
-        '/sdk/places/host',
-        '/sdk/tabs',
-        '/sdk/panel',
-        '/sdk/frame',
-        '/sdk/test',
-        '/sdk/window',
-        '/sdk/windows',
-        '/sdk/deprecated',
-        ]:
-        continue
     varname = "COMMONJS%s" % relative.replace('/', '_')
     print "%s_FILES = \\" % varname
     for name in filenames:
         print "  %s/%s \\" % (dirpath, name)
     print "  $(NULL)"
     print "%s_DEST = %s%s" % (varname, target_dir, relative)
     print "INSTALL_TARGETS += %s\n" % varname