Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 1: Change dom/system/b2g to dom/system/gonk; r=philikon
authorKyle Machulis <kyle@nonpolynomial.com>
Wed, 14 Mar 2012 15:42:31 -0700
changeset 89413 495ed7337159db0d42eb631caf91f96bb3c68dba
parent 89412 60c732729b692b24b3ac339c95296a8d64cd0ca1
child 89414 a03c71163d1846c28b073d139f2e2f08134c7f28
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersphilikon
bugs735017
milestone14.0a1
Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 1: Change dom/system/b2g to dom/system/gonk; r=philikon
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
dom/dom-config.mk
dom/sms/src/Makefile.in
dom/src/geolocation/Makefile.in
dom/system/Makefile.in
dom/system/b2g/AudioManager.cpp
dom/system/b2g/AudioManager.h
dom/system/b2g/GonkGPSGeolocationProvider.cpp
dom/system/b2g/GonkGPSGeolocationProvider.h
dom/system/b2g/Makefile.in
dom/system/b2g/RadioInterfaceLayer.js
dom/system/b2g/RadioInterfaceLayer.manifest
dom/system/b2g/SystemWorkerManager.cpp
dom/system/b2g/SystemWorkerManager.h
dom/system/b2g/net_worker.js
dom/system/b2g/nsIAudioManager.idl
dom/system/b2g/nsIRadioInterfaceLayer.idl
dom/system/b2g/nsIWorkerHolder.idl
dom/system/b2g/nsRadioInterfaceLayer.h
dom/system/b2g/ril_consts.js
dom/system/b2g/ril_worker.js
dom/system/b2g/systemlibs.js
dom/system/b2g/tests/header_helpers.js
dom/system/b2g/tests/test_ril_worker_buf.js
dom/system/b2g/tests/test_ril_worker_sms.js
dom/system/b2g/tests/xpcshell.ini
dom/system/gonk/AudioManager.cpp
dom/system/gonk/AudioManager.h
dom/system/gonk/GonkGPSGeolocationProvider.cpp
dom/system/gonk/GonkGPSGeolocationProvider.h
dom/system/gonk/Makefile.in
dom/system/gonk/RadioInterfaceLayer.js
dom/system/gonk/RadioInterfaceLayer.manifest
dom/system/gonk/SystemWorkerManager.cpp
dom/system/gonk/SystemWorkerManager.h
dom/system/gonk/net_worker.js
dom/system/gonk/nsIAudioManager.idl
dom/system/gonk/nsIRadioInterfaceLayer.idl
dom/system/gonk/nsIWorkerHolder.idl
dom/system/gonk/nsRadioInterfaceLayer.h
dom/system/gonk/ril_consts.js
dom/system/gonk/ril_worker.js
dom/system/gonk/systemlibs.js
dom/system/gonk/tests/header_helpers.js
dom/system/gonk/tests/test_ril_worker_buf.js
dom/system/gonk/tests/test_ril_worker_sms.js
dom/system/gonk/tests/xpcshell.ini
dom/telephony/Makefile.in
layout/build/Makefile.in
mobile/xul/installer/package-manifest.in
testing/xpcshell/xpcshell.ini
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -143,17 +143,17 @@
 @BINPATH@/components/cookie.xpt
 @BINPATH@/components/directory.xpt
 @BINPATH@/components/docshell.xpt
 @BINPATH@/components/dom.xpt
 @BINPATH@/components/dom_base.xpt
 #ifdef MOZ_B2G_RIL
 @BINPATH@/components/dom_telephony.xpt
 @BINPATH@/components/dom_wifi.xpt
-@BINPATH@/components/dom_system_b2g.xpt
+@BINPATH@/components/dom_system_gonk.xpt
 #endif
 @BINPATH@/components/dom_battery.xpt
 #ifdef MOZ_B2G_BT
 @BINPATH@/components/dom_bluetooth.xpt
 #endif
 @BINPATH@/components/dom_canvas.xpt
 @BINPATH@/components/dom_contacts.xpt
 @BINPATH@/components/dom_core.xpt
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -144,17 +144,17 @@
 @BINPATH@/components/directory.xpt
 @BINPATH@/components/docshell.xpt
 @BINPATH@/components/dom.xpt
 @BINPATH@/components/dom_apps.xpt
 @BINPATH@/components/dom_base.xpt
 #ifdef MOZ_B2G_RIL
 @BINPATH@/components/dom_telephony.xpt
 @BINPATH@/components/dom_wifi.xpt
-@BINPATH@/components/dom_system_b2g.xpt
+@BINPATH@/components/dom_system_gonk.xpt
 #endif
 @BINPATH@/components/dom_battery.xpt
 #ifdef MOZ_B2G_BT
 @BINPATH@/components/dom_bluetooth.xpt
 #endif
 @BINPATH@/components/dom_canvas.xpt
 @BINPATH@/components/dom_contacts.xpt
 @BINPATH@/components/dom_core.xpt
--- a/dom/dom-config.mk
+++ b/dom/dom-config.mk
@@ -21,17 +21,17 @@ DOM_SRCDIRS = \
   layout/generic \
   layout/style \
   layout/xul/base/src \
   layout/xul/base/src/tree/src \
   $(NULL)
 
 ifdef MOZ_B2G_RIL
 DOM_SRCDIRS += \
-  dom/system/b2g \
+  dom/system/gonk \
   dom/telephony \
   dom/wifi \
   $(NULL)
 endif
 
 ifdef MOZ_B2G_BT
 DOM_SRCDIRS += dom/bluetooth
 endif
--- a/dom/sms/src/Makefile.in
+++ b/dom/sms/src/Makefile.in
@@ -94,17 +94,17 @@ LOCAL_INCLUDES = \
 
 # Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
 # subdirectory (and the ipc one).
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 ifdef MOZ_B2G_RIL
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/telephony \
-  -I$(topsrcdir)/dom/system/b2g \
+  -I$(topsrcdir)/dom/system/gonk \
   $(NULL)
 
 EXTRA_COMPONENTS = \
   ril/SmsDatabaseService.js \
   ril/SmsDatabaseService.manifest \
   $(NULL)
 else
 CPPSRCS += \
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -70,23 +70,21 @@ LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_
 endif
 ifdef MOZ_ENABLE_QTMOBILITY
 LOCAL_INCLUDES  += $(MOZ_QT_CFLAGS) \
                    -I$(topsrcdir)/dom/system/unix \
                    $(NULL)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/android \
-                   $(NULL)
+LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/android
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/b2g \
-                   $(NULL)
+LOCAL_INCLUDES  += -I$(topsrcdir)/dom/system/gonk
 endif
 
 EXPORTS         += nsGeoPositionIPCSerialiser.h
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -57,17 +57,17 @@ ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOL
 DIRS = cocoa
 endif
 
 ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = android
 endif
 
 ifdef MOZ_B2G_RIL
-DIRS += b2g
+DIRS += gonk
 endif
 
 CPPSRCS     = \
   nsDeviceMotion.cpp \
   $(NULL)
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
rename from dom/system/b2g/AudioManager.cpp
rename to dom/system/gonk/AudioManager.cpp
rename from dom/system/b2g/AudioManager.h
rename to dom/system/gonk/AudioManager.h
rename from dom/system/b2g/GonkGPSGeolocationProvider.cpp
rename to dom/system/gonk/GonkGPSGeolocationProvider.cpp
rename from dom/system/b2g/GonkGPSGeolocationProvider.h
rename to dom/system/gonk/GonkGPSGeolocationProvider.h
rename from dom/system/b2g/Makefile.in
rename to dom/system/gonk/Makefile.in
--- a/dom/system/b2g/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -2,23 +2,23 @@
 # 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/.
 
 DEPTH            = ../../..
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
-relativesrcdir   = dom/system/b2g
+relativesrcdir   = dom/system/gonk
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE           = dom
-LIBRARY_NAME     = domsystemb2g_s
-XPIDL_MODULE     = dom_system_b2g
+LIBRARY_NAME     = domsystemgonk_s
+XPIDL_MODULE     = dom_system_gonk
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 CPPSRCS = \
   SystemWorkerManager.cpp \
   $(NULL)
rename from dom/system/b2g/RadioInterfaceLayer.js
rename to dom/system/gonk/RadioInterfaceLayer.js
rename from dom/system/b2g/RadioInterfaceLayer.manifest
rename to dom/system/gonk/RadioInterfaceLayer.manifest
rename from dom/system/b2g/SystemWorkerManager.cpp
rename to dom/system/gonk/SystemWorkerManager.cpp
rename from dom/system/b2g/SystemWorkerManager.h
rename to dom/system/gonk/SystemWorkerManager.h
rename from dom/system/b2g/net_worker.js
rename to dom/system/gonk/net_worker.js
rename from dom/system/b2g/nsIAudioManager.idl
rename to dom/system/gonk/nsIAudioManager.idl
rename from dom/system/b2g/nsIRadioInterfaceLayer.idl
rename to dom/system/gonk/nsIRadioInterfaceLayer.idl
rename from dom/system/b2g/nsIWorkerHolder.idl
rename to dom/system/gonk/nsIWorkerHolder.idl
rename from dom/system/b2g/nsRadioInterfaceLayer.h
rename to dom/system/gonk/nsRadioInterfaceLayer.h
rename from dom/system/b2g/ril_consts.js
rename to dom/system/gonk/ril_consts.js
rename from dom/system/b2g/ril_worker.js
rename to dom/system/gonk/ril_worker.js
rename from dom/system/b2g/systemlibs.js
rename to dom/system/gonk/systemlibs.js
rename from dom/system/b2g/tests/header_helpers.js
rename to dom/system/gonk/tests/header_helpers.js
rename from dom/system/b2g/tests/test_ril_worker_buf.js
rename to dom/system/gonk/tests/test_ril_worker_buf.js
rename from dom/system/b2g/tests/test_ril_worker_sms.js
rename to dom/system/gonk/tests/test_ril_worker_sms.js
rename from dom/system/b2g/tests/xpcshell.ini
rename to dom/system/gonk/tests/xpcshell.ini
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -58,15 +58,9 @@ CPPSRCS = \
 
 XPIDLSRCS = \
   nsIDOMNavigatorTelephony.idl \
   nsIDOMTelephony.idl \
   nsIDOMTelephonyCall.idl \
   nsIDOMCallEvent.idl \
   $(NULL)
 
-#LOCAL_INCLUDES = \
-#  -I$(topsrcdir)/dom/base \
-#  -I$(topsrcdir)/dom/system/b2g \
-#  -I$(topsrcdir)/content/events/src \
-#  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -149,17 +149,17 @@ LOCAL_INCLUDES	+= \
 	$(NULL)
 endif
 
 ifdef MOZ_B2G_BT #{
 SHARED_LIBRARY_LIBS	+= $(DEPTH)/dom/bluetooth/$(LIB_PREFIX)dombluetooth_s.$(LIB_SUFFIX)
 endif #}
 
 ifdef MOZ_B2G_RIL #{
-SHARED_LIBRARY_LIBS	+= $(DEPTH)/dom/system/b2g/$(LIB_PREFIX)domsystemb2g_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS	+= $(DEPTH)/dom/system/gonk/$(LIB_PREFIX)domsystemgonk_s.$(LIB_SUFFIX)
 endif #}
 
 ifdef MOZ_MEDIA
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/content/media/$(LIB_PREFIX)gkconmedia_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
@@ -270,16 +270,16 @@ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(topsrcdir)/js/xpconnect/src \
 		   -I$(topsrcdir)/js/xpconnect/loader \
 		   -I$(topsrcdir)/caps/include \
 		   -I$(topsrcdir)/netwerk/base/src \
 		   -I$(topsrcdir)/content/svg/content/src \
 		   $(NULL)
 
 ifdef MOZ_B2G_RIL #{
-LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/system/b2g
+LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/system/gonk
 endif #}
 
 ifdef MOZ_B2G_BT #{
 LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/bluetooth
 endif #}
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/mobile/xul/installer/package-manifest.in
+++ b/mobile/xul/installer/package-manifest.in
@@ -149,17 +149,17 @@
 @BINPATH@/components/cookie.xpt
 @BINPATH@/components/directory.xpt
 @BINPATH@/components/docshell.xpt
 @BINPATH@/components/dom.xpt
 @BINPATH@/components/dom_base.xpt
 #ifdef MOZ_B2G_RIL
 @BINPATH@/components/dom_telephony.xpt
 @BINPATH@/components/dom_wifi.xpt
-@BINPATH@/components/dom_system_b2g.xpt
+@BINPATH@/components/dom_system_gonk.xpt
 #endif
 @BINPATH@/components/dom_battery.xpt
 #ifdef MOZ_B2G_BT
 @BINPATH@/components/dom_bluetooth.xpt
 #endif
 @BINPATH@/components/dom_canvas.xpt
 @BINPATH@/components/dom_core.xpt
 @BINPATH@/components/dom_css.xpt
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -3,17 +3,17 @@
 [include:netwerk/cookie/test/unit/xpcshell.ini]
 [include:modules/libjar/zipwriter/test/unit/xpcshell.ini]
 [include:uriloader/exthandler/tests/unit/xpcshell.ini]
 [include:parser/xml/test/unit/xpcshell.ini]
 [include:image/test/unit/xpcshell.ini]
 [include:dom/plugins/test/unit/xpcshell.ini]
 [include:dom/sms/tests/xpcshell.ini]
 [include:dom/src/json/test/unit/xpcshell.ini]
-[include:dom/system/b2g/tests/xpcshell.ini]
+[include:dom/system/gonk/tests/xpcshell.ini]
 [include:dom/tests/unit/xpcshell.ini]
 [include:dom/indexedDB/test/unit/xpcshell.ini]
 [include:content/xtf/test/unit/xpcshell.ini]
 [include:docshell/test/unit/xpcshell.ini]
 [include:embedding/tests/unit/xpcshell.ini]
 [include:toolkit/components/commandlines/test/unit/xpcshell.ini]
 [include:toolkit/components/contentprefs/tests/unit/xpcshell.ini]
 [include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]