From beed8bdb19f3f89c2f410e6a2c3165c09f1626e6 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Sun, 29 Nov 2015 17:08:35 +0000 Subject: [PATCH] Bug 1223573 - Part 4. Build system changes for Loop as a system add-on. r=mikedeboer,r=glandium --- .hgignore | 10 +- browser/components/moz.build | 1 - browser/extensions/loop/.eslintignore | 22 +- browser/extensions/loop/.eslintrc-gecko | 3 +- .../extensions/loop/content/modules/.eslintrc | 2 +- browser/extensions/loop/install.rdf.in | 39 +++ browser/extensions/loop/jar.mn | 248 ++++++++++-------- browser/extensions/loop/moz.build | 21 +- browser/extensions/loop/run-all-loop-tests.sh | 4 +- browser/extensions/moz.build | 1 + browser/installer/package-manifest.in | 1 + browser/themes/linux/jar.mn | 6 - browser/themes/osx/jar.mn | 14 - browser/themes/windows/jar.mn | 31 --- .../client/marionette/tests/unit-tests.ini | 2 +- 15 files changed, 216 insertions(+), 189 deletions(-) create mode 100644 browser/extensions/loop/install.rdf.in diff --git a/.hgignore b/.hgignore index 28f5bf8b43cc..0682c531c12e 100644 --- a/.hgignore +++ b/.hgignore @@ -80,9 +80,15 @@ GRTAGS GSYMS GPATH -# Unit tests for Loop +# Various items for Loop ^browser/components/loop/standalone/content/config\.js$ -^browser/components/loop/standalone/node_modules/ +^browser/extensions/loop/.*/node_modules/ +^browser/extensions/loop/.*\.module-cache +^browser/extensions/loop/test/coverage/desktop +^browser/extensions/loop/test/coverage/shared_standalone +^browser/extensions/loop/test/visual-regression/diff +^browser/extensions/loop/test/visual-regression/new +^browser/extensions/loop/test/visual-regression/refs # Git clone directory for updating web-platform-tests ^testing/web-platform/sync/ diff --git a/browser/components/moz.build b/browser/components/moz.build index 8e0d3cbd0c3f..74461650a938 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -11,7 +11,6 @@ DIRS += [ 'downloads', 'extensions', 'feeds', - 'loop', 'migration', 'newtab', 'places', diff --git a/browser/extensions/loop/.eslintignore b/browser/extensions/loop/.eslintignore index 64397d1db3d2..b5c8be673540 100644 --- a/browser/extensions/loop/.eslintignore +++ b/browser/extensions/loop/.eslintignore @@ -1,12 +1,16 @@ # This file currently uses a non-standard (and not on a standards track) # if statement within catch. -modules/MozLoopWorker.js +content/modules/MozLoopWorker.js # This file currently uses es7 features eslint issue: # https://github.com/eslint/espree/issues/125 -modules/MozLoopAPI.jsm +content/modules/MozLoopAPI.jsm +# Need to fix the configuration for this. +bootstrap.js +# Need to drop the preprocessing (bug 1212428) +content/preferences/prefs.js # Libs we don't need to check -content/libs -content/shared/libs +content/panels/vendor +content/shared/vendor standalone/content/libs standalone/node_modules # Libs we don't need to check @@ -15,11 +19,11 @@ test/shared/vendor test/coverage test/node_modules # These are generated react files that we don't need to check -content/js/conversation.js -content/js/conversationViews.js -content/js/panel.js -content/js/roomViews.js -content/js/feedbackViews.js +content/panels/js/conversation.js +content/panels/js/conversationViews.js +content/panels/js/panel.js +content/panels/js/roomViews.js +content/panels/js/feedbackViews.js content/shared/js/textChatView.js content/shared/js/linkifiedTextView.js content/shared/js/views.js diff --git a/browser/extensions/loop/.eslintrc-gecko b/browser/extensions/loop/.eslintrc-gecko index e4f17cb773cf..3fda68491412 100644 --- a/browser/extensions/loop/.eslintrc-gecko +++ b/browser/extensions/loop/.eslintrc-gecko @@ -7,9 +7,10 @@ "blockBindings": true, "destructuring": true, "generators": true, + "objectLiteralShorthandMethods": true, "restParams": true, "spread": true, - "objectLiteralShorthandMethods": true, + "templateStrings": true, }, "globals": { // Gecko + Loop Globals. diff --git a/browser/extensions/loop/content/modules/.eslintrc b/browser/extensions/loop/content/modules/.eslintrc index de960d6e5eec..5c7868e56d0f 100644 --- a/browser/extensions/loop/content/modules/.eslintrc +++ b/browser/extensions/loop/content/modules/.eslintrc @@ -1,3 +1,3 @@ { - "extends": "../.eslintrc-gecko" + "extends": "../../.eslintrc-gecko" } diff --git a/browser/extensions/loop/install.rdf.in b/browser/extensions/loop/install.rdf.in new file mode 100644 index 000000000000..2b09874541e4 --- /dev/null +++ b/browser/extensions/loop/install.rdf.in @@ -0,0 +1,39 @@ + + + +#filter substitution + + + + loop@mozilla.org + true + 0.1 + 2 + + + + + {ec8030f7-c20a-464f-9b0e-13a3a9e97384} + 45.0a1 + @FIREFOX_VERSION@ + + + + + + + xpcshell@tests.mozilla.org + 0 + 10 + + + + + Firefox Hello + Web sharing for Firefox + Mozilla + + diff --git a/browser/extensions/loop/jar.mn b/browser/extensions/loop/jar.mn index 3532277924e4..e7ebe3d4ea9b 100644 --- a/browser/extensions/loop/jar.mn +++ b/browser/extensions/loop/jar.mn @@ -2,135 +2,163 @@ # 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/. -browser.jar: - # Desktop html files - content/browser/loop/conversation.html (content/conversation.html) - content/browser/loop/panel.html (content/panel.html) +[.] chrome.jar: +% content loop %content/ contentaccessible=yes +% skin loop classic/1.0 %skin/linux/ os=Linux +% skin loop classic/1.0 %skin/osx/ os=Darwin +% skin loop classic/1.0 %skin/windows/ os=WINNT +% skin loop-shared classic/1.0 %skin/shared/ +% override chrome://loop/skin/menuPanel.png chrome://loop/skin/menuPanel-yosemite.png os=Darwin osversion>=10.10 +% override chrome://loop/skin/menuPanel@2x.png chrome://loop/skin/menuPanel-yosemite@2x.png os=Darwin osversion>=10.10 +% override chrome://loop/skin/toolbar.png chrome://loop/skin/toolbar-yosemite.png os=Darwin osversion>=10.10 +% override chrome://loop/skin/toolbar@2x.png chrome://loop/skin/toolbar-yosemite@2x.png os=Darwin osversion>=10.10 +% override chrome://loop/skin/menuPanel.png chrome://loop/skin/menuPanel-aero.png os=WINNT osversion=6 +% override chrome://loop/skin/menuPanel.png chrome://loop/skin/menuPanel-aero.png os=WINNT osversion=6.1 +% override chrome://loop/skin/menuPanel@2x.png chrome://loop/skin/menuPanel-aero@2x.png os=WINNT osversion=6 +% override chrome://loop/skin/menuPanel@2x.png chrome://loop/skin/menuPanel-aero@2x.png os=WINNT osversion=6.1 +% override chrome://loop/skin/toolbar.png chrome://loop/skin/toolbar-XP.png os=WINNT osversion<6 +% override chrome://loop/skin/toolbar.png chrome://loop/skin/toolbar-aero.png os=WINNT osversion=6 +% override chrome://loop/skin/toolbar.png chrome://loop/skin/toolbar-aero.png os=WINNT osversion=6.1 +% override chrome://loop/skin/toolbar.png chrome://loop/skin/toolbar-win8.png os=WINNT osversion=6.2 +% override chrome://loop/skin/toolbar.png chrome://loop/skin/toolbar-win8.png os=WINNT osversion=6.3 +% override chrome://loop/skin/toolbar@2x.png chrome://loop/skin/toolbar-XP@2x.png os=WINNT osversion<6 +% override chrome://loop/skin/toolbar@2x.png chrome://loop/skin/toolbar-aero@2x.png os=WINNT osversion=6 +% override chrome://loop/skin/toolbar@2x.png chrome://loop/skin/toolbar-aero@2x.png os=WINNT osversion=6.1 +% override chrome://loop/skin/toolbar@2x.png chrome://loop/skin/toolbar-win8@2x.png os=WINNT osversion=6.2 +% override chrome://loop/skin/toolbar@2x.png chrome://loop/skin/toolbar-win8@2x.png os=WINNT osversion=6.3 + skin/ (skin/*) + content/modules/ (content/modules/*) +* content/preferences/prefs.js (content/preferences/prefs.js) - # Desktop libs (see bottom of this file for TokBox sdk assets) - content/browser/loop/libs/l10n.js (content/libs/l10n.js) + # Desktop html files + content/panels/conversation.html (content/panels/conversation.html) + content/panels/panel.html (content/panels/panel.html) + + # Desktop vendor (see bottom of this file for TokBox sdk assets) + content/panels/vendor/l10n.js (content/panels/vendor/l10n.js) # Desktop script - content/browser/loop/js/conversation.js (content/js/conversation.js) - content/browser/loop/js/conversationAppStore.js (content/js/conversationAppStore.js) - content/browser/loop/js/otconfig.js (content/js/otconfig.js) - content/browser/loop/js/panel.js (content/js/panel.js) - content/browser/loop/js/roomStore.js (content/js/roomStore.js) - content/browser/loop/js/roomViews.js (content/js/roomViews.js) - content/browser/loop/js/feedbackViews.js (content/js/feedbackViews.js) + content/panels/js/conversation.js (content/panels/js/conversation.js) + content/panels/js/conversationAppStore.js (content/panels/js/conversationAppStore.js) + content/panels/js/otconfig.js (content/panels/js/otconfig.js) + content/panels/js/panel.js (content/panels/js/panel.js) + content/panels/js/roomStore.js (content/panels/js/roomStore.js) + content/panels/js/roomViews.js (content/panels/js/roomViews.js) + content/panels/js/feedbackViews.js (content/panels/js/feedbackViews.js) # Desktop styles - content/browser/loop/css/panel.css (content/css/panel.css) + content/panels/css/panel.css (content/panels/css/panel.css) # Shared styles - content/browser/loop/shared/css/reset.css (content/shared/css/reset.css) - content/browser/loop/shared/css/common.css (content/shared/css/common.css) - content/browser/loop/shared/css/conversation.css (content/shared/css/conversation.css) + content/shared/css/reset.css (content/shared/css/reset.css) + content/shared/css/common.css (content/shared/css/common.css) + content/shared/css/conversation.css (content/shared/css/conversation.css) # Shared images - content/browser/loop/shared/img/helloicon.svg (content/shared/img/helloicon.svg) - content/browser/loop/shared/img/icon_32.png (content/shared/img/icon_32.png) - content/browser/loop/shared/img/icon_64.png (content/shared/img/icon_64.png) - content/browser/loop/shared/img/spinner.svg (content/shared/img/spinner.svg) + content/shared/img/helloicon.svg (content/shared/img/helloicon.svg) + content/shared/img/icon_32.png (content/shared/img/icon_32.png) + content/shared/img/icon_64.png (content/shared/img/icon_64.png) + content/shared/img/spinner.svg (content/shared/img/spinner.svg) # XXX could get rid of the png spinner usages and replace them with the svg # one? - content/browser/loop/shared/img/spinner.png (content/shared/img/spinner.png) - content/browser/loop/shared/img/spinner@2x.png (content/shared/img/spinner@2x.png) - content/browser/loop/shared/img/sad_hello_icon_64x64.svg (content/shared/img/sad_hello_icon_64x64.svg) - content/browser/loop/shared/img/chatbubble-arrow-left.svg (content/shared/img/chatbubble-arrow-left.svg) - content/browser/loop/shared/img/chatbubble-arrow-right.svg (content/shared/img/chatbubble-arrow-right.svg) - content/browser/loop/shared/img/facemute-14x14.png (content/shared/img/facemute-14x14.png) - content/browser/loop/shared/img/facemute-14x14@2x.png (content/shared/img/facemute-14x14@2x.png) - content/browser/loop/shared/img/hangup-inverse-14x14.png (content/shared/img/hangup-inverse-14x14.png) - content/browser/loop/shared/img/hangup-inverse-14x14@2x.png (content/shared/img/hangup-inverse-14x14@2x.png) - content/browser/loop/shared/img/mute-inverse-14x14.png (content/shared/img/mute-inverse-14x14.png) - content/browser/loop/shared/img/mute-inverse-14x14@2x.png (content/shared/img/mute-inverse-14x14@2x.png) - content/browser/loop/shared/img/svg/glyph-email-16x16.svg (content/shared/img/svg/glyph-email-16x16.svg) - content/browser/loop/shared/img/svg/glyph-facebook-16x16.svg (content/shared/img/svg/glyph-facebook-16x16.svg) - content/browser/loop/shared/img/svg/glyph-help-16x16.svg (content/shared/img/svg/glyph-help-16x16.svg) - content/browser/loop/shared/img/svg/glyph-link-16x16.svg (content/shared/img/svg/glyph-link-16x16.svg) - content/browser/loop/shared/img/svg/glyph-user-16x16.svg (content/shared/img/svg/glyph-user-16x16.svg) - content/browser/loop/shared/img/svg/exit.svg (content/shared/img/svg/exit.svg) - content/browser/loop/shared/img/svg/audio.svg (content/shared/img/svg/audio.svg) - content/browser/loop/shared/img/svg/audio-hover.svg (content/shared/img/svg/audio-hover.svg) - content/browser/loop/shared/img/svg/audio-mute.svg (content/shared/img/svg/audio-mute.svg) - content/browser/loop/shared/img/svg/audio-mute-hover.svg (content/shared/img/svg/audio-mute-hover.svg) - content/browser/loop/shared/img/svg/video.svg (content/shared/img/svg/video.svg) - content/browser/loop/shared/img/svg/video-hover.svg (content/shared/img/svg/video-hover.svg) - content/browser/loop/shared/img/svg/video-mute.svg (content/shared/img/svg/video-mute.svg) - content/browser/loop/shared/img/svg/video-mute-hover.svg (content/shared/img/svg/video-mute-hover.svg) - content/browser/loop/shared/img/svg/settings.svg (content/shared/img/svg/settings.svg) - content/browser/loop/shared/img/svg/settings-hover.svg (content/shared/img/svg/settings-hover.svg) - content/browser/loop/shared/img/svg/sharing.svg (content/shared/img/svg/sharing.svg) - content/browser/loop/shared/img/svg/sharing-active.svg (content/shared/img/svg/sharing-active.svg) - content/browser/loop/shared/img/svg/sharing-pending.svg (content/shared/img/svg/sharing-pending.svg) - content/browser/loop/shared/img/svg/sharing-hover.svg (content/shared/img/svg/sharing-hover.svg) - content/browser/loop/shared/img/svg/media-group.svg (content/shared/img/svg/media-group.svg) - content/browser/loop/shared/img/svg/media-group-left-hover.svg (content/shared/img/svg/media-group-left-hover.svg) - content/browser/loop/shared/img/svg/media-group-right-hover.svg (content/shared/img/svg/media-group-right-hover.svg) - content/browser/loop/shared/img/audio-call-avatar.svg (content/shared/img/audio-call-avatar.svg) - content/browser/loop/shared/img/beta-ribbon.svg (content/shared/img/beta-ribbon.svg) - content/browser/loop/shared/img/check.svg (content/shared/img/check.svg) - content/browser/loop/shared/img/icons-10x10.svg (content/shared/img/icons-10x10.svg) - content/browser/loop/shared/img/icons-14x14.svg (content/shared/img/icons-14x14.svg) - content/browser/loop/shared/img/icons-16x16.svg (content/shared/img/icons-16x16.svg) - content/browser/loop/shared/img/movistar.png (content/shared/img/movistar.png) - content/browser/loop/shared/img/movistar@2x.png (content/shared/img/movistar@2x.png) - content/browser/loop/shared/img/vivo.png (content/shared/img/vivo.png) - content/browser/loop/shared/img/vivo@2x.png (content/shared/img/vivo@2x.png) - content/browser/loop/shared/img/02.png (content/shared/img/02.png) - content/browser/loop/shared/img/02@2x.png (content/shared/img/02@2x.png) - content/browser/loop/shared/img/telefonica.png (content/shared/img/telefonica.png) - content/browser/loop/shared/img/hello_logo.svg (content/shared/img/hello_logo.svg) - content/browser/loop/shared/img/telefonica@2x.png (content/shared/img/telefonica@2x.png) - content/browser/loop/shared/img/ellipsis-v.svg (content/shared/img/ellipsis-v.svg) - content/browser/loop/shared/img/empty_conversations.svg (content/shared/img/empty_conversations.svg) - content/browser/loop/shared/img/empty_search.svg (content/shared/img/empty_search.svg) - content/browser/loop/shared/img/animated-spinner.svg (content/shared/img/animated-spinner.svg) - content/browser/loop/shared/img/avatars.svg (content/shared/img/avatars.svg) - content/browser/loop/shared/img/firefox-avatar.svg (content/shared/img/firefox-avatar.svg) - content/browser/loop/shared/img/pause-12x12.svg (content/shared/img/pause-12x12.svg) - content/browser/loop/shared/img/play-12x12.svg (content/shared/img/play-12x12.svg) - content/browser/loop/shared/img/stop-12x12.svg (content/shared/img/stop-12x12.svg) + content/shared/img/spinner.png (content/shared/img/spinner.png) + content/shared/img/spinner@2x.png (content/shared/img/spinner@2x.png) + content/shared/img/sad_hello_icon_64x64.svg (content/shared/img/sad_hello_icon_64x64.svg) + content/shared/img/chatbubble-arrow-left.svg (content/shared/img/chatbubble-arrow-left.svg) + content/shared/img/chatbubble-arrow-right.svg (content/shared/img/chatbubble-arrow-right.svg) + content/shared/img/facemute-14x14.png (content/shared/img/facemute-14x14.png) + content/shared/img/facemute-14x14@2x.png (content/shared/img/facemute-14x14@2x.png) + content/shared/img/hangup-inverse-14x14.png (content/shared/img/hangup-inverse-14x14.png) + content/shared/img/hangup-inverse-14x14@2x.png (content/shared/img/hangup-inverse-14x14@2x.png) + content/shared/img/mute-inverse-14x14.png (content/shared/img/mute-inverse-14x14.png) + content/shared/img/mute-inverse-14x14@2x.png (content/shared/img/mute-inverse-14x14@2x.png) + content/shared/img/glyph-email-16x16.svg (content/shared/img/glyph-email-16x16.svg) + content/shared/img/glyph-facebook-16x16.svg (content/shared/img/glyph-facebook-16x16.svg) + content/shared/img/glyph-help-16x16.svg (content/shared/img/glyph-help-16x16.svg) + content/shared/img/glyph-link-16x16.svg (content/shared/img/glyph-link-16x16.svg) + content/shared/img/glyph-user-16x16.svg (content/shared/img/glyph-user-16x16.svg) + content/shared/img/exit.svg (content/shared/img/exit.svg) + content/shared/img/audio.svg (content/shared/img/audio.svg) + content/shared/img/audio-hover.svg (content/shared/img/audio-hover.svg) + content/shared/img/audio-mute.svg (content/shared/img/audio-mute.svg) + content/shared/img/audio-mute-hover.svg (content/shared/img/audio-mute-hover.svg) + content/shared/img/video.svg (content/shared/img/video.svg) + content/shared/img/video-hover.svg (content/shared/img/video-hover.svg) + content/shared/img/video-mute.svg (content/shared/img/video-mute.svg) + content/shared/img/video-mute-hover.svg (content/shared/img/video-mute-hover.svg) + content/shared/img/settings.svg (content/shared/img/settings.svg) + content/shared/img/settings-hover.svg (content/shared/img/settings-hover.svg) + content/shared/img/sharing.svg (content/shared/img/sharing.svg) + content/shared/img/sharing-active.svg (content/shared/img/sharing-active.svg) + content/shared/img/sharing-pending.svg (content/shared/img/sharing-pending.svg) + content/shared/img/sharing-hover.svg (content/shared/img/sharing-hover.svg) + content/shared/img/media-group.svg (content/shared/img/media-group.svg) + content/shared/img/media-group-left-hover.svg (content/shared/img/media-group-left-hover.svg) + content/shared/img/media-group-right-hover.svg (content/shared/img/media-group-right-hover.svg) + content/shared/img/audio-call-avatar.svg (content/shared/img/audio-call-avatar.svg) + content/shared/img/beta-ribbon.svg (content/shared/img/beta-ribbon.svg) + content/shared/img/check.svg (content/shared/img/check.svg) + content/shared/img/icons-10x10.svg (content/shared/img/icons-10x10.svg) + content/shared/img/icons-14x14.svg (content/shared/img/icons-14x14.svg) + content/shared/img/icons-16x16.svg (content/shared/img/icons-16x16.svg) + content/shared/img/movistar.png (content/shared/img/movistar.png) + content/shared/img/movistar@2x.png (content/shared/img/movistar@2x.png) + content/shared/img/vivo.png (content/shared/img/vivo.png) + content/shared/img/vivo@2x.png (content/shared/img/vivo@2x.png) + content/shared/img/02.png (content/shared/img/02.png) + content/shared/img/02@2x.png (content/shared/img/02@2x.png) + content/shared/img/telefonica.png (content/shared/img/telefonica.png) + content/shared/img/hello_logo.svg (content/shared/img/hello_logo.svg) + content/shared/img/telefonica@2x.png (content/shared/img/telefonica@2x.png) + content/shared/img/ellipsis-v.svg (content/shared/img/ellipsis-v.svg) + content/shared/img/empty_conversations.svg (content/shared/img/empty_conversations.svg) + content/shared/img/empty_search.svg (content/shared/img/empty_search.svg) + content/shared/img/animated-spinner.svg (content/shared/img/animated-spinner.svg) + content/shared/img/avatars.svg (content/shared/img/avatars.svg) + content/shared/img/firefox-avatar.svg (content/shared/img/firefox-avatar.svg) + content/shared/img/pause-12x12.svg (content/shared/img/pause-12x12.svg) + content/shared/img/play-12x12.svg (content/shared/img/play-12x12.svg) + content/shared/img/stop-12x12.svg (content/shared/img/stop-12x12.svg) # Shared scripts - content/browser/loop/shared/js/actions.js (content/shared/js/actions.js) - content/browser/loop/shared/js/store.js (content/shared/js/store.js) - content/browser/loop/shared/js/activeRoomStore.js (content/shared/js/activeRoomStore.js) - content/browser/loop/shared/js/dispatcher.js (content/shared/js/dispatcher.js) - content/browser/loop/shared/js/linkifiedTextView.js (content/shared/js/linkifiedTextView.js) - content/browser/loop/shared/js/loopapi-client.js (content/shared/js/loopapi-client.js) - content/browser/loop/shared/js/models.js (content/shared/js/models.js) - content/browser/loop/shared/js/mixins.js (content/shared/js/mixins.js) - content/browser/loop/shared/js/otSdkDriver.js (content/shared/js/otSdkDriver.js) - content/browser/loop/shared/js/views.js (content/shared/js/views.js) - content/browser/loop/shared/js/textChatStore.js (content/shared/js/textChatStore.js) - content/browser/loop/shared/js/textChatView.js (content/shared/js/textChatView.js) - content/browser/loop/shared/js/urlRegExps.js (content/shared/js/urlRegExps.js) - content/browser/loop/shared/js/utils.js (content/shared/js/utils.js) - content/browser/loop/shared/js/validate.js (content/shared/js/validate.js) + content/shared/js/actions.js (content/shared/js/actions.js) + content/shared/js/crypto.js (content/shared/js/crypto.js) + content/shared/js/store.js (content/shared/js/store.js) + content/shared/js/activeRoomStore.js (content/shared/js/activeRoomStore.js) + content/shared/js/dispatcher.js (content/shared/js/dispatcher.js) + content/shared/js/linkifiedTextView.js (content/shared/js/linkifiedTextView.js) + content/shared/js/loopapi-client.js (content/shared/js/loopapi-client.js) + content/shared/js/models.js (content/shared/js/models.js) + content/shared/js/mixins.js (content/shared/js/mixins.js) + content/shared/js/otSdkDriver.js (content/shared/js/otSdkDriver.js) + content/shared/js/views.js (content/shared/js/views.js) + content/shared/js/textChatStore.js (content/shared/js/textChatStore.js) + content/shared/js/textChatView.js (content/shared/js/textChatView.js) + content/shared/js/urlRegExps.js (content/shared/js/urlRegExps.js) + content/shared/js/utils.js (content/shared/js/utils.js) + content/shared/js/validate.js (content/shared/js/validate.js) # Shared libs #ifdef DEBUG - content/browser/loop/shared/libs/react-0.13.3.js (content/shared/libs/react-0.13.3.js) + content/shared/vendor/react-0.13.3.js (content/shared/vendor/react-0.13.3.js) #else - content/browser/loop/shared/libs/react-0.13.3.js (content/shared/libs/react-0.13.3-prod.js) + content/shared/vendor/react-0.13.3.js (content/shared/vendor/react-0.13.3-prod.js) #endif - content/browser/loop/shared/libs/lodash-3.9.3.js (content/shared/libs/lodash-3.9.3.js) - content/browser/loop/shared/libs/backbone-1.2.1.js (content/shared/libs/backbone-1.2.1.js) - content/browser/loop/shared/libs/classnames-2.2.0.js (content/shared/libs/classnames-2.2.0.js) + content/shared/vendor/lodash-3.9.3.js (content/shared/vendor/lodash-3.9.3.js) + content/shared/vendor/backbone-1.2.1.js (content/shared/vendor/backbone-1.2.1.js) + content/shared/vendor/classnames-2.2.0.js (content/shared/vendor/classnames-2.2.0.js) # Shared sounds - content/browser/loop/shared/sounds/ringtone.ogg (content/shared/sounds/ringtone.ogg) - content/browser/loop/shared/sounds/connecting.ogg (content/shared/sounds/connecting.ogg) - content/browser/loop/shared/sounds/connected.ogg (content/shared/sounds/connected.ogg) - content/browser/loop/shared/sounds/terminated.ogg (content/shared/sounds/terminated.ogg) - content/browser/loop/shared/sounds/room-joined.ogg (content/shared/sounds/room-joined.ogg) - content/browser/loop/shared/sounds/room-joined-in.ogg (content/shared/sounds/room-joined-in.ogg) - content/browser/loop/shared/sounds/room-left.ogg (content/shared/sounds/room-left.ogg) - content/browser/loop/shared/sounds/failure.ogg (content/shared/sounds/failure.ogg) - content/browser/loop/shared/sounds/message.ogg (content/shared/sounds/message.ogg) + content/shared/sounds/ringtone.ogg (content/shared/sounds/ringtone.ogg) + content/shared/sounds/connecting.ogg (content/shared/sounds/connecting.ogg) + content/shared/sounds/connected.ogg (content/shared/sounds/connected.ogg) + content/shared/sounds/terminated.ogg (content/shared/sounds/terminated.ogg) + content/shared/sounds/room-joined.ogg (content/shared/sounds/room-joined.ogg) + content/shared/sounds/room-joined-in.ogg (content/shared/sounds/room-joined-in.ogg) + content/shared/sounds/room-left.ogg (content/shared/sounds/room-left.ogg) + content/shared/sounds/failure.ogg (content/shared/sounds/failure.ogg) + content/shared/sounds/message.ogg (content/shared/sounds/message.ogg) # Partner SDK assets - content/browser/loop/libs/sdk.js (content/shared/libs/sdk.js) - content/browser/loop/sdk-content/js/dynamic_config.min.js (content/shared/libs/sdk-content/js/dynamic_config.min.js) + content/shared/vendor/sdk.js (content/shared/vendor/sdk.js) + content/sdk-content/js/dynamic_config.min.js (content/shared/vendor/sdk-content/js/dynamic_config.min.js) diff --git a/browser/extensions/loop/moz.build b/browser/extensions/loop/moz.build index b76d562ec638..f9124ef2fe21 100644 --- a/browser/extensions/loop/moz.build +++ b/browser/extensions/loop/moz.build @@ -4,6 +4,16 @@ # 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/. +FINAL_TARGET = 'dist/bin/browser/features/loop@test.mozilla.org' + +FINAL_TARGET_FILES += [ + 'bootstrap.js' +] + +DIST_FILES += [ + 'install.rdf.in' +] + JAR_MANIFESTS += ['jar.mn'] XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] @@ -12,16 +22,5 @@ BROWSER_CHROME_MANIFESTS += [ 'test/mochitest/browser.ini', ] -EXTRA_JS_MODULES.loop += [ - 'content/shared/js/crypto.js', - 'content/shared/js/utils.js', - 'modules/LoopRooms.jsm', - 'modules/LoopRoomsCache.jsm', - 'modules/MozLoopAPI.jsm', - 'modules/MozLoopPushHandler.jsm', - 'modules/MozLoopService.jsm', - 'modules/MozLoopWorker.js', -] - with Files('**'): BUG_COMPONENT = ('Loop', 'Client') diff --git a/browser/extensions/loop/run-all-loop-tests.sh b/browser/extensions/loop/run-all-loop-tests.sh index 2628c0b1aed2..dee165708fc5 100755 --- a/browser/extensions/loop/run-all-loop-tests.sh +++ b/browser/extensions/loop/run-all-loop-tests.sh @@ -12,7 +12,7 @@ set -e # Main tests -LOOPDIR=browser/components/loop +LOOPDIR=browser/extensions/loop ESLINT=standalone/node_modules/.bin/eslint if [ -x "${LOOPDIR}/${ESLINT}" ]; then echo 'running eslint; see http://eslint.org/docs/rules/ for error info' @@ -25,7 +25,7 @@ fi # Build tests coverage. MISSINGDEPSMSG="\nMake sure all dependencies are up to date by running -'npm install' inside the 'browser/components/loop/test/' directory.\n" +'npm install' inside the 'browser/extensions/loop/test/' directory.\n" ( cd ${LOOPDIR}/test if ! npm run-script build-coverage ; then diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index cf19e7519aae..7d54e6e2f045 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -5,6 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ + 'loop', 'pdfjs', 'shumway', ] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 0e3771f7872e..35bccc54d340 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -676,6 +676,7 @@ @RESPATH@/browser/chrome/icons/default/default32.png @RESPATH@/browser/chrome/icons/default/default48.png #endif +@RESPATH@/browser/features/* ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 6e70af6af79e..bb09979e74d1 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -47,12 +47,6 @@ browser.jar: skin/classic/browser/Toolbar-inverted.png skin/classic/browser/Toolbar-small.png skin/classic/browser/webRTC-indicator.css - skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png) - skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png) - skin/classic/browser/loop/toolbar.png (loop/toolbar.png) - skin/classic/browser/loop/toolbar@2x.png (loop/toolbar@2x.png) - skin/classic/browser/loop/toolbar-inverted.png (loop/toolbar-inverted.png) - skin/classic/browser/loop/toolbar-inverted@2x.png (loop/toolbar-inverted@2x.png) * skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css) skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png) skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png) diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 067270e3d4ca..48911ec4ac93 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -73,16 +73,6 @@ browser.jar: skin/classic/browser/webRTC-sharingScreen-menubar.png skin/classic/browser/webRTC-sharingScreen-menubar@2x.png skin/classic/browser/webRTC-indicator.css - skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png) - skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png) - skin/classic/browser/loop/toolbar.png (loop/toolbar.png) - skin/classic/browser/loop/toolbar@2x.png (loop/toolbar@2x.png) - skin/classic/browser/loop/toolbar-inverted.png (loop/toolbar-inverted.png) - skin/classic/browser/loop/toolbar-inverted@2x.png (loop/toolbar-inverted@2x.png) - skin/classic/browser/yosemite/loop/menuPanel.png (loop/menuPanel-yosemite.png) - skin/classic/browser/yosemite/loop/menuPanel@2x.png (loop/menuPanel-yosemite@2x.png) - skin/classic/browser/yosemite/loop/toolbar.png (loop/toolbar-yosemite.png) - skin/classic/browser/yosemite/loop/toolbar@2x.png (loop/toolbar-yosemite@2x.png) * skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css) skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png) skin/classic/browser/customizableui/customize-titleBar-toggle.png (customizableui/customize-titleBar-toggle.png) @@ -280,10 +270,6 @@ browser.jar: % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/yosemite/Toolbar@2x.png os=Darwin osversion>=10.10 % override chrome://browser/skin/menuPanel.png chrome://browser/skin/yosemite/menuPanel.png os=Darwin osversion>=10.10 % override chrome://browser/skin/menuPanel@2x.png chrome://browser/skin/yosemite/menuPanel@2x.png os=Darwin osversion>=10.10 -% override chrome://browser/skin/loop/menuPanel.png chrome://browser/skin/yosemite/loop/menuPanel.png os=Darwin osversion>=10.10 -% override chrome://browser/skin/loop/menuPanel@2x.png chrome://browser/skin/yosemite/loop/menuPanel@2x.png os=Darwin osversion>=10.10 -% override chrome://browser/skin/loop/toolbar.png chrome://browser/skin/yosemite/loop/toolbar.png os=Darwin osversion>=10.10 -% override chrome://browser/skin/loop/toolbar@2x.png chrome://browser/skin/yosemite/loop/toolbar@2x.png os=Darwin osversion>=10.10 % override chrome://browser/skin/menuPanel-customize.png chrome://browser/skin/yosemite/menuPanel-customize.png os=Darwin osversion>=10.10 % override chrome://browser/skin/menuPanel-customize@2x.png chrome://browser/skin/yosemite/menuPanel-customize@2x.png os=Darwin osversion>=10.10 % override chrome://browser/skin/menuPanel-exit.png chrome://browser/skin/yosemite/menuPanel-exit.png os=Darwin osversion>=10.10 diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 6006c67bfb2c..43cc06470123 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -83,22 +83,6 @@ browser.jar: skin/classic/browser/urlbar-history-dropmarker-XPVista7.png skin/classic/browser/urlbar-history-dropmarker-XPVista7@2x.png skin/classic/browser/webRTC-indicator.css - skin/classic/browser/loop/menuPanel.png (loop/menuPanel.png) - skin/classic/browser/loop/menuPanel@2x.png (loop/menuPanel@2x.png) - skin/classic/browser/loop/menuPanel-aero.png (loop/menuPanel-aero.png) - skin/classic/browser/loop/menuPanel-aero@2x.png (loop/menuPanel-aero@2x.png) - skin/classic/browser/loop/toolbar.png (loop/toolbar.png) - skin/classic/browser/loop/toolbar@2x.png (loop/toolbar@2x.png) - skin/classic/browser/loop/toolbar-aero.png (loop/toolbar-aero.png) - skin/classic/browser/loop/toolbar-aero@2x.png (loop/toolbar-aero@2x.png) - skin/classic/browser/loop/toolbar-inverted.png (loop/toolbar-inverted.png) - skin/classic/browser/loop/toolbar-inverted@2x.png (loop/toolbar-inverted@2x.png) - skin/classic/browser/loop/toolbar-lunaSilver.png (loop/toolbar-lunaSilver.png) - skin/classic/browser/loop/toolbar-lunaSilver@2x.png (loop/toolbar-lunaSilver@2x.png) - skin/classic/browser/loop/toolbar-win8.png (loop/toolbar-win8.png) - skin/classic/browser/loop/toolbar-win8@2x.png (loop/toolbar-win8@2x.png) - skin/classic/browser/loop/toolbar-XP.png (loop/toolbar-XP.png) - skin/classic/browser/loop/toolbar-XP@2x.png (loop/toolbar-XP@2x.png) * skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css) skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png) skin/classic/browser/customizableui/customize-titleBar-toggle.png (customizableui/customize-titleBar-toggle.png) @@ -325,26 +309,11 @@ browser.jar: % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6.1 % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.2 % override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.3 -% override chrome://browser/skin/loop/menuPanel.png chrome://browser/skin/loop/menuPanel-aero.png os=WINNT osversion=6 -% override chrome://browser/skin/loop/menuPanel.png chrome://browser/skin/loop/menuPanel-aero.png os=WINNT osversion=6.1 -% override chrome://browser/skin/loop/menuPanel@2x.png chrome://browser/skin/loop/menuPanel-aero@2x.png os=WINNT osversion=6 -% override chrome://browser/skin/loop/menuPanel@2x.png chrome://browser/skin/loop/menuPanel-aero@2x.png os=WINNT osversion=6.1 - % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-XP.png os=WINNT osversion<6 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6.1 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.2 % override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.3 -% override chrome://browser/skin/loop/toolbar.png chrome://browser/skin/loop/toolbar-XP.png os=WINNT osversion<6 -% override chrome://browser/skin/loop/toolbar.png chrome://browser/skin/loop/toolbar-aero.png os=WINNT osversion=6 -% override chrome://browser/skin/loop/toolbar.png chrome://browser/skin/loop/toolbar-aero.png os=WINNT osversion=6.1 -% override chrome://browser/skin/loop/toolbar.png chrome://browser/skin/loop/toolbar-win8.png os=WINNT osversion=6.2 -% override chrome://browser/skin/loop/toolbar.png chrome://browser/skin/loop/toolbar-win8.png os=WINNT osversion=6.3 -% override chrome://browser/skin/loop/toolbar@2x.png chrome://browser/skin/loop/toolbar-XP@2x.png os=WINNT osversion<6 -% override chrome://browser/skin/loop/toolbar@2x.png chrome://browser/skin/loop/toolbar-aero@2x.png os=WINNT osversion=6 -% override chrome://browser/skin/loop/toolbar@2x.png chrome://browser/skin/loop/toolbar-aero@2x.png os=WINNT osversion=6.1 -% override chrome://browser/skin/loop/toolbar@2x.png chrome://browser/skin/loop/toolbar-win8@2x.png os=WINNT osversion=6.2 -% override chrome://browser/skin/loop/toolbar@2x.png chrome://browser/skin/loop/toolbar-win8@2x.png os=WINNT osversion=6.3 % override chrome://browser/skin/preferences/checkbox.png chrome://browser/skin/preferences/checkbox-aero.png os=WINNT osversion=6 % override chrome://browser/skin/preferences/checkbox.png chrome://browser/skin/preferences/checkbox-aero.png os=WINNT osversion=6.1 % override chrome://browser/skin/preferences/checkbox.png chrome://browser/skin/preferences/checkbox-xp.png os=WINNT osversion<6 diff --git a/testing/marionette/client/marionette/tests/unit-tests.ini b/testing/marionette/client/marionette/tests/unit-tests.ini index aa9e73058eda..5786ad6835f5 100644 --- a/testing/marionette/client/marionette/tests/unit-tests.ini +++ b/testing/marionette/client/marionette/tests/unit-tests.ini @@ -19,4 +19,4 @@ test_container = true [include:../../../../../layout/base/tests/marionette/manifest.ini] ; loop tests -[include:../../../../../browser/components/loop/manifest.ini] +[include:../../../../../browser/extensions/loop/manifest.ini]