From 4002c343910b1c12c767370c48a5d457c01e560c Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 31 May 2017 16:40:52 +0100
Subject: [PATCH] Bug 1369028 - Add build infrastructure for follow-on search
 telemetry system add-on. r=Mossop

MozReview-Commit-ID: E3R57DXa57l
---
 .eslintignore                               |  4 +++-
 browser/extensions/followonsearch/jar.mn    |  7 +++++++
 browser/extensions/followonsearch/moz.build | 15 +++++++++++++++
 browser/extensions/moz.build                |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 browser/extensions/followonsearch/jar.mn
 create mode 100644 browser/extensions/followonsearch/moz.build

diff --git a/.eslintignore b/.eslintignore
index 4255835781c0..acd5be634423 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -64,7 +64,9 @@ browser/components/sessionstore/test/unit/data/sessionstore_invalid.js
 browser/components/tabview/**
 # generated & special files in cld2
 browser/components/translation/cld2/**
-# Screenshots is imported as a system add-on and has its own lint rules currently.
+# Screenshots and Follow-on search are imported as a system add-on and have
+# their own lint rules currently.
+browser/extensions/followonsearch/**
 browser/extensions/screenshots/**
 browser/extensions/pdfjs/content/build**
 browser/extensions/pdfjs/content/web**
diff --git a/browser/extensions/followonsearch/jar.mn b/browser/extensions/followonsearch/jar.mn
new file mode 100644
index 000000000000..8bad68630202
--- /dev/null
+++ b/browser/extensions/followonsearch/jar.mn
@@ -0,0 +1,7 @@
+# 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/.
+
+[features/followonsearch@mozilla.com] chrome.jar:
+% content followonsearch %content/
+  content/  (content/*)
diff --git a/browser/extensions/followonsearch/moz.build b/browser/extensions/followonsearch/moz.build
new file mode 100644
index 000000000000..c832661366e1
--- /dev/null
+++ b/browser/extensions/followonsearch/moz.build
@@ -0,0 +1,15 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Firefox", "Search")
+
+FINAL_TARGET_FILES.features['followonsearch@mozilla.com'] += [
+  'bootstrap.js',
+  'install.rdf',
+]
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 3053863e6120..b7952f08bfe4 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -7,6 +7,7 @@
 DIRS += [
     'aushelper',
     'e10srollout',
+    'followonsearch',
     'pdfjs',
     'pocket',
     'screenshots',