port bug 1155776, bug 1155816, bug 870370 (moves from Makefile.in to moz.build)

diff --git a/Makefile.in b/Makefile.in
index 29260a4470ce3805d9d72751be4ceed3b094d474..b77274dcee1272da9a5400cfaaa27d91208f48d2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,9 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 EXTENSION_VERSION      = 4.0.1
 
 XPI_NAME               = mandelbrot
-USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
-NO_JS_MANIFEST         = 1
 INSTALL_EXTENSION_ID   = mandelbrot@kairo.at
 XPI_PKGNAME            = mandelbrot-$(EXTENSION_VERSION)
 
@@ -56,10 +54,6 @@ DIST_FILES = \
   install.rdf \
   $(NULL)
 
-EXTRA_COMPONENTS = \
-  aboutMandelbrot.js \
-  $(NULL)
-
 # include config.mk before using the AB_CD var
 include $(topsrcdir)/config/config.mk
 

diff --git a/moz.build b/moz.build
index bdafcaf90b23d6e52fd0a1beb65d133d0ef216b9..18c96999bab3932faf9d1419e1866966f0ba3c26 100644 (file)
--- a/moz.build
+++ b/moz.build
@@ -5,9 +5,16 @@
 
 TEST_DIRS += ['tests']
 
+NO_JS_MANIFEST = True
+USE_EXTENSION_MANIFEST = True
+
 XPI_NAME = 'mandelbrot'
 export('XPI_NAME')
 
 JAR_MANIFESTS += ['jar.mn']
 
 JS_PREFERENCE_FILES += ['prefs.js']
+
+EXTRA_COMPONENTS += [
+    'aboutMandelbrot.js',
+]