Bug 856370 - Add a Makefile.in in webspeech/recognition and remove webspeech top-level VPATH. r=smaug
authorEitan Isaacson <eitan@monotonous.org>
Wed, 03 Apr 2013 15:13:16 -0700
changeset 127551 55ec568f51a2a70503948036a17d53ab8d74cbb4
parent 127550 3ccf83ffd75a2d83d658386bec8fbfd725be6aee
child 127552 9d72648fb76932f8d72a2a794190ec19cb3e4d2d
push id25854
push usereisaacson@mozilla.com
push dateWed, 03 Apr 2013 22:14:17 +0000
treeherdermozilla-inbound@bac9c49f0415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs856370
milestone23.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 856370 - Add a Makefile.in in webspeech/recognition and remove webspeech top-level VPATH. r=smaug
b2g/installer/package-manifest.in
b2g/installer/removed-files.in
browser/installer/package-manifest.in
browser/installer/removed-files.in
content/media/webspeech/Makefile.in
content/media/webspeech/moz.build
content/media/webspeech/recognition/Makefile.in
content/media/webspeech/recognition/moz.build
layout/build/Makefile.in
mobile/android/installer/package-manifest.in
mobile/android/installer/removed-files.in
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -209,17 +209,17 @@
 @BINPATH@/components/dom_sidebar.xpt
 @BINPATH@/components/dom_mobilemessage.xpt
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_threads.xpt
 @BINPATH@/components/dom_traversal.xpt
 @BINPATH@/components/dom_views.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeech.xpt
+@BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/dom_xul.xpt
 @BINPATH@/components/dom_time.xpt
 @BINPATH@/components/downloads.xpt
 @BINPATH@/components/editor.xpt
 @BINPATH@/components/embed_base.xpt
--- a/b2g/installer/removed-files.in
+++ b/b2g/installer/removed-files.in
@@ -6,16 +6,17 @@ run-mozilla.sh
 #endif
 #ifdef XP_WIN
   mozcrt19.dll
   mozcpp19.dll
 #endif
 defaults/preferences/services-sync.js
 defaults/preferences/healthreport-prefs.js
 components/dom_sms.xpt
+components/dom_webspeech.xpt
 #ifdef MOZ_FOLD_LIBS
 @DLL_PREFIX@nspr4@DLL_SUFFIX@
 @DLL_PREFIX@plds4@DLL_SUFFIX@
 @DLL_PREFIX@plc4@DLL_SUFFIX@
 @DLL_PREFIX@ssl3@DLL_SUFFIX@
 @DLL_PREFIX@smime3@DLL_SUFFIX@
 @DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -208,17 +208,17 @@
 @BINPATH@/components/dom_settings.xpt
 @BINPATH@/components/dom_permissionsettings.xpt
 @BINPATH@/components/dom_sidebar.xpt
 @BINPATH@/components/dom_mobilemessage.xpt
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_traversal.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeech.xpt
+@BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/dom_xul.xpt
 #ifdef MOZ_GAMEPAD
 @BINPATH@/components/dom_gamepad.xpt
 #endif
 @BINPATH@/components/downloads.xpt
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -86,16 +86,17 @@ components/nsXmlRpcClient.js
 components/pluginGlue.js
 components/sidebar.xpt
 #ifdef MOZ_B2G_RIL
 components/dom_telephony.xpt
 components/dom_wifi.xpt
 components/dom_system_b2g.xpt
 #endif
 components/dom_sms.xpt
+components/dom_webspeech.xpt
 components/uconvd.dll
 components/WeaveCrypto.js
 components/WeaveCrypto.manifest
 components/xmlextras.xpt
 components/xpcom.xpt
 components/xpti.dat
 components/xptitemp.dat
 components/nsMicrosummaryService.js
--- a/content/media/webspeech/Makefile.in
+++ b/content/media/webspeech/Makefile.in
@@ -1,54 +1,12 @@
 # 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/.
 
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
+DEPTH = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/dom/dom-config.mk
 
-VPATH += \
-  $(srcdir)/recognition \
-  $(srcdir)/recognition/test \
-  $(NULL)
-
-LIBRARY_NAME   := gkconwebspeech_s
-LIBXUL_LIBRARY := 1
-
-LOCAL_INCLUDES += $(VPATH:%=-I%)
-
-CPPSRCS := \
-  EnableWebSpeechRecognitionCheck.cpp \
-  SpeechGrammar.cpp \
-  SpeechGrammarList.cpp \
-  SpeechRecognitionAlternative.cpp \
-  SpeechRecognition.cpp \
-  SpeechRecognitionResult.cpp \
-  SpeechRecognitionResultList.cpp \
-  SpeechStreamListener.cpp \
-  endpointer.cc \
-  energy_endpointer.cc \
-  energy_endpointer_params.cc \
-  FakeSpeechRecognitionService.cpp \
-  $(NULL)
-
-EXPORTS_NAMESPACES := mozilla/dom
-EXPORTS_mozilla/dom := \
-  FakeSpeechRecognitionService.h \
-  SpeechGrammar.h \
-  SpeechGrammarList.h \
-  SpeechRecognitionAlternative.h \
-  SpeechRecognition.h \
-  SpeechRecognitionResult.h \
-  SpeechRecognitionResultList.h \
-  SpeechStreamListener.h \
-  $(NULL)
-
-FORCE_STATIC_LIB := 1
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/content/media/webspeech/moz.build
+++ b/content/media/webspeech/moz.build
@@ -1,16 +1,6 @@
 # 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/.
 
-MODULE = 'content'
-
-XPIDL_MODULE = 'dom_webspeech'
-
-XPIDL_SOURCES = [
-  'nsIDOMSpeechRecognitionEvent.idl',
-  'nsIDOMSpeechRecognitionError.idl',
-  'nsISpeechRecognitionService.idl'
-]
-
-TEST_DIRS += ['recognition/test']
+PARALLEL_DIRS = ['recognition']
copy from content/media/webspeech/Makefile.in
copy to content/media/webspeech/recognition/Makefile.in
--- a/content/media/webspeech/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -6,21 +6,20 @@ DEPTH            := @DEPTH@
 topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += \
-  $(srcdir)/recognition \
-  $(srcdir)/recognition/test \
+  $(srcdir)/test \
   $(NULL)
 
-LIBRARY_NAME   := gkconwebspeech_s
+LIBRARY_NAME   := gkconwebspeechrecognition_s
 LIBXUL_LIBRARY := 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 CPPSRCS := \
   EnableWebSpeechRecognitionCheck.cpp \
   SpeechGrammar.cpp \
   SpeechGrammarList.cpp \
copy from content/media/webspeech/moz.build
copy to content/media/webspeech/recognition/moz.build
--- a/content/media/webspeech/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -1,16 +1,16 @@
 # 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/.
 
 MODULE = 'content'
 
-XPIDL_MODULE = 'dom_webspeech'
+XPIDL_MODULE = 'dom_webspeechrecognition'
 
 XPIDL_SOURCES = [
   'nsIDOMSpeechRecognitionEvent.idl',
   'nsIDOMSpeechRecognitionError.idl',
   'nsISpeechRecognitionService.idl'
 ]
 
-TEST_DIRS += ['recognition/test']
+TEST_DIRS += ['test']
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -205,17 +205,17 @@ endif
 ifdef MOZ_DASH
 SHARED_LIBRARY_LIBS += \
   $(DEPTH)/content/media/dash/$(LIB_PREFIX)gkcondash_s.$(LIB_SUFFIX) \
   $(NULL)
 endif
 
 ifdef MOZ_WEBSPEECH
 SHARED_LIBRARY_LIBS += \
-  $(DEPTH)/content/media/webspeech/$(LIB_PREFIX)gkconwebspeech_s.$(LIB_SUFFIX) \
+  $(DEPTH)/content/media/webspeech/recognition/$(LIB_PREFIX)gkconwebspeechrecognition_s.$(LIB_SUFFIX) \
   $(NULL)
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		-I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -138,17 +138,17 @@
 @BINPATH@/components/dom_mobilemessage.xpt
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_system.xpt
 @BINPATH@/components/dom_threads.xpt
 @BINPATH@/components/dom_traversal.xpt
 @BINPATH@/components/dom_views.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeech.xpt
+@BINPATH@/components/dom_webspeechrecognition.xpt
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/dom_xul.xpt
 @BINPATH@/components/downloads.xpt
 @BINPATH@/components/editor.xpt
 @BINPATH@/components/embed_base.xpt
 @BINPATH@/components/extensions.xpt
--- a/mobile/android/installer/removed-files.in
+++ b/mobile/android/installer/removed-files.in
@@ -1,3 +1,4 @@
 update.locale
 README.txt
 defaults/preferences/healthreport-prefs.js
+components/dom_webspeech.xpt