diff --git a/calendar/base/src/Makefile.in b/calendar/base/src/Makefile.in index 339e932a1a7..de144c46e24 100644 --- a/calendar/base/src/Makefile.in +++ b/calendar/base/src/Makefile.in @@ -57,10 +57,6 @@ REQUIRES = xpcom \ ical \ $(NULL) -# storage \ -# sqlite3 \ -# $(NULL) - XPIDL_MODULE = calbaseinternal XPIDLSRCS = \ calInternalInterfaces.idl \ @@ -76,18 +72,30 @@ CPPSRCS = calDateTime.cpp \ EXTRA_COMPONENTS = \ - calAlarmService.js \ - calAttachment.js \ - calAttendee.js \ - calCalendarManager.js \ - calRecurrenceInfo.js \ - calEvent.js \ - calItemBase.js \ - calItemModule.js \ - calTodo.js \ - calDateTimeFormatter.js \ - calWeekTitleService.js \ - calUtils.js \ - $(NULL) + calItemModule.js \ + $(NULL) + +EXTRA_SCRIPTS = \ + calAlarmService.js \ + calAttachment.js \ + calAttendee.js \ + calCalendarManager.js \ + calDateTimeFormatter.js \ + calEvent.js \ + calItemBase.js \ + calRecurrenceInfo.js \ + calTodo.js \ + calUtils.js \ + calWeekTitleService.js \ + $(NULL) + +# Use NSINSTALL to make the directory, as there's no mtime to preserve. +libs:: $(EXTRA_SCRIPTS) + $(NSINSTALL) -D $(DIST)/bin/js + $(INSTALL) $^ $(DIST)/bin/js + +# The install target must use SYSINSTALL, which is NSINSTALL in copy mode. +install:: $(EXTRA_SCRIPTS) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/js include $(topsrcdir)/config/rules.mk diff --git a/calendar/base/src/calItemModule.js b/calendar/base/src/calItemModule.js index c55c2790fec..1f377a87327 100644 --- a/calendar/base/src/calItemModule.js +++ b/calendar/base/src/calItemModule.js @@ -151,8 +151,10 @@ var calItemModule = { var dirsvc = Components.classes[dirsvcContractID].getService(propsIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // We expect to find the subscripts in our directory. - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find the subscripts in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); for (var i = 0; i < componentData.length; i++) { var scriptName = componentData[i].script; diff --git a/calendar/import-export/Makefile.in b/calendar/import-export/Makefile.in index f0855a228b9..0a845140d0a 100644 --- a/calendar/import-export/Makefile.in +++ b/calendar/import-export/Makefile.in @@ -43,11 +43,23 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXTRA_COMPONENTS = \ - calOutlookCSVImportExport.js \ - calHtmlExport.js \ - calIcsImportExport.js \ - calListFormatter.js \ - calImportExportModule.js \ - $(NULL) + calImportExportModule.js \ + $(NULL) + +EXTRA_SCRIPTS = \ + calHtmlExport.js \ + calIcsImportExport.js \ + calListFormatter.js \ + calOutlookCSVImportExport.js \ + $(NULL) + +# Use NSINSTALL to make the directory, as there's no mtime to preserve. +libs:: $(EXTRA_SCRIPTS) + $(NSINSTALL) -D $(DIST)/bin/js + $(INSTALL) $^ $(DIST)/bin/js + +# The install target must use SYSINSTALL, which is NSINSTALL in copy mode. +install:: $(EXTRA_SCRIPTS) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/js include $(topsrcdir)/config/rules.mk diff --git a/calendar/import-export/calImportExportModule.js b/calendar/import-export/calImportExportModule.js index 49b0e7d373a..8d047c4a11c 100644 --- a/calendar/import-export/calImportExportModule.js +++ b/calendar/import-export/calImportExportModule.js @@ -104,8 +104,10 @@ var calImportExportModule = { var dirsvc = Components.classes[dirsvcContractID].getService(propsIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // We expect to find the subscripts in our directory. - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find the subscripts in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); for (var i = 0; i < componentData.length; i++) { var scriptName = componentData[i].script; diff --git a/calendar/installer/windows/packages-static b/calendar/installer/windows/packages-static index 9138859535b..286d7e410d6 100644 --- a/calendar/installer/windows/packages-static +++ b/calendar/installer/windows/packages-static @@ -184,40 +184,37 @@ bin\components\nsProgressDialog.js bin\components\nsSetDefaultMail.js bin\components\nsUnsetDefaultMail.js bin\components\nsUpdateService.js -;!4sunbird bin\components\nsDictionary.js bin\components\nsHelperAppDlg.js bin\components\nsProxyAutoConfig.js -;!4sunbird bin\components\nsSidebar.js -;!4sunbird bin\components\nsXmlRpcClient.js bin\components\nsExtensionManager.js bin\components\extensions.xpt bin\components\update.xpt bin\components\calendarService.js bin\components\calAlarmMonitor.js -bin\components\calAttendee.js -bin\components\calAlarmService.js -bin\components\calAttachment.js -bin\components\calCalendarManager.js bin\components\calCompositeCalendar.js -bin\components\calDateTimeFormatter.js bin\components\calDavCalendar.js -bin\components\calEvent.js -bin\components\calHtmlExport.js bin\components\calICSCalendar.js -bin\components\calIcsImportExport.js bin\components\calImportExportModule.js -bin\components\calItemBase.js bin\components\calItemModule.js -bin\components\calListFormatter.js bin\components\calMemoryCalendar.js -bin\components\calOutlookCSVImportExport.js -bin\components\calRecurrenceInfo.js bin\components\calStorageCalendar.js -bin\components\calTodo.js -bin\components\calUtils.js -bin\components\calWeekTitleService.js bin\components\FeedProcessor.js bin\components\pluginGlue.js +bin\js\calAlarmService.js +bin\js\calAttachment.js +bin\js\calAttendee.js +bin\js\calCalendarManager.js +bin\js\calDateTimeFormatter.js +bin\js\calEvent.js +bin\js\calHtmlExport.js +bin\js\calIcsImportExport.js +bin\js\calItemBase.js +bin\js\calListFormatter.js +bin\js\calOutlookCSVImportExport.js +bin\js\calRecurrenceInfo.js +bin\js\calTodo.js +bin\js\calUtils.js +bin\js\calWeekTitleService.js ; [Calendar Chrome Files] bin\chrome\calendar.jar diff --git a/calendar/providers/caldav/calDavCalendar.js b/calendar/providers/caldav/calDavCalendar.js index da960f46dd1..212eed15d6f 100644 --- a/calendar/providers/caldav/calDavCalendar.js +++ b/calendar/providers/caldav/calDavCalendar.js @@ -739,24 +739,24 @@ calDavCalendar.prototype = { { this.observeBatchChange(false); }, - - // nsIInterfaceRequestor impl - getInterface: function(iid) { - if (iid.equals(Components.interfaces.nsIAuthPrompt)) { - // use the window watcher service to get a nsIAuthPrompt impl - return Components.classes["@mozilla.org/embedcomp/window-watcher;1"] - .getService(Components.interfaces.nsIWindowWatcher) - .getNewAuthPrompter(null); - } - else if (iid.equals(Components.interfaces.nsIPrompt)) { - // use the window watcher service to get a nsIPrompt impl - return Components.classes["@mozilla.org/embedcomp/window-watcher;1"] - .getService(Components.interfaces.nsIWindowWatcher) - .getNewPrompter(null); - } - throw Components.results.NS_ERROR_NO_INTERFACE; - }, - + + // nsIInterfaceRequestor impl + getInterface: function(iid) { + if (iid.equals(Components.interfaces.nsIAuthPrompt)) { + // use the window watcher service to get a nsIAuthPrompt impl + return Components.classes["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Components.interfaces.nsIWindowWatcher) + .getNewAuthPrompter(null); + } + else if (iid.equals(Components.interfaces.nsIPrompt)) { + // use the window watcher service to get a nsIPrompt impl + return Components.classes["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Components.interfaces.nsIWindowWatcher) + .getNewPrompter(null); + } + throw Components.results.NS_ERROR_NO_INTERFACE; + }, + // // Helper functions // @@ -888,13 +888,16 @@ var calDavCalendarModule = { const jssslContractID = "@mozilla.org/moz/jssubscript-loader;1"; const jssslIID = Components.interfaces.mozIJSSubScriptLoader; - const iosvcContractID = "@mozilla.org/network/io-service;1"; const iosvcIID = Components.interfaces.nsIIOService; + const iosvcContractID = "@mozilla.org/network/io-service;1"; + const iosvcIID = Components.interfaces.nsIIOService; var loader = Components.classes[jssslContractID].getService(jssslIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // Utils lives in the same directory we're in - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find utils in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); var scriptName = "calUtils.js"; var f = appdir.clone(); diff --git a/calendar/providers/composite/calCompositeCalendar.js b/calendar/providers/composite/calCompositeCalendar.js index d822833068f..6b9d538e0b8 100644 --- a/calendar/providers/composite/calCompositeCalendar.js +++ b/calendar/providers/composite/calCompositeCalendar.js @@ -469,13 +469,16 @@ var calCompositeCalendarModule = { const jssslContractID = "@mozilla.org/moz/jssubscript-loader;1"; const jssslIID = Components.interfaces.mozIJSSubScriptLoader; - const iosvcContractID = "@mozilla.org/network/io-service;1"; const iosvcIID = Components.interfaces.nsIIOService; + const iosvcContractID = "@mozilla.org/network/io-service;1"; + const iosvcIID = Components.interfaces.nsIIOService; var loader = Components.classes[jssslContractID].getService(jssslIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // Utils lives in the same directory we're in - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find utils in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); var scriptName = "calUtils.js"; var f = appdir.clone(); diff --git a/calendar/providers/ics/calICSCalendar.js b/calendar/providers/ics/calICSCalendar.js index 733add1df54..8b9342cff51 100644 --- a/calendar/providers/ics/calICSCalendar.js +++ b/calendar/providers/ics/calICSCalendar.js @@ -1004,13 +1004,16 @@ var calICSCalendarModule = { const jssslContractID = "@mozilla.org/moz/jssubscript-loader;1"; const jssslIID = Components.interfaces.mozIJSSubScriptLoader; - const iosvcContractID = "@mozilla.org/network/io-service;1"; const iosvcIID = Components.interfaces.nsIIOService; + const iosvcContractID = "@mozilla.org/network/io-service;1"; + const iosvcIID = Components.interfaces.nsIIOService; var loader = Components.classes[jssslContractID].getService(jssslIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // Utils lives in the same directory we're in - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find utils in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); var scriptName = "calUtils.js"; var f = appdir.clone(); diff --git a/calendar/providers/memory/calMemoryCalendar.js b/calendar/providers/memory/calMemoryCalendar.js index 37ad14d86c6..07986669795 100644 --- a/calendar/providers/memory/calMemoryCalendar.js +++ b/calendar/providers/memory/calMemoryCalendar.js @@ -515,13 +515,16 @@ var calMemoryCalendarModule = { const jssslContractID = "@mozilla.org/moz/jssubscript-loader;1"; const jssslIID = Components.interfaces.mozIJSSubScriptLoader; - const iosvcContractID = "@mozilla.org/network/io-service;1"; const iosvcIID = Components.interfaces.nsIIOService; + const iosvcContractID = "@mozilla.org/network/io-service;1"; + const iosvcIID = Components.interfaces.nsIIOService; var loader = Components.classes[jssslContractID].getService(jssslIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // Utils lives in the same directory we're in - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find utils in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); var scriptName = "calUtils.js"; var f = appdir.clone(); diff --git a/calendar/providers/storage/calStorageCalendar.js b/calendar/providers/storage/calStorageCalendar.js index 04cea58a883..87eb2e653aa 100644 --- a/calendar/providers/storage/calStorageCalendar.js +++ b/calendar/providers/storage/calStorageCalendar.js @@ -1856,13 +1856,16 @@ var calStorageCalendarModule = { const jssslContractID = "@mozilla.org/moz/jssubscript-loader;1"; const jssslIID = Components.interfaces.mozIJSSubScriptLoader; - const iosvcContractID = "@mozilla.org/network/io-service;1"; const iosvcIID = Components.interfaces.nsIIOService; + const iosvcContractID = "@mozilla.org/network/io-service;1"; + const iosvcIID = Components.interfaces.nsIIOService; var loader = Components.classes[jssslContractID].getService(jssslIID); var iosvc = Components.classes[iosvcContractID].getService(iosvcIID); - // Utils lives in the same directory we're in - var appdir = __LOCATION__.parent; + // Note that unintuitively, __LOCATION__.parent == . + // We expect to find utils in ./../js + var appdir = __LOCATION__.parent.parent; + appdir.append("js"); var scriptName = "calUtils.js"; var f = appdir.clone();