From 2d0d64e7b63e40c5b653958e74ff1285f9ae09f7 Mon Sep 17 00:00:00 2001 From: Paolo Amadini Date: Tue, 6 Mar 2018 17:40:59 +0000 Subject: [PATCH] Bug 1363061 - Rename toolkit/components/jsdownloads to toolkit/components/downloads. r=mak MozReview-Commit-ID: GuWeax0ubv3 --- browser/installer/package-manifest.in | 2 +- build/dumbmake-dependencies | 2 +- mobile/android/installer/package-manifest.in | 2 +- .../mochitest-browser-chrome.runtimes.json | 2 +- toolkit/components/build/moz.build | 2 +- .../src => downloads}/DownloadCore.jsm | 0 .../src => downloads}/DownloadHistory.jsm | 0 .../src => downloads}/DownloadIntegration.jsm | 0 .../src => downloads}/DownloadLegacy.js | 0 .../src => downloads}/DownloadList.jsm | 0 .../src => downloads}/DownloadPaths.jsm | 0 .../src => downloads}/DownloadPlatform.cpp | 2 +- .../src => downloads}/DownloadPlatform.h | 0 .../src => downloads}/DownloadStore.jsm | 0 .../src => downloads}/DownloadUIHelper.jsm | 0 .../src => downloads}/Downloads.jsm | 0 .../src => downloads}/Downloads.manifest | 0 .../{jsdownloads/src => downloads}/moz.build | 19 ++++++++++++++++++- .../mozIDownloadPlatform.idl | 0 .../test/browser/.eslintrc.js | 0 .../test/browser/browser.ini | 0 .../test/browser/browser_DownloadPDFSaver.js | 0 .../test/browser/head.js | 0 .../test/browser/testFile.html | 0 .../test/data/.eslintrc.js | 0 .../test/data/empty.txt | 0 .../test/data/source.txt | 0 .../test/unit/.eslintrc.js | 0 .../test/unit/common_test_Download.js | 0 .../test/unit/head.js | 0 .../test/unit/test_DownloadCore.js | 0 .../test/unit/test_DownloadHistory.js | 0 .../test/unit/test_DownloadIntegration.js | 0 .../test/unit/test_DownloadLegacy.js | 0 .../test/unit/test_DownloadList.js | 0 .../test/unit/test_DownloadPaths.js | 0 .../test/unit/test_DownloadStore.js | 0 .../test/unit/test_Downloads.js | 0 .../test/unit/test_PrivateTemp.js | 0 .../test/unit/xpcshell.ini | 0 toolkit/components/jsdownloads/moz.build | 18 ------------------ .../components/jsdownloads/public/moz.build | 9 --------- toolkit/components/moz.build | 2 +- toolkit/content/contentAreaUtils.js | 2 +- 44 files changed, 26 insertions(+), 36 deletions(-) rename toolkit/components/{jsdownloads/src => downloads}/DownloadCore.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadHistory.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadIntegration.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadLegacy.js (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadList.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadPaths.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadPlatform.cpp (99%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadPlatform.h (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadStore.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/DownloadUIHelper.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/Downloads.jsm (100%) rename toolkit/components/{jsdownloads/src => downloads}/Downloads.manifest (100%) rename toolkit/components/{jsdownloads/src => downloads}/moz.build (65%) rename toolkit/components/{jsdownloads/public => downloads}/mozIDownloadPlatform.idl (100%) rename toolkit/components/{jsdownloads => downloads}/test/browser/.eslintrc.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/browser/browser.ini (100%) rename toolkit/components/{jsdownloads => downloads}/test/browser/browser_DownloadPDFSaver.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/browser/head.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/browser/testFile.html (100%) rename toolkit/components/{jsdownloads => downloads}/test/data/.eslintrc.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/data/empty.txt (100%) rename toolkit/components/{jsdownloads => downloads}/test/data/source.txt (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/.eslintrc.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/common_test_Download.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/head.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadCore.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadHistory.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadIntegration.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadLegacy.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadList.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadPaths.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_DownloadStore.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_Downloads.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/test_PrivateTemp.js (100%) rename toolkit/components/{jsdownloads => downloads}/test/unit/xpcshell.ini (100%) delete mode 100644 toolkit/components/jsdownloads/moz.build delete mode 100644 toolkit/components/jsdownloads/public/moz.build diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 8f078b991c33..f5c11014753f 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -222,6 +222,7 @@ @RESPATH@/components/dom_workers.xpt @RESPATH@/components/dom_xul.xpt @RESPATH@/components/dom_presentation.xpt +@RESPATH@/components/downloads.xpt @RESPATH@/components/editor.xpt @RESPATH@/components/enterprisepolicies.xpt @RESPATH@/components/extensions.xpt @@ -236,7 +237,6 @@ @RESPATH@/components/intl.xpt @RESPATH@/components/jar.xpt @RESPATH@/components/jsdebugger.xpt -@RESPATH@/components/jsdownloads.xpt @RESPATH@/browser/components/jsinspector.xpt @RESPATH@/components/layout_base.xpt #ifdef MOZ_DEBUG diff --git a/build/dumbmake-dependencies b/build/dumbmake-dependencies index 87f43a9fb497..880877637ab5 100644 --- a/build/dumbmake-dependencies +++ b/build/dumbmake-dependencies @@ -60,7 +60,7 @@ browser/app browser/themes toolkit toolkit/components - toolkit/components/jsdownloads + toolkit/components/downloads toolkit/content toolkit/crashreporter toolkit/forgetaboutsite diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 541457ec0247..f7e49510c285 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -147,6 +147,7 @@ @BINPATH@/components/dom_xhr.xpt @BINPATH@/components/dom_xul.xpt @BINPATH@/components/dom_presentation.xpt +@BINPATH@/components/downloads.xpt @BINPATH@/components/editor.xpt @BINPATH@/components/extensions.xpt @BINPATH@/components/exthandler.xpt @@ -160,7 +161,6 @@ @BINPATH@/components/intl.xpt @BINPATH@/components/jar.xpt @BINPATH@/components/jsdebugger.xpt -@BINPATH@/components/jsdownloads.xpt @BINPATH@/components/jsinspector.xpt @BINPATH@/components/layout_base.xpt #ifdef NS_PRINTING diff --git a/testing/runtimes/mochitest-browser-chrome.runtimes.json b/testing/runtimes/mochitest-browser-chrome.runtimes.json index 33eddade2a2d..721436f5c30c 100644 --- a/testing/runtimes/mochitest-browser-chrome.runtimes.json +++ b/testing/runtimes/mochitest-browser-chrome.runtimes.json @@ -805,7 +805,7 @@ "toolkit/components/addoncompat/tests/browser/browser_addonShims.js": 3823, "toolkit/components/extensions/test/browser/browser_ext_management_themes.js": 2922, "toolkit/components/extensions/test/browser/browser_ext_themes_persistence.js": 1948, - "toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js": 4102, + "toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js": 4102, "toolkit/components/narrate/test/browser_narrate.js": 2700, "toolkit/components/narrate/test/browser_voiceselect.js": 2254, "toolkit/components/narrate/test/browser_word_highlight.js": 2215, diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build index 7fe6d288c6f9..a155b27a64f5 100644 --- a/toolkit/components/build/moz.build +++ b/toolkit/components/build/moz.build @@ -20,9 +20,9 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../xre', '../alerts', + '../downloads', '../feeds', '../find', - '../jsdownloads/src', '../perfmonitoring', '../protobuf', '../reputationservice', diff --git a/toolkit/components/jsdownloads/src/DownloadCore.jsm b/toolkit/components/downloads/DownloadCore.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadCore.jsm rename to toolkit/components/downloads/DownloadCore.jsm diff --git a/toolkit/components/jsdownloads/src/DownloadHistory.jsm b/toolkit/components/downloads/DownloadHistory.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadHistory.jsm rename to toolkit/components/downloads/DownloadHistory.jsm diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/downloads/DownloadIntegration.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadIntegration.jsm rename to toolkit/components/downloads/DownloadIntegration.jsm diff --git a/toolkit/components/jsdownloads/src/DownloadLegacy.js b/toolkit/components/downloads/DownloadLegacy.js similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadLegacy.js rename to toolkit/components/downloads/DownloadLegacy.js diff --git a/toolkit/components/jsdownloads/src/DownloadList.jsm b/toolkit/components/downloads/DownloadList.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadList.jsm rename to toolkit/components/downloads/DownloadList.jsm diff --git a/toolkit/components/jsdownloads/src/DownloadPaths.jsm b/toolkit/components/downloads/DownloadPaths.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadPaths.jsm rename to toolkit/components/downloads/DownloadPaths.jsm diff --git a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp b/toolkit/components/downloads/DownloadPlatform.cpp similarity index 99% rename from toolkit/components/jsdownloads/src/DownloadPlatform.cpp rename to toolkit/components/downloads/DownloadPlatform.cpp index b519d33fcfab..2773f03db90d 100644 --- a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp +++ b/toolkit/components/downloads/DownloadPlatform.cpp @@ -27,7 +27,7 @@ #ifdef XP_MACOSX #include -#include "../../../../xpcom/io/CocoaFileUtils.h" +#include "../../../xpcom/io/CocoaFileUtils.h" #endif #ifdef MOZ_WIDGET_ANDROID diff --git a/toolkit/components/jsdownloads/src/DownloadPlatform.h b/toolkit/components/downloads/DownloadPlatform.h similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadPlatform.h rename to toolkit/components/downloads/DownloadPlatform.h diff --git a/toolkit/components/jsdownloads/src/DownloadStore.jsm b/toolkit/components/downloads/DownloadStore.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadStore.jsm rename to toolkit/components/downloads/DownloadStore.jsm diff --git a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm b/toolkit/components/downloads/DownloadUIHelper.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/DownloadUIHelper.jsm rename to toolkit/components/downloads/DownloadUIHelper.jsm diff --git a/toolkit/components/jsdownloads/src/Downloads.jsm b/toolkit/components/downloads/Downloads.jsm similarity index 100% rename from toolkit/components/jsdownloads/src/Downloads.jsm rename to toolkit/components/downloads/Downloads.jsm diff --git a/toolkit/components/jsdownloads/src/Downloads.manifest b/toolkit/components/downloads/Downloads.manifest similarity index 100% rename from toolkit/components/jsdownloads/src/Downloads.manifest rename to toolkit/components/downloads/Downloads.manifest diff --git a/toolkit/components/jsdownloads/src/moz.build b/toolkit/components/downloads/moz.build similarity index 65% rename from toolkit/components/jsdownloads/src/moz.build rename to toolkit/components/downloads/moz.build index 8e9d50101b42..c68d706957d3 100644 --- a/toolkit/components/jsdownloads/src/moz.build +++ b/toolkit/components/downloads/moz.build @@ -4,6 +4,22 @@ # 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/. +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] +BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] + +TEST_HARNESS_FILES.xpcshell.toolkit.components.downloads.test.data += [ + 'test/data/empty.txt', + 'test/data/source.txt', +] + +XPIDL_SOURCES += [ + 'mozIDownloadPlatform.idl', +] + +XPIDL_MODULE = 'downloads' + +CXXFLAGS += CONFIG['TK_CFLAGS'] + SOURCES += [ 'DownloadPlatform.cpp', ] @@ -30,4 +46,5 @@ if CONFIG['MOZ_PLACES']: FINAL_LIBRARY = 'xul' -CXXFLAGS += CONFIG['TK_CFLAGS'] +with Files('**'): + BUG_COMPONENT = ('Toolkit', 'Download Manager') diff --git a/toolkit/components/jsdownloads/public/mozIDownloadPlatform.idl b/toolkit/components/downloads/mozIDownloadPlatform.idl similarity index 100% rename from toolkit/components/jsdownloads/public/mozIDownloadPlatform.idl rename to toolkit/components/downloads/mozIDownloadPlatform.idl diff --git a/toolkit/components/jsdownloads/test/browser/.eslintrc.js b/toolkit/components/downloads/test/browser/.eslintrc.js similarity index 100% rename from toolkit/components/jsdownloads/test/browser/.eslintrc.js rename to toolkit/components/downloads/test/browser/.eslintrc.js diff --git a/toolkit/components/jsdownloads/test/browser/browser.ini b/toolkit/components/downloads/test/browser/browser.ini similarity index 100% rename from toolkit/components/jsdownloads/test/browser/browser.ini rename to toolkit/components/downloads/test/browser/browser.ini diff --git a/toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js b/toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js similarity index 100% rename from toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js rename to toolkit/components/downloads/test/browser/browser_DownloadPDFSaver.js diff --git a/toolkit/components/jsdownloads/test/browser/head.js b/toolkit/components/downloads/test/browser/head.js similarity index 100% rename from toolkit/components/jsdownloads/test/browser/head.js rename to toolkit/components/downloads/test/browser/head.js diff --git a/toolkit/components/jsdownloads/test/browser/testFile.html b/toolkit/components/downloads/test/browser/testFile.html similarity index 100% rename from toolkit/components/jsdownloads/test/browser/testFile.html rename to toolkit/components/downloads/test/browser/testFile.html diff --git a/toolkit/components/jsdownloads/test/data/.eslintrc.js b/toolkit/components/downloads/test/data/.eslintrc.js similarity index 100% rename from toolkit/components/jsdownloads/test/data/.eslintrc.js rename to toolkit/components/downloads/test/data/.eslintrc.js diff --git a/toolkit/components/jsdownloads/test/data/empty.txt b/toolkit/components/downloads/test/data/empty.txt similarity index 100% rename from toolkit/components/jsdownloads/test/data/empty.txt rename to toolkit/components/downloads/test/data/empty.txt diff --git a/toolkit/components/jsdownloads/test/data/source.txt b/toolkit/components/downloads/test/data/source.txt similarity index 100% rename from toolkit/components/jsdownloads/test/data/source.txt rename to toolkit/components/downloads/test/data/source.txt diff --git a/toolkit/components/jsdownloads/test/unit/.eslintrc.js b/toolkit/components/downloads/test/unit/.eslintrc.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/.eslintrc.js rename to toolkit/components/downloads/test/unit/.eslintrc.js diff --git a/toolkit/components/jsdownloads/test/unit/common_test_Download.js b/toolkit/components/downloads/test/unit/common_test_Download.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/common_test_Download.js rename to toolkit/components/downloads/test/unit/common_test_Download.js diff --git a/toolkit/components/jsdownloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/head.js rename to toolkit/components/downloads/test/unit/head.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadCore.js b/toolkit/components/downloads/test/unit/test_DownloadCore.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadCore.js rename to toolkit/components/downloads/test/unit/test_DownloadCore.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadHistory.js b/toolkit/components/downloads/test/unit/test_DownloadHistory.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadHistory.js rename to toolkit/components/downloads/test/unit/test_DownloadHistory.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadIntegration.js b/toolkit/components/downloads/test/unit/test_DownloadIntegration.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadIntegration.js rename to toolkit/components/downloads/test/unit/test_DownloadIntegration.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadLegacy.js b/toolkit/components/downloads/test/unit/test_DownloadLegacy.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadLegacy.js rename to toolkit/components/downloads/test/unit/test_DownloadLegacy.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadList.js b/toolkit/components/downloads/test/unit/test_DownloadList.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadList.js rename to toolkit/components/downloads/test/unit/test_DownloadList.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadPaths.js b/toolkit/components/downloads/test/unit/test_DownloadPaths.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadPaths.js rename to toolkit/components/downloads/test/unit/test_DownloadPaths.js diff --git a/toolkit/components/jsdownloads/test/unit/test_DownloadStore.js b/toolkit/components/downloads/test/unit/test_DownloadStore.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_DownloadStore.js rename to toolkit/components/downloads/test/unit/test_DownloadStore.js diff --git a/toolkit/components/jsdownloads/test/unit/test_Downloads.js b/toolkit/components/downloads/test/unit/test_Downloads.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_Downloads.js rename to toolkit/components/downloads/test/unit/test_Downloads.js diff --git a/toolkit/components/jsdownloads/test/unit/test_PrivateTemp.js b/toolkit/components/downloads/test/unit/test_PrivateTemp.js similarity index 100% rename from toolkit/components/jsdownloads/test/unit/test_PrivateTemp.js rename to toolkit/components/downloads/test/unit/test_PrivateTemp.js diff --git a/toolkit/components/jsdownloads/test/unit/xpcshell.ini b/toolkit/components/downloads/test/unit/xpcshell.ini similarity index 100% rename from toolkit/components/jsdownloads/test/unit/xpcshell.ini rename to toolkit/components/downloads/test/unit/xpcshell.ini diff --git a/toolkit/components/jsdownloads/moz.build b/toolkit/components/jsdownloads/moz.build deleted file mode 100644 index 62f08b160bd7..000000000000 --- a/toolkit/components/jsdownloads/moz.build +++ /dev/null @@ -1,18 +0,0 @@ -# -*- 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/. - -with Files('*'): - BUG_COMPONENT = ('Toolkit', 'Download Manager') - -DIRS += ['public', 'src'] - -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] - -TEST_HARNESS_FILES.xpcshell.toolkit.components.jsdownloads.test.data += [ - 'test/data/empty.txt', - 'test/data/source.txt', -] diff --git a/toolkit/components/jsdownloads/public/moz.build b/toolkit/components/jsdownloads/public/moz.build deleted file mode 100644 index 6ea66bf5f296..000000000000 --- a/toolkit/components/jsdownloads/public/moz.build +++ /dev/null @@ -1,9 +0,0 @@ -# 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/. - -XPIDL_MODULE = 'jsdownloads' - -XPIDL_SOURCES += [ - 'mozIDownloadPlatform.idl', -] diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index dd579b753301..2cf387446a14 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -29,12 +29,12 @@ DIRS += [ 'crashes', 'crashmonitor', 'diskspacewatcher', + 'downloads', 'enterprisepolicies', 'extensions', 'filewatcher', 'finalizationwitness', 'find', - 'jsdownloads', 'jsoncpp/src/lib_json', 'lz4', 'mediasniffer', diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js index 868d9d79e047..48cf448798a5 100644 --- a/toolkit/content/contentAreaUtils.js +++ b/toolkit/content/contentAreaUtils.js @@ -756,7 +756,7 @@ function uniqueFile(aLocalFile) { } /** - * Download a URL using the new jsdownloads API. + * Download a URL using the Downloads API. * * @param aURL * the url to download