Bug 760277 - Move Webapps.js and Webapps.jsm out of dom/base [r=mounir]
authorFabrice Desré <fabrice@mozilla.com>
Fri, 01 Jun 2012 14:40:17 -0700
changeset 95573 f3a8184df76cbf350b6da306d2f8598795cbb8d9
parent 95572 9bcbb4ebcdd08f3147dce1765b362bea64071524
child 95574 1a22fee1faad8431de56db12fd820072f14fdb8b
push id10168
push userfdesre@mozilla.com
push dateFri, 01 Jun 2012 21:40:37 +0000
treeherdermozilla-inbound@f3a8184df76c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmounir
bugs760277
milestone15.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 760277 - Move Webapps.js and Webapps.jsm out of dom/base [r=mounir]
dom/apps/src/Makefile.in
dom/apps/src/Webapps.js
dom/apps/src/Webapps.jsm
dom/apps/src/Webapps.manifest
dom/base/Makefile.in
dom/base/Webapps.js
dom/base/Webapps.jsm
dom/base/Webapps.manifest
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -7,11 +7,17 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = \
   AppsService.js \
   AppsService.manifest \
+  Webapps.js \
+  Webapps.manifest \
+  $(NULL)
+
+EXTRA_PP_JS_MODULES += \
+  Webapps.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
rename from dom/base/Webapps.js
rename to dom/apps/src/Webapps.js
rename from dom/base/Webapps.jsm
rename to dom/apps/src/Webapps.jsm
rename from dom/base/Webapps.manifest
rename to dom/apps/src/Webapps.manifest
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -24,24 +24,16 @@ EXTRA_PP_COMPONENTS = \
   ConsoleAPI.manifest \
   BrowserElementParent.js \
   BrowserElementParent.manifest \
   $(NULL)
 
 EXTRA_JS_MODULES = ConsoleAPIStorage.jsm \
   $(NULL)
 
-EXTRA_COMPONENTS = \
-  Webapps.js \
-  Webapps.manifest \
-  $(NULL)
-
-EXTRA_PP_JS_MODULES += Webapps.jsm \
-  $(NULL)
-
 EXTRA_JS_MODULES += \
   DOMRequestHelper.jsm \
   IndexedDBHelper.jsm \
   $(NULL)
 
 XPIDLSRCS = \
   nsIDOMDOMError.idl \
   nsIDOMDOMRequest.idl \