Bug 956609 - Land the IM front-end in comm-central: Switch instantbird to im, r=florian.

im/app.mozbuild

@@ -16,4 +16,4 @@ else:
     add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
     add_tier_dir('app', 'chat')
-    add_tier_dir('app', 'instantbird')
+    add_tier_dir('app', 'im')

im/app/Makefile.in

@@ -14,7 +14,7 @@ AB_CD = $(MOZ_UI_LOCALE)
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
-LICENSE_TXT_FILE = $(topsrcdir)/instantbird/LICENSE.txt
+LICENSE_TXT_FILE = $(topsrcdir)/im/LICENSE.txt
 
 DEFINES += \
   -DINSTANTBIRD_ICO=\"$(DIST)/branding/instantbird.ico\" \
@@ -299,8 +299,8 @@ libs:: $(srcdir)/profile/prefs.js
 # mozilla-central does this in testing/xpcshell-tests which means that it is very
 # hard for anyone to specify anything else.
 libs::
-	$(INSTALL) $(topsrcdir)/instantbird/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
-	cp $(topsrcdir)/instantbird/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
+	$(INSTALL) $(topsrcdir)/im/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
+	cp $(topsrcdir)/im/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 

im/build.mk

@@ -77,7 +77,7 @@ FORCE_UPDATE := components/components.list|Contents/MacOS/components/components.
 
 distribution:
 	@$(MAKE) buildsymbols
-	@$(MAKE) -C instantbird/installer libs installer
+	@$(MAKE) -C im/installer libs installer
 ifdef ENABLE_TESTS
 	$(MAKE) xpcshell-tests
 endif
@@ -85,7 +85,7 @@ ifdef MOZ_UPDATE_PACKAGING
 	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update PKG_INST_PATH=
 endif
 ifdef L10NBASEDIR
-	$(foreach locale,$(SHIPPED_LOCALES),$(MAKE) -C instantbird/locales/ repack-$(locale) LOCALE_MERGEDIR=mergedir MOZ_MAKE_COMPLETE_MAR=$(MOZ_UPDATE_PACKAGING) ;)
+	$(foreach locale,$(SHIPPED_LOCALES),$(MAKE) -C im/locales/ repack-$(locale) LOCALE_MERGEDIR=mergedir MOZ_MAKE_COMPLETE_MAR=$(MOZ_UPDATE_PACKAGING) ;)
 endif
 ifdef MOZ_UPDATE_PACKAGING
 ifdef LIST_PREVIOUS_MAR_CMD
@@ -110,16 +110,16 @@ ifdef UPLOAD_CMD
 endif
 
 installer:
-	@$(MAKE) -C instantbird/installer installer
+	@$(MAKE) -C im/installer installer
 
-SHIPPED_LOCALES_FILE = $(topsrcdir)/instantbird/locales/shipped-locales
+SHIPPED_LOCALES_FILE = $(topsrcdir)/im/locales/shipped-locales
 SHIPPED_LOCALES := $(shell if test -f $(SHIPPED_LOCALES_FILE); then cat $(SHIPPED_LOCALES_FILE); fi)
 
 package:
-	@$(MAKE) -C instantbird/installer
+	@$(MAKE) -C im/installer
 
 install::
-	@$(MAKE) -C instantbird/installer install
+	@$(MAKE) -C im/installer install
 
 upload:
 ifdef UPLOAD_CMD
@@ -130,6 +130,6 @@ endif
 
 ib::
 	@$(MAKE) -C chat export libs
-	@$(MAKE) -C instantbird libs
+	@$(MAKE) -C im libs
 
 endif # COMM_BUILD

im/confvars.sh

@@ -14,6 +14,6 @@ MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 INSTANTBIRD_VERSION=$MOZ_APP_VERSION
 
-MOZ_BRANDING_DIRECTORY=instantbird/branding/nightly
-MOZ_OFFICIAL_BRANDING_DIRECTORY=instantbird/branding/release
+MOZ_BRANDING_DIRECTORY=im/branding/nightly
+MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/instantbird
 MOZ_APP_ID={33cb9019-c295-46dd-be21-8c4936574bee}

im/installer/Makefile.in

@@ -23,7 +23,7 @@ endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
-	instantbird \
+	im \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
@@ -116,7 +116,7 @@ endif
 DEFINES += -DBINPATH=$(BINPATH)
 
 libs::
-	$(MAKE) -C $(DEPTH)/instantbird/locales langpack
+	$(MAKE) -C $(DEPTH)/im/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 

im/installer/windows/Makefile.in

@@ -59,7 +59,7 @@ uninstaller::
 	  $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
 	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
           --preprocess-locale $(MOZILLA_SRCDIR) \
-	  $(call EXPAND_LOCALE_SRCDIR,instantbird/locales)/installer $(AB_CD) $(CONFIG_DIR)
+	  $(call EXPAND_LOCALE_SRCDIR,im/locales)/installer $(AB_CD) $(CONFIG_DIR)
 
 $(CONFIG_DIR)/setup.exe::
 	$(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
@@ -69,7 +69,7 @@ $(CONFIG_DIR)/setup.exe::
 	  $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
 	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-locale $(MOZILLA_SRCDIR) \
-	  $(call EXPAND_LOCALE_SRCDIR,instantbird/locales)/installer $(AB_CD) $(CONFIG_DIR)
+	  $(call EXPAND_LOCALE_SRCDIR,im/locales)/installer $(AB_CD) $(CONFIG_DIR)
 
 include $(topsrcdir)/config/rules.mk
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk

im/locales/Makefile.in

@@ -20,7 +20,7 @@ vpath %.xml $(LOCALE_SRCDIR)/searchplugins
 _ABS_SRCDIR := $(call core_abspath,$(topsrcdir))
 
 ifndef MOZ_BRANDING_DIRECTORY
-MOZ_BRANDING_DIRECTORY = instantbird/branding/nightly
+MOZ_BRANDING_DIRECTORY = im/branding/nightly
 endif
 
 SUBMAKEFILES += \
@@ -105,7 +105,7 @@ repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
 	  ZIP_IN=$(WIN32_INSTALLER_IN) \
 	  ZIP_OUT=$(WIN32_INSTALLER_OUT) \
 	  SFX_HEADER="$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
-	              $(_ABS_SRCDIR)/instantbird/installer/windows/app.tag"
+	              $(_ABS_SRCDIR)/im/installer/windows/app.tag"
 
 ifeq (WINNT,$(OS_ARCH))
 repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%