summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2021-11-14 02:22:31 -0500
committerMatt A. Tobin <email@mattatobin.com>2021-11-14 02:22:31 -0500
commit7e12d0e0e3c1607061bf4b7dd6192601473741da (patch)
tree0ddcaaab52043a840562e21a0ae40b3505103fed
parenta1cb2ca13492432835598727b52a1e835d145011 (diff)
downloadaura-central-7e12d0e0e3c1607061bf4b7dd6192601473741da.tar.gz
Issue %3005 - Move xpfe/components/windowds to components/
-rw-r--r--components/moz.build1
-rw-r--r--components/windowds/moz.build (renamed from xpfe/components/windowds/moz.build)11
-rw-r--r--components/windowds/public/nsIWindowDataSource.idl (renamed from xpfe/components/windowds/nsIWindowDataSource.idl)0
-rw-r--r--components/windowds/src/nsWindowDataSource.cpp (renamed from xpfe/components/windowds/nsWindowDataSource.cpp)0
-rw-r--r--components/windowds/src/nsWindowDataSource.h (renamed from xpfe/components/windowds/nsWindowDataSource.h)0
-rw-r--r--toolkit/toolkit.mozbuild1
-rw-r--r--xpfe/components/moz.build9
7 files changed, 4 insertions, 18 deletions
diff --git a/components/moz.build b/components/moz.build
index 0a2ec0423..e3b042673 100644
--- a/components/moz.build
+++ b/components/moz.build
@@ -65,6 +65,7 @@ DIRS += [
'utils',
'urlformatter',
'viewconfig',
+ 'windowds',
'workerloader',
'xulstore'
]
diff --git a/xpfe/components/windowds/moz.build b/components/windowds/moz.build
index c83193d78..d0e8fa8d6 100644
--- a/xpfe/components/windowds/moz.build
+++ b/components/windowds/moz.build
@@ -3,14 +3,9 @@
# 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_SOURCES += [
- 'nsIWindowDataSource.idl',
-]
+XPIDL_SOURCES += ['public/nsIWindowDataSource.idl']
-XPIDL_MODULE = 'windowds'
-
-SOURCES += [
- 'nsWindowDataSource.cpp',
-]
+SOURCES += ['src/nsWindowDataSource.cpp']
+XPIDL_MODULE = 'windowds'
FINAL_LIBRARY = 'xul'
diff --git a/xpfe/components/windowds/nsIWindowDataSource.idl b/components/windowds/public/nsIWindowDataSource.idl
index 6143a4317..6143a4317 100644
--- a/xpfe/components/windowds/nsIWindowDataSource.idl
+++ b/components/windowds/public/nsIWindowDataSource.idl
diff --git a/xpfe/components/windowds/nsWindowDataSource.cpp b/components/windowds/src/nsWindowDataSource.cpp
index 3e7a42060..3e7a42060 100644
--- a/xpfe/components/windowds/nsWindowDataSource.cpp
+++ b/components/windowds/src/nsWindowDataSource.cpp
diff --git a/xpfe/components/windowds/nsWindowDataSource.h b/components/windowds/src/nsWindowDataSource.h
index 351ff951b..351ff951b 100644
--- a/xpfe/components/windowds/nsWindowDataSource.h
+++ b/components/windowds/src/nsWindowDataSource.h
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 41fb8ac6d..fe126d9a9 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -97,7 +97,6 @@ DIRS += [
'/tools/profiler',
'/tools/memory-profiler',
'/components',
- '/xpfe/components',
]
if CONFIG['MOZ_ENABLE_XREMOTE']:
diff --git a/xpfe/components/moz.build b/xpfe/components/moz.build
deleted file mode 100644
index 133f96248..000000000
--- a/xpfe/components/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-DIRS += [
- 'windowds',
-]
-