bug 661574: Move nsITelemetry into toolkit r=Mossop
authorTaras Glek <tglek@mozilla.com>
Mon, 20 Jun 2011 14:47:55 -0700
changeset 71413 8c813f7586dfb85b3ac94e79da6ff65270f4027a
parent 71412 557b0b1ebfe64014bc3f0f77aa5560923253c45d
child 71414 aef1c7a2dd3cabcf4914fedaa6ea60af43a4e743
push id20539
push usermlamouri@mozilla.com
push dateTue, 21 Jun 2011 07:35:09 +0000
treeherdermozilla-central@bf714fffdfdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs661574
milestone7.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 661574: Move nsITelemetry into toolkit r=Mossop
browser/installer/package-manifest.in
toolkit/components/telemetry/Makefile.in
toolkit/components/telemetry/Telemetry.cpp
toolkit/components/telemetry/nsITelemetry.idl
toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
toolkit/components/telemetry/tests/unit/xpcshell.ini
toolkit/library/libxul-config.mk
xpcom/base/Makefile.in
xpcom/base/Telemetry.cpp
xpcom/base/nsITelemetry.idl
xpcom/tests/unit/test_nsITelemetry.js
xpcom/tests/unit/xpcshell.ini
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -256,16 +256,17 @@
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
 @BINPATH@/components/xpcom_xpti.xpt
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
+@BINPATH@/components/telemetry.xpt
 
 ; JavaScript components
 @BINPATH@/components/ConsoleAPI.manifest
 @BINPATH@/components/ConsoleAPI.js
 @BINPATH@/components/FeedProcessor.manifest
 @BINPATH@/components/FeedProcessor.js
 @BINPATH@/components/BrowserFeeds.manifest
 @BINPATH@/components/FeedConverter.js
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -39,19 +39,43 @@
 DEPTH = ../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 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
rename from xpcom/base/Telemetry.cpp
rename to toolkit/components/telemetry/Telemetry.cpp
rename from xpcom/base/nsITelemetry.idl
rename to toolkit/components/telemetry/nsITelemetry.idl
rename from xpcom/tests/unit/test_nsITelemetry.js
rename to toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
 
+[test_nsITelemetry.js]
 [test_TelemetryPing.js]
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -134,16 +134,17 @@ COMPONENT_LIBS += \
 	txmgr \
 	commandlines \
 	toolkitcomps \
 	pipboot \
 	pipnss \
 	appcomps \
 	composer \
 	jetpack_s \
+	telemetry \
 	$(NULL)
 
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \
 	jsctypes \
 	$(NULL)
 endif
 
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -65,17 +65,16 @@ CPPSRCS		= \
 		nsTraceRefcntImpl.cpp \
 		nsInterfaceRequestorAgg.cpp \
 		nsUUIDGenerator.cpp \
 		nsSystemInfo.cpp \
 		nsCycleCollector.cpp \
 		nsStackWalk.cpp \
 		nsMemoryReporterManager.cpp \
 		FunctionTimer.cpp \
-		Telemetry.cpp \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS		+= nsMacUtilsImpl.cpp
 endif
 
 EXPORTS		= \
 		nsAgg.h \
@@ -135,17 +134,16 @@ XPIDLSRCS	= \
 		nsIDebug2.idl \
 		nsIErrorService.idl \
 		nsIException.idl \
 		nsIExceptionService.idl \
 		nsIVersionComparator.idl \
 		nsIUUIDGenerator.idl \
 		nsIMutable.idl \
 		nsIMemoryReporter.idl \
-		nsITelemetry.idl \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 XPIDLSRCS	+= nsIMacUtils.idl
 endif
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -16,16 +16,15 @@ tail =
 [test_hidden_files.js]
 [test_home.js]
 [test_iniProcessor.js]
 [test_ioutil.js]
 [test_localfile.js]
 [test_mac_bundle.js]
 [test_nsIMutableArray.js]
 [test_nsIProcess.js]
-[test_nsITelemetry.js]
 [test_pipe.js]
 [test_storagestream.js]
 [test_streams.js]
 [test_stringstream.js]
 [test_symlinks.js]
 [test_systemInfo.js]
 [test_versioncomparator.js]