bug 1542861: browser, toolkit: fix remote agent packaging; r=firefox-build-system-reviewers,mshal
authorAndreas Tolfsen <ato@sny.no>
Tue, 09 Apr 2019 20:33:19 +0000
changeset 468649 d7aad31c5a2b73fbef942e1110e2eaca54d92380
parent 468648 5482e69aad1677810f038015930cb61fb4a8fc44
child 468650 cf5247b842517c7cbb0b4bf5f3e167fde469bfba
push id35845
push userncsoregi@mozilla.com
push dateWed, 10 Apr 2019 09:58:56 +0000
treeherdermozilla-central@d272180eb2fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, mshal
bugs1542861
milestone68.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 1542861: browser, toolkit: fix remote agent packaging; r=firefox-build-system-reviewers,mshal The RemoteAgent.js script has (temporarily) changed name to remote/command-line-handler.js, and the chrome component remote.jar was not included during packaging. This patch fixes both these things. Differential Revision: https://phabricator.services.mozilla.com/D26591
browser/installer/package-manifest.in
toolkit/moz.configure
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -184,17 +184,19 @@
 @RESPATH@/components/servicesComponents.manifest
 @RESPATH@/components/servicesSettings.manifest
 @RESPATH@/components/cryptoComponents.manifest
 
 @RESPATH@/components/Push.manifest
 
 ; CDP remote agent
 #ifdef ENABLE_REMOTE_AGENT
-@RESPATH@/components/RemoteAgent.js
+@RESPATH@/chrome/remote@JAREXT@
+@RESPATH@/chrome/remote.manifest
+@RESPATH@/components/command-line-handler.js
 @RESPATH@/components/RemoteAgent.manifest
 @RESPATH@/defaults/pref/remote.js
 #endif
 
 ; Marionette remote control protocol
 #ifdef ENABLE_MARIONETTE
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -908,29 +908,31 @@ def ft2_info(freetype2_combined_info, tr
 
 set_config('FT2_LIBS', ft2_info.libs)
 add_old_configure_assignment('FT2_LIBS',
                              ft2_info.libs)
 add_old_configure_assignment('FT2_CFLAGS',
                              ft2_info.cflags)
 
 
-# CDP remote agent
+# Remote agent (part of CDP based remote protocol)
 # ==============================================================
 #
+# See https://firefox-source-docs.mozilla.org/remote/ for more.
 # The source code lives under ../remote.
 
-option('--enable-cdp', help='Enable CDP-based remote agent')
+option('--enable-cdp', help='{Enable|Disable} remote agent')
 
 @depends('--enable-cdp')
 def remote(value):
     if value:
         return True
 
 set_config('ENABLE_REMOTE_AGENT', remote)
+set_define('ENABLE_REMOTE_AGENT', remote)
 
 
 # Marionette remote protocol
 # ==============================================================
 #
 # Marionette is the Gecko remote protocol used for various remote control,
 # automation, and testing purposes throughout Gecko, Firefox, and Fennec.
 # Marionette lives in ../testing/marionette.