Skip to content

Commit

Permalink
Bug 1369801 - dt-addon-fennec: package specific version of devtools a…
Browse files Browse the repository at this point in the history
…ddon for fennec;r=jryans

MozReview-Commit-ID: 50jh5spnHw6

--HG--
extra : rebase_source : 8b0b8f2f936a6f83166690cd15df642c61114a7e
  • Loading branch information
juliandescottes committed Jun 21, 2017
1 parent 2d21a9f commit 8a25ab0
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
9 changes: 9 additions & 0 deletions devtools/install.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,21 @@

<em:bootstrap>true</em:bootstrap>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
<!-- Firefox -->
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>44.0a1</em:minVersion>
<em:maxVersion>*</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Fennec -->
<em:targetApplication>
<Description>
<em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
<em:minVersion>44.0a1</em:minVersion>
<em:maxVersion>*</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
</RDF>
12 changes: 11 additions & 1 deletion devtools/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,20 @@ if CONFIG['MOZ_DEVTOOLS'] != 'addon':
'shared',
]
FINAL_TARGET_FILES.features['[email protected]'] += [
'bootstrap.js',
'install.rdf',
]

# For Fennec, provide an empty bootstrap.js that doesn't do anything.
# DevTools initialization is handled by mobile/android/chrome/content/RemoteDebugger.js
if CONFIG['MOZ_DEVTOOLS'] == 'server':
FINAL_TARGET_FILES.features['[email protected]'] += [
'server/bootstrap.js',
]
elif CONFIG['MOZ_DEVTOOLS'] != 'addon':
FINAL_TARGET_FILES.features['[email protected]'] += [
'bootstrap.js',
]

# /browser uses DIST_SUBDIR. We opt-in to this treatment when building
# DevTools for the browser to keep the root omni.ja slim for use by external XUL
# apps. Mulet also uses this since it includes /browser.
Expand Down
18 changes: 18 additions & 0 deletions devtools/server/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* 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/. */

/* exported startup, shutdown, install, uninstall */

// Fake bootstrap used when shipping only server part of devtools.

"use strict";

function startup(data) {
}

function shutdown(data, reason) {
}

function install() {}
function uninstall() {}

0 comments on commit 8a25ab0

Please sign in to comment.