From fe42dd7cc02975bf1013a671048326afca6dacfd Mon Sep 17 00:00:00 2001
From: Taras Glek <tglek@mozilla.com>
Date: Mon, 20 Jun 2011 14:47:55 -0700
Subject: [PATCH] bug 661574: Move nsITelemetry into toolkit r=Mossop

--HG--
rename : xpcom/base/Telemetry.cpp => toolkit/components/telemetry/Telemetry.cpp
rename : xpcom/base/nsITelemetry.idl => toolkit/components/telemetry/nsITelemetry.idl
rename : xpcom/tests/unit/test_nsITelemetry.js => toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
---
 browser/installer/package-manifest.in         |  1 +
 toolkit/components/telemetry/Makefile.in      | 24 +++++++++++++++++++
 .../components/telemetry}/Telemetry.cpp       |  0
 .../components/telemetry}/nsITelemetry.idl    |  0
 .../tests/unit/test_nsITelemetry.js           |  0
 .../telemetry/tests/unit/xpcshell.ini         |  1 +
 toolkit/library/libxul-config.mk              |  1 +
 xpcom/base/Makefile.in                        |  2 --
 xpcom/tests/unit/xpcshell.ini                 |  1 -
 9 files changed, 27 insertions(+), 3 deletions(-)
 rename {xpcom/base => toolkit/components/telemetry}/Telemetry.cpp (100%)
 rename {xpcom/base => toolkit/components/telemetry}/nsITelemetry.idl (100%)
 rename {xpcom => toolkit/components/telemetry}/tests/unit/test_nsITelemetry.js (100%)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 7d70ded45ca9..069f86559cc9 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -261,6 +261,7 @@
 @BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
+@BINPATH@/components/telemetry.xpt
 
 ; JavaScript components
 @BINPATH@/components/ConsoleAPI.manifest
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
index 9590b25ea8bc..c1952ae38f59 100644
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -44,14 +44,38 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = telemetry
+XPIDL_MODULE = telemetry
+MODULE_NAME = telemetry
+GRE_MODULE = 1
+
+LIBXUL_LIBRARY = 1
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+
+LIBRARY_NAME = telemetry
+
+XPIDLSRCS = \
+  nsITelemetry.idl \
+  $(NULL)
 
 EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   TelemetryPing.js \
   $(NULL)
 
+CPPSRCS = \
+  Telemetry.cpp \
+  $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+  $(MOZ_COMPONENT_LIBS) \
+  $(MOZ_JS_LIBS) \
+  $(NULL)
+
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
+include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/xpcom/base/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
similarity index 100%
rename from xpcom/base/Telemetry.cpp
rename to toolkit/components/telemetry/Telemetry.cpp
diff --git a/xpcom/base/nsITelemetry.idl b/toolkit/components/telemetry/nsITelemetry.idl
similarity index 100%
rename from xpcom/base/nsITelemetry.idl
rename to toolkit/components/telemetry/nsITelemetry.idl
diff --git a/xpcom/tests/unit/test_nsITelemetry.js b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
similarity index 100%
rename from xpcom/tests/unit/test_nsITelemetry.js
rename to toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini
index f2bfac23b51c..56b5dfdb08bf 100644
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -2,4 +2,5 @@
 head = 
 tail = 
 
+[test_nsITelemetry.js]
 [test_TelemetryPing.js]
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index 191e4d3d865c..fe1d5e0d7d1c 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -139,6 +139,7 @@ COMPONENT_LIBS += \
 	appcomps \
 	composer \
 	jetpack_s \
+	telemetry \
 	$(NULL)
 
 ifdef BUILD_CTYPES
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index cbd66f215c6e..dd335a2f9b52 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -70,7 +70,6 @@ CPPSRCS		= \
 		nsStackWalk.cpp \
 		nsMemoryReporterManager.cpp \
 		FunctionTimer.cpp \
-		Telemetry.cpp \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -140,7 +139,6 @@ XPIDLSRCS	= \
 		nsIUUIDGenerator.idl \
 		nsIMutable.idl \
 		nsIMemoryReporter.idl \
-		nsITelemetry.idl \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/xpcom/tests/unit/xpcshell.ini b/xpcom/tests/unit/xpcshell.ini
index 749a3ea6197e..14ea18fa349b 100644
--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -21,7 +21,6 @@ tail =
 [test_mac_bundle.js]
 [test_nsIMutableArray.js]
 [test_nsIProcess.js]
-[test_nsITelemetry.js]
 [test_pipe.js]
 [test_storagestream.js]
 [test_streams.js]