From e91a13c6e8e568debc2b642c230126b710e7b967 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 4 May 2015 01:36:08 +0200
Subject: [PATCH] port bug 1155776, bug 1155816, bug 870370 (moves from
Makefile.in to moz.build)
---
Makefile.in | 6 ------
moz.build | 7 +++++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 29260a4..b77274d 100644
--- 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 bdafcaf..18c9699 100644
--- 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',
+]
--
2.43.0