Bug 1049998 - Flatten browser/fuel/{public,src}/ directories. r=mak
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 07 Aug 2014 21:52:04 -0700
changeset 220110 02dae3a6ed237b7ef77fa89f4c8f205cbfdff3e1
parent 220109 c7089f9065dae6785e9d514f152813df54c78da5
child 220111 92401a82b44b7e85c8d2e712049bd9b8b1c3099e
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1049998
milestone34.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
Bug 1049998 - Flatten browser/fuel/{public,src}/ directories. r=mak
browser/fuel/fuelApplication.js
browser/fuel/fuelApplication.manifest
browser/fuel/fuelIApplication.idl
browser/fuel/moz.build
browser/fuel/public/fuelIApplication.idl
browser/fuel/public/moz.build
browser/fuel/src/fuelApplication.js
browser/fuel/src/fuelApplication.manifest
browser/fuel/src/moz.build
rename from browser/fuel/src/fuelApplication.js
rename to browser/fuel/fuelApplication.js
--- a/browser/fuel/src/fuelApplication.js
+++ b/browser/fuel/fuelApplication.js
@@ -724,17 +724,17 @@ var ApplicationFactory = {
       gSingleton = new Application();
     }
 
     return gSingleton.QueryInterface(aIID);
   }
 };
 
 
-#include ../../../toolkit/components/exthelper/extApplication.js
+#include ../../toolkit/components/exthelper/extApplication.js
 
 //=================================================
 // Application constructor
 function Application() {
   this.initToolkitHelpers();
 }
 
 //=================================================
rename from browser/fuel/src/fuelApplication.manifest
rename to browser/fuel/fuelApplication.manifest
rename from browser/fuel/public/fuelIApplication.idl
rename to browser/fuel/fuelIApplication.idl
--- a/browser/fuel/moz.build
+++ b/browser/fuel/moz.build
@@ -1,8 +1,21 @@
 # -*- Mode: python; c-basic-offset: 4; 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/.
 
-DIRS += ['public', 'src']
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+XPIDL_SOURCES += [
+    'fuelIApplication.idl',
+]
+
+XPIDL_MODULE = 'fuel'
+
+EXTRA_COMPONENTS += [
+    'fuelApplication.manifest',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'fuelApplication.js',
+]
deleted file mode 100644
--- a/browser/fuel/public/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-XPIDL_SOURCES += [
-    'fuelIApplication.idl',
-]
-
-XPIDL_MODULE = 'fuel'
-
deleted file mode 100644
--- a/browser/fuel/src/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-EXTRA_COMPONENTS += [
-    'fuelApplication.manifest',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'fuelApplication.js',
-]