Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 04:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1317733 - Simplify Marionette component file names; r=automatedtester

Browse Source 
MozReview-Commit-ID: 3byVSqpkr9

--HG--
rename : testing/marionette/components/marionettecomponent.js => testing/marionette/components/marionette.js
extra : rebase_source : 5db9377612c52bc636d55215f5dd7852ce0650bb
This commit is contained in:
Andreas Tolfsen 2016-11-15 17:16:23 +00:00
parent 3fd41bd102
commit f716b437df
7 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/installer/package-manifest.in
View File

@ -774,8 +774,8 @@ bin/libfreebl_32int64_3.so
#if defined(ENABLE_MARIONETTE) || !defined(MOZ_WIDGET_GONK)
@RESPATH@/chrome/marionette@JAREXT@
@RESPATH@/chrome/marionette.manifest
@RESPATH@/components/MarionetteComponents.manifest
@RESPATH@/components/marionettecomponent.js
@RESPATH@/components/marionette.manifest
@RESPATH@/components/marionette.js
#endif
@RESPATH@/components/AlertsService.js
@RESPATH@/components/ContentPermissionPrompt.js

4
browser/installer/package-manifest.in
View File

@ -527,8 +527,8 @@
@RESPATH@/chrome/marionette@JAREXT@
@RESPATH@/chrome/marionette.manifest
@RESPATH@/components/MarionetteComponents.manifest
@RESPATH@/components/marionettecomponent.js
@RESPATH@/components/marionette.manifest
@RESPATH@/components/marionette.js
#ifdef MOZ_WEBSPEECH
@RESPATH@/components/dom_webspeechsynth.xpt

4
mobile/android/installer/package-manifest.in
View File

@ -533,8 +533,8 @@
#ifdef ENABLE_MARIONETTE
@BINPATH@/chrome/marionette@JAREXT@
@BINPATH@/chrome/marionette.manifest
@BINPATH@/components/MarionetteComponents.manifest
@BINPATH@/components/marionettecomponent.js
@BINPATH@/components/marionette.manifest
@BINPATH@/components/marionette.js
#endif
#ifdef PKG_LOCALE_MANIFEST

5
testing/marionette/components/MarionetteComponents.manifest
View File

@ -1,5 +0,0 @@
# Marionette
component {786a1369-dca5-4adc-8486-33d23c88010a} marionettecomponent.js
contract @mozilla.org/marionette;1 {786a1369-dca5-4adc-8486-33d23c88010a}
category command-line-handler b-marionette @mozilla.org/marionette;1
category profile-after-change MarionetteComponent @mozilla.org/marionette;1

0
testing/marionette/components/marionettecomponent.js → testing/marionette/components/marionette.js
View File

4
testing/marionette/components/marionette.manifest Normal file
View File

@ -0,0 +1,4 @@
component {786a1369-dca5-4adc-8486-33d23c88010a} marionette.js
contract @mozilla.org/marionette;1 {786a1369-dca5-4adc-8486-33d23c88010a}
category command-line-handler b-marionette @mozilla.org/marionette;1
category profile-after-change Marionette @mozilla.org/marionette;1

15
testing/marionette/components/moz.build
View File

@ -1,16 +1,9 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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/.
EXTRA_COMPONENTS += [
'MarionetteComponents.manifest'
]
EXTRA_COMPONENTS += ["marionette.manifest"]
EXTRA_PP_COMPONENTS += ["marionette.js"]
EXTRA_PP_COMPONENTS += [
'marionettecomponent.js'
]
if CONFIG['ENABLE_MARIONETTE']:
DEFINES['ENABLE_MARIONETTE'] = 1
if CONFIG["ENABLE_MARIONETTE"]:
DEFINES["ENABLE_MARIONETTE"] = 1