Finish code tree building, fix password in dialogs, merge macOS build fixes

.gitignore

@@ -0,0 +1,2 @@
+/install.rdf
+/exchangecalendar-v*.xpi

.tx/config

@@ -2,188 +2,188 @@
 host = https://www.transifex.com
 
 [exchangecalendar.addressbook-addressbookOverlay]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/addressbookOverlay.dtd
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/addressbookOverlay.dtd
+file_filter = addressbook/locale/<lang>/addressbookOverlay.dtd
+source_file = addressbook/locale/en/addressbookOverlay.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.addressbook-exchangeContactSettings]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/exchangeContactSettings.dtd
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/exchangeContactSettings.dtd
+file_filter = addressbook/locale/<lang>/exchangeContactSettings.dtd
+source_file = addressbook/locale/en/exchangeContactSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.addressbook-ExchangeContacts]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/ExchangeContacts.properties
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeContacts.properties
+file_filter = addressbook/locale/<lang>/ExchangeContacts.properties
+source_file = addressbook/locale/en/ExchangeContacts.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.addressbook-ExchangeDistLists]
-file_filter = interfaces/exchangeAddressBook/locale/exchangecontacts/<lang>/ExchangeDistLists.properties
-source_file = interfaces/exchangeAddressBook/locale/exchangecontacts/en/ExchangeDistLists.properties
+file_filter = addressbook/locale/<lang>/ExchangeDistLists.properties
+source_file = addressbook/locale/en/ExchangeDistLists.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.attachments-view]
-file_filter = locale/exchangecalendar/<lang>/attachments-view.dtd
-source_file = locale/exchangecalendar/en/attachments-view.dtd
+file_filter = calendar/locale/<lang>/attachments-view.dtd
+source_file = calendar/locale/en/attachments-view.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.browseFolder]
-file_filter = locale/exchangecalendar/<lang>/browseFolder.dtd
-source_file = locale/exchangecalendar/en/browseFolder.dtd
+file_filter = common/locale/<lang>/browseFolder.dtd
+source_file = common/locale/en/browseFolder.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeCloneSettings]
-file_filter = locale/exchangecalendar/<lang>/exchangeCloneSettings.dtd
-source_file = locale/exchangecalendar/en/exchangeCloneSettings.dtd
+file_filter = common/locale/<lang>/exchangeCloneSettings.dtd
+source_file = common/locale/en/exchangeCloneSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeReminderDialog]
-file_filter = locale/exchangecalendar/<lang>/exchangeReminderDialog.dtd
-source_file = locale/exchangecalendar/en/exchangeReminderDialog.dtd
+file_filter = calendar/locale/<lang>/exchangeReminderDialog.dtd
+source_file = calendar/locale/en/exchangeReminderDialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.messenger_task_delegation]
-file_filter = locale/exchangecalendar/<lang>/messenger_task_delegation.dtd
-source_file = locale/exchangecalendar/en/messenger_task_delegation.dtd
+file_filter = calendar/locale/<lang>/messenger_task_delegation.dtd
+source_file = calendar/locale/en/messenger_task_delegation.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.sendUpdateTo]
-file_filter = locale/exchangecalendar/<lang>/sendUpdateTo.dtd
-source_file = locale/exchangecalendar/en/sendUpdateTo.dtd
+file_filter = common/locale/<lang>/sendUpdateTo.dtd
+source_file = common/locale/en/sendUpdateTo.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.timezonePreference]
-file_filter = locale/exchangecalendar/<lang>/timezonePreference.dtd
-source_file = locale/exchangecalendar/en/timezonePreference.dtd
+file_filter = common/locale/<lang>/timezonePreference.dtd
+source_file = common/locale/en/timezonePreference.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.invitationResponse]
-file_filter = locale/exchangecalendar/<lang>/invitationResponse.dtd
-source_file = locale/exchangecalendar/en/invitationResponse.dtd
+file_filter = common/locale/<lang>/invitationResponse.dtd
+source_file = common/locale/en/invitationResponse.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.lightning-item-iframe]
-file_filter = locale/exchangecalendar/<lang>/lightning-item-iframe.dtd
-source_file = locale/exchangecalendar/en/lightning-item-iframe.dtd
+file_filter = calendar/locale/<lang>/lightning-item-iframe.dtd
+source_file = calendar/locale/en/lightning-item-iframe.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calendar-calendars-list]
-file_filter = locale/exchangecalendar/<lang>/calendar-calendars-list.dtd
-source_file = locale/exchangecalendar/en/calendar-calendars-list.dtd
+file_filter = calendar/locale/<lang>/calendar-calendars-list.dtd
+source_file = calendar/locale/en/calendar-calendars-list.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calendar-summary-dialog]
-file_filter = locale/exchangecalendar/<lang>/calendar-summary-dialog.dtd
-source_file = locale/exchangecalendar/en/calendar-summary-dialog.dtd
+file_filter = calendar/locale/<lang>/calendar-summary-dialog.dtd
+source_file = calendar/locale/en/calendar-summary-dialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.delegate-calendar-dialog]
-file_filter = locale/exchangecalendar/<lang>/delegate-calendar-dialog.dtd
-source_file = locale/exchangecalendar/en/delegate-calendar-dialog.dtd
+file_filter = calendar/locale/<lang>/delegate-calendar-dialog.dtd
+source_file = calendar/locale/en/delegate-calendar-dialog.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.delegate-folder]
-file_filter = locale/exchangecalendar/<lang>/delegate-folder.dtd
-source_file = locale/exchangecalendar/en/delegate-folder.dtd
+file_filter = common/locale/<lang>/delegate-folder.dtd
+source_file = common/locale/en/delegate-folder.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeSettings]
-file_filter = locale/exchangecalendar/<lang>/exchangeSettings.dtd
-source_file = locale/exchangecalendar/en/exchangeSettings.dtd
+file_filter = common/locale/<lang>/exchangeSettings.dtd
+source_file = common/locale/en/exchangeSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.extra-priority]
-file_filter = locale/exchangecalendar/<lang>/extra-priority.dtd
-source_file = locale/exchangecalendar/en/extra-priority.dtd
+file_filter = common/locale/<lang>/extra-priority.dtd
+source_file = common/locale/en/extra-priority.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.inviteStyle]
-file_filter = locale/exchangecalendar/<lang>/inviteStyle.dtd
-source_file = locale/exchangecalendar/en/inviteStyle.dtd
+file_filter = common/locale/<lang>/inviteStyle.dtd
+source_file = common/locale/en/inviteStyle.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.manageEWSAccounts]
-file_filter = locale/exchangecalendar/<lang>/manageEWSAccounts.dtd
-source_file = locale/exchangecalendar/en/manageEWSAccounts.dtd
+file_filter = common/locale/<lang>/manageEWSAccounts.dtd
+source_file = common/locale/en/manageEWSAccounts.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.oofSettings]
-file_filter = locale/exchangecalendar/<lang>/oofSettings.dtd
-source_file = locale/exchangecalendar/en/oofSettings.dtd
+file_filter = common/locale/<lang>/oofSettings.dtd
+source_file = common/locale/en/oofSettings.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.preInvitationResponse]
-file_filter = locale/exchangecalendar/<lang>/preInvitationResponse.dtd
-source_file = locale/exchangecalendar/en/preInvitationResponse.dtd
+file_filter = common/locale/<lang>/preInvitationResponse.dtd
+source_file = common/locale/en/preInvitationResponse.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.preferences]
-file_filter = locale/exchangecalendar/<lang>/preferences.dtd
-source_file = locale/exchangecalendar/en/preferences.dtd
+file_filter = common/locale/<lang>/preferences.dtd
+source_file = common/locale/en/preferences.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.rtews]
-file_filter = locale/exchangecalendar/<lang>/rtews.dtd
-source_file = locale/exchangecalendar/en/rtews.dtd
+file_filter = emailtag/locale/<lang>/emailtag.dtd
+source_file = emailtag/locale/en/emailtag.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.rtews-properties]
-file_filter = locale/exchangecalendar/<lang>/rtews.properties
-source_file = locale/exchangecalendar/en/rtews.properties
+file_filter = emailtag/locale/<lang>/emailtag.properties
+source_file = emailtag/locale/en/emailtag.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 
 [exchangecalendar.selectEWSUrl]
-file_filter = locale/exchangecalendar/<lang>/selectEWSUrl.dtd
-source_file = locale/exchangecalendar/en/selectEWSUrl.dtd
+file_filter = common/locale/<lang>/selectEWSUrl.dtd
+source_file = common/locale/en/selectEWSUrl.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.sharedCalendarParser]
-file_filter = locale/exchangecalendar/<lang>/sharedCalendarParser.dtd
-source_file = locale/exchangecalendar/en/sharedCalendarParser.dtd
+file_filter = common/locale/<lang>/sharedCalendarParser.dtd
+source_file = common/locale/en/sharedCalendarParser.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.ecCalendarCreation]
-file_filter = locale/exchangecalendar/<lang>/ecCalendarCreation.dtd
-source_file = locale/exchangecalendar/en/ecCalendarCreation.dtd
+file_filter = calendar/locale/<lang>/ecCalendarCreation.dtd
+source_file = calendar/locale/en/ecCalendarCreation.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.exchangeSettingsOverlay]
-file_filter = locale/exchangecalendar/<lang>/exchangeSettingsOverlay.dtd
-source_file = locale/exchangecalendar/en/exchangeSettingsOverlay.dtd
+file_filter = common/locale/<lang>/exchangeSettingsOverlay.dtd
+source_file = common/locale/en/exchangeSettingsOverlay.dtd
 source_lang = en
 type = DTD
 
 [exchangecalendar.calExchangeCalendar]
-file_filter = locale/exchangecalendar/<lang>/calExchangeCalendar.properties
-source_file = locale/exchangecalendar/en/calExchangeCalendar.properties
+file_filter = common/locale/<lang>/calExchangeCalendar.properties
+source_file = common/locale/en/calExchangeCalendar.properties
 source_lang = en
 type = MOZILLAPROPERTIES
 

Makefile

@@ -1,20 +1,26 @@
 version = $(shell cat VERSION)
-excludefromxpi = .git/\* .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION
+excludefromxpi = .git/\* .gitignore \*/.gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
 releasebranch = ec-4.0
+update = disable
+xpi = exchangecalendar-v$(version).xpi
+
+.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js $(xpi)
 
 # Default target is build package
-build:
-	# Update version number inside install.rdf file from VERSION file
-	sed -i 's/\(\s*\)<em:version>[^<]*\?<\/em:version>/\1<em:version>$(version)<\/em:version>/' install.rdf
-	# Disable automatic updates of the extension
-	cat defaults/preferences/update_disable.txt > defaults/preferences/update.js
-	# Finally, create the xpi file
-	zip -r exchangecalendar-v"$(version)".xpi -x $(excludefromxpi) -- . 
+build: $(xpi)
+
+$(xpi): install.rdf defaults/preferences/update.js
+	rm -f $@
+	zip -r $@ -x $(excludefromxpi) -- .
+
+install.rdf: install.rdf.template
+	sed 's/@VERSION@/$(version)/g' $< > $@
+
+defaults/preferences/update.js:
+	cp defaults/preferences/update_$(update).txt $@
 
 # Target to publish a new release:
 release: l10n-auto-commit build
-	git add -- install.rdf
-	git commit -m "releases v$(version)"
 	git tag "v$(version)"
 	@echo 'Translations updated, build done, tag added.'
 	@echo 'Now, if the release is well done, please run one "git push" to publish code and one "git push v$(version)" to publish the new tag.'
@@ -44,19 +50,21 @@ dev: beautify build
 beautify: beautify-xml beautify-js
 
 beautify-xml:
-	find \( -name "*.xml" -o -name "*.xul" \) -exec \
+	find . \( -name "*.xml" -o -name "*.xul" \) \
+		-a \( \! -wholename "./calendar/interface/exchangeTimeZones/ewsTimesZoneDefinitions_2007.xml" \) \
+		-exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes \
 		{} \;
 	# For rdf files, we don't want to wrap lines to keep em:description on one line.
-	find -name "*.rdf" -exec \
+	find . \( -name "*.rdf" -o -name "*.rdf.template" \) -exec \
 		tidy --input-xml yes --indent auto --indent-spaces 4 --indent-attributes yes \
 		--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
 		--strict-tags-attributes no --write-back yes --wrap 0 \
 		{} \;
 beautify-js:
-	find -name "*.js" -exec \
+	find . -name "*.js" -exec \
 		js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \
 		--operator-position after-newline --brace-style end-expand --replace \
 		--end-with-newline \

interfaces/exchangeAddressBook/chrome/content/abCardOverlay.js → addressbook/content/abCardOverlay.js

@@ -31,9 +31,9 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource:///modules/mailServices.js");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
-Cu.import("resource://exchangecalendar/erGetAttachments.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
+Cu.import("resource://exchangecommon/erGetAttachments.js");
 
 var photoHandlerInline = {
     onLoad: function _onLoad(aCard, aDocument) {

interfaces/exchangeAddressBook/chrome/content/addressbookOverlay.js → addressbook/content/addressbookOverlay.js

@@ -31,9 +31,9 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("resource:///modules/mailServices.js");
 
-Cu.import("resource://exchangecalendar/ecFunctions.js");
-Cu.import("resource://exchangecalendar/exchangeAbFunctions.js");
-Cu.import("resource://exchangecalendar/erGetAttachments.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
+Cu.import("resource://exchangeaddress/exchangeAbFunctions.js");
+Cu.import("resource://exchangecommon/erGetAttachments.js");
 
 function exchAddressbookOverlay(aDocument, aWindow) {
     this._document = aDocument;

interfaces/exchangeAddressBook/chrome/content/exchangeContactSettings.xul → addressbook/content/exchangeContactSettings.xul

@@ -28,7 +28,7 @@
 [
     <!ENTITY % dtd1 SYSTEM "chrome://exchangecontacts/locale/exchangeContactSettings.dtd" > %dtd1;
 ]>
-<?xul-overlay href="chrome://exchangecalendar/content/exchangeSettingsOverlay.xul"?>
+<?xul-overlay href="chrome://exchangecommon/content/exchangeSettingsOverlay.xul"?>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="exchWebService_ContactSettings_dialog"
         title="Exchange Contact Settings"

addressbook/exchangeAddressBook.manifest

@@ -0,0 +1,25 @@
+content exchangecontacts content/
+
+overlay chrome://messenger/content/messenger.xul chrome://exchangecontacts/content/exchangeContactsInit.xul
+overlay chrome://messenger/content/addressbook/addressbook.xul chrome://exchangecontacts/content/addressbookOverlay.xul
+overlay chrome://messenger/content/addressbook/abCardOverlay.xul chrome://exchangecontacts/content/abCardOverlay.xul
+
+resource exchangeaddress exchangeapi/
+
+manifest interface/exchangeAbCard/mivExchangeAbCard.manifest
+manifest interface/exchangeAbDirFactory/exchangeAbDirFactory.manifest
+manifest interface/exchangeAbDistListDirectory/exchangeAbDistListDirectory.manifest
+manifest interface/exchangeAbFolderDirectory/exchangeAbFolderDirectory.manifest
+manifest interface/exchangeAbRootDirectory/exchangeAbRootDirectory.manifest
+manifest interface/exchangeAutoCompleteSearch/mivExchangeAutoCompleteSearch.manifest
+manifest interface/exchangeAutoCompleteResult/mivExchangeAutoCompleteResult.manifest
+
+locale exchangecontacts en    locale/en/
+
+locale exchangecontacts de    locale/de/
+locale exchangecontacts en-US locale/en_US/
+locale exchangecontacts fr-FR locale/fr_FR/
+locale exchangecontacts ja-JP locale/ja_JP/
+locale exchangecontacts nl    locale/nl/
+locale exchangecontacts ru    locale/ru/
+locale exchangecontacts sv    locale/sv/

components/erExpandDL.js → addressbook/exchangeapi/erExpandDL.js

@@ -29,9 +29,9 @@ var components = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-Cu.import("resource://exchangecalendar/ecExchangeRequest.js");
-Cu.import("resource://exchangecalendar/soapFunctions.js");
-Cu.import("resource://exchangecalendar/ecFunctions.js");
+Cu.import("resource://exchangecommon/ecExchangeRequest.js");
+Cu.import("resource://exchangecommon/soapFunctions.js");
+Cu.import("resource://exchangecommon/ecFunctions.js");
 
 var EXPORTED_SYMBOLS = ["erExpandDLRequest"];