Move stuff around

4 years ago · 38e6c69ad9
parent 5034073ac9
commit 38e6c69ad9
168 changed files with 14 additions and 28 deletions
--- a/calendar/base/moz.build
+++ b/calendar/base/moz.build
@ -5,7 +5,6 @@

 DIRS = [
    'public',
-    'backend',
    'src',
    'modules',
 ]
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@ -4,11 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 SOURCES += [
-    'calBaseModule.cpp',
+    'nsModule.cpp',
 ]

 LOCAL_INCLUDES += [
-    '..'
+    '../ical'
 ]

 FINAL_LIBRARY = "xul"
--- a/calendar/base/backend/libical/build/calBaseModule.cpp
+++ b/calendar/base/backend/libical/build/calBaseModule.cpp
--- a/calendar/base/backend/calBackendLoader.js
+++ b/calendar/base/backend/calBackendLoader.js
--- a/calendar/base/backend/calBackendLoader.manifest
+++ b/calendar/base/backend/calBackendLoader.manifest
--- a/calendar/components/caldav/calDavCalendar.js
+++ b/calendar/components/caldav/calDavCalendar.js
--- a/calendar/components/caldav/calDavCalendar.manifest
+++ b/calendar/components/caldav/calDavCalendar.manifest
--- a/calendar/components/caldav/calDavRequestHandlers.js
+++ b/calendar/components/caldav/calDavRequestHandlers.js
--- a/calendar/components/caldav/moz.build
+++ b/calendar/components/caldav/moz.build
--- a/calendar/components/caldav/public/calICalDavCalendar.idl
+++ b/calendar/components/caldav/public/calICalDavCalendar.idl
--- a/calendar/components/caldav/public/moz.build
+++ b/calendar/components/caldav/public/moz.build
--- a/calendar/components/composite/calCompositeCalendar.js
+++ b/calendar/components/composite/calCompositeCalendar.js
--- a/calendar/components/composite/calCompositeCalendar.manifest
+++ b/calendar/components/composite/calCompositeCalendar.manifest
--- a/calendar/components/composite/moz.build
+++ b/calendar/components/composite/moz.build
--- a/calendar/base/backend/libical/calAttributeHelpers.h
+++ b/calendar/base/backend/libical/calAttributeHelpers.h
--- a/calendar/base/backend/libical/calDateTime.cpp
+++ b/calendar/base/backend/libical/calDateTime.cpp
--- a/calendar/base/backend/libical/calDateTime.h
+++ b/calendar/base/backend/libical/calDateTime.h
--- a/calendar/base/backend/libical/calDuration.cpp
+++ b/calendar/base/backend/libical/calDuration.cpp
--- a/calendar/base/backend/libical/calDuration.h
+++ b/calendar/base/backend/libical/calDuration.h
--- a/calendar/base/backend/libical/calICSService.cpp
+++ b/calendar/base/backend/libical/calICSService.cpp
--- a/calendar/base/backend/libical/calICSService.h
+++ b/calendar/base/backend/libical/calICSService.h
--- a/calendar/base/backend/libical/calPeriod.cpp
+++ b/calendar/base/backend/libical/calPeriod.cpp
--- a/calendar/base/backend/libical/calPeriod.h
+++ b/calendar/base/backend/libical/calPeriod.h
--- a/calendar/base/backend/libical/calRecurrenceRule.cpp
+++ b/calendar/base/backend/libical/calRecurrenceRule.cpp
--- a/calendar/base/backend/libical/calRecurrenceRule.h
+++ b/calendar/base/backend/libical/calRecurrenceRule.h
--- a/calendar/base/backend/libical/calTimezone.cpp
+++ b/calendar/base/backend/libical/calTimezone.cpp
--- a/calendar/base/backend/libical/calTimezone.h
+++ b/calendar/base/backend/libical/calTimezone.h
--- a/calendar/base/backend/libical/calUtils.cpp
+++ b/calendar/base/backend/libical/calUtils.cpp
--- a/calendar/base/backend/libical/calUtils.h
+++ b/calendar/base/backend/libical/calUtils.h
--- a/calendar/base/backend/libical/moz.build
+++ b/calendar/base/backend/libical/moz.build
@ -3,10 +3,6 @@
 # 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 = [
-    'build'
-]
-
 SOURCES += [
    'calDateTime.cpp',
    'calDuration.cpp',
--- a/calendar/base/backend/icaljs/calDateTime.js
+++ b/calendar/base/backend/icaljs/calDateTime.js
--- a/calendar/base/backend/icaljs/calDuration.js
+++ b/calendar/base/backend/icaljs/calDuration.js
--- a/calendar/base/backend/icaljs/calICALJSComponents.js
+++ b/calendar/base/backend/icaljs/calICALJSComponents.js
--- a/calendar/base/backend/icaljs/calICSService-worker.js
+++ b/calendar/base/backend/icaljs/calICSService-worker.js
--- a/calendar/base/backend/icaljs/calICSService.js
+++ b/calendar/base/backend/icaljs/calICSService.js
--- a/calendar/base/backend/icaljs/calPeriod.js
+++ b/calendar/base/backend/icaljs/calPeriod.js
--- a/calendar/base/backend/icaljs/calRecurrenceRule.js
+++ b/calendar/base/backend/icaljs/calRecurrenceRule.js
--- a/calendar/base/backend/icaljs/icaljs-manifest
+++ b/calendar/base/backend/icaljs/icaljs-manifest
--- a/calendar/base/backend/icaljs/moz.build
+++ b/calendar/base/backend/icaljs/moz.build
--- a/calendar/components/ics/calICSCalendar.js
+++ b/calendar/components/ics/calICSCalendar.js
--- a/calendar/components/ics/calICSCalendar.manifest
+++ b/calendar/components/ics/calICSCalendar.manifest
--- a/calendar/components/ics/moz.build
+++ b/calendar/components/ics/moz.build
--- a/calendar/components/import-export/calHtmlExport.html
+++ b/calendar/components/import-export/calHtmlExport.html
--- a/calendar/components/import-export/calHtmlExport.js
+++ b/calendar/components/import-export/calHtmlExport.js
--- a/calendar/components/import-export/calIcsImportExport.js
+++ b/calendar/components/import-export/calIcsImportExport.js
--- a/calendar/components/import-export/calImportExportModule.js
+++ b/calendar/components/import-export/calImportExportModule.js
--- a/calendar/components/import-export/calImportExportModule.manifest
+++ b/calendar/components/import-export/calImportExportModule.manifest
--- a/calendar/components/import-export/calListFormatter.js
+++ b/calendar/components/import-export/calListFormatter.js
--- a/calendar/components/import-export/calMonthGridPrinter.html
+++ b/calendar/components/import-export/calMonthGridPrinter.html
--- a/calendar/components/import-export/calMonthGridPrinter.js
+++ b/calendar/components/import-export/calMonthGridPrinter.js
--- a/calendar/components/import-export/calOutlookCSVImportExport.js
+++ b/calendar/components/import-export/calOutlookCSVImportExport.js
--- a/calendar/components/import-export/calWeekPrinter.html
+++ b/calendar/components/import-export/calWeekPrinter.html
--- a/calendar/components/import-export/calWeekPrinter.js
+++ b/calendar/components/import-export/calWeekPrinter.js
--- a/calendar/components/import-export/jar.mn
+++ b/calendar/components/import-export/jar.mn
--- a/calendar/components/import-export/moz.build
+++ b/calendar/components/import-export/moz.build
--- a/calendar/components/itip/calItipEmailTransport.js
+++ b/calendar/components/itip/calItipEmailTransport.js
--- a/calendar/components/itip/calItipEmailTransport.manifest
+++ b/calendar/components/itip/calItipEmailTransport.manifest
--- a/calendar/components/itip/moz.build
+++ b/calendar/components/itip/moz.build
--- a/calendar/components/memory/calMemoryCalendar.js
+++ b/calendar/components/memory/calMemoryCalendar.js
--- a/calendar/components/memory/calMemoryCalendar.manifest
+++ b/calendar/components/memory/calMemoryCalendar.manifest
--- a/calendar/components/memory/moz.build
+++ b/calendar/components/memory/moz.build
--- a/calendar/base/backend/moz.build
+++ b/calendar/base/backend/moz.build
@ -4,8 +4,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DIRS = [
-    'libical',
-    'icaljs'
+    '../../modules/libical',
+    'build',
+    'caldav',
+    'composite',
+    'ical',
+    'icaljs',
+    'import-export',
+    'itip',
+    'memory',
+    'wcap'
 ]

 EXTRA_COMPONENTS += [
--- a/calendar/components/storage/calStorageCalendar.js
+++ b/calendar/components/storage/calStorageCalendar.js
--- a/calendar/components/storage/calStorageCalendar.manifest
+++ b/calendar/components/storage/calStorageCalendar.manifest
--- a/calendar/components/storage/calStorageHelpers.jsm
+++ b/calendar/components/storage/calStorageHelpers.jsm
--- a/calendar/components/storage/calStorageUpgrade.jsm
+++ b/calendar/components/storage/calStorageUpgrade.jsm
--- a/calendar/components/storage/moz.build
+++ b/calendar/components/storage/moz.build
--- a/calendar/components/wcap/calWcapCalendar.js
+++ b/calendar/components/wcap/calWcapCalendar.js
--- a/calendar/components/wcap/calWcapCalendarItems.js
+++ b/calendar/components/wcap/calWcapCalendarItems.js
--- a/calendar/components/wcap/calWcapCalendarModule.js
+++ b/calendar/components/wcap/calWcapCalendarModule.js
--- a/calendar/components/wcap/calWcapCalendarModule.manifest
+++ b/calendar/components/wcap/calWcapCalendarModule.manifest
--- a/calendar/components/wcap/calWcapErrors.js
+++ b/calendar/components/wcap/calWcapErrors.js
--- a/calendar/components/wcap/calWcapRequest.js
+++ b/calendar/components/wcap/calWcapRequest.js
--- a/calendar/components/wcap/calWcapSession.js
+++ b/calendar/components/wcap/calWcapSession.js
--- a/calendar/components/wcap/calWcapUtils.js
+++ b/calendar/components/wcap/calWcapUtils.js
--- a/calendar/components/wcap/moz.build
+++ b/calendar/components/wcap/moz.build
--- a/calendar/components/wcap/public/calIWcapCalendar.idl
+++ b/calendar/components/wcap/public/calIWcapCalendar.idl
--- a/calendar/components/wcap/public/calIWcapErrors.idl
+++ b/calendar/components/wcap/public/calIWcapErrors.idl
--- a/calendar/components/wcap/public/calIWcapSession.idl
+++ b/calendar/components/wcap/public/calIWcapSession.idl
--- a/calendar/components/wcap/public/moz.build
+++ b/calendar/components/wcap/public/moz.build
--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@ -4,11 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DIRS += [
-    '../libical',
    '../base',
-    '../providers',
-    '../import-export',
-    '../itip',
+    '../components',
+    '../providers/gdata',
    'components',
    'locales',
    'modules',
--- a/calendar/providers/moz.build
+++ b/calendar/providers/moz.build
@ -1,15 +0,0 @@
-# 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/.
-
-DIRS += [
-    'caldav',
-    'composite',
-    'gdata',
-    'ics',
-    'memory',
-    'storage',
-    'wcap',
-]
-
--- a/calendar/libical/AUTHORS
+++ b/calendar/libical/AUTHORS
--- a/calendar/libical/LICENSE
+++ b/calendar/libical/LICENSE
--- a/calendar/libical/config.h
+++ b/calendar/libical/config.h
--- a/calendar/libical/design-data/components.txt
+++ b/calendar/libical/design-data/components.txt
--- a/calendar/libical/design-data/parameters.csv
+++ b/calendar/libical/design-data/parameters.csv
--- a/calendar/libical/design-data/params-in-prop.txt
+++ b/calendar/libical/design-data/params-in-prop.txt
--- a/calendar/libical/design-data/properties.csv
+++ b/calendar/libical/design-data/properties.csv
--- a/calendar/libical/design-data/restrictions.csv
+++ b/calendar/libical/design-data/restrictions.csv
--- a/calendar/libical/design-data/status.txt
+++ b/calendar/libical/design-data/status.txt
--- a/calendar/libical/design-data/value-types.csv
+++ b/calendar/libical/design-data/value-types.csv
--- a/calendar/libical/moz.build
+++ b/calendar/libical/moz.build
--- a/calendar/libical/scripts/mkderivedcomponents.pl
+++ b/calendar/libical/scripts/mkderivedcomponents.pl
--- a/calendar/libical/scripts/mkderivedparameters.pl
+++ b/calendar/libical/scripts/mkderivedparameters.pl
--- a/calendar/libical/scripts/mkderivedproperties.pl
+++ b/calendar/libical/scripts/mkderivedproperties.pl
--- a/calendar/libical/scripts/mkderivedvalues.pl
+++ b/calendar/libical/scripts/mkderivedvalues.pl
--- a/calendar/libical/scripts/mkinclude.sh
+++ b/calendar/libical/scripts/mkinclude.sh
--- a/calendar/libical/scripts/mkneticali.pl
+++ b/calendar/libical/scripts/mkneticali.pl
--- a/Show More
+++ b/Show More