Bug 955017 - Re-sync build scripts with comm-central, r=florian.

im/installer/Makefile.in

@@ -16,6 +16,10 @@ include $(topsrcdir)/config/rules.mk
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+# Some files have been already bundled with xulrunner
+ifndef SYSTEM_LIBXUL
+MOZ_PKG_FATAL_WARNINGS = 1
+endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
@@ -25,6 +29,11 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+
+ifdef MOZ_DEBUG
+DEFINES += -DMOZ_DEBUG=1
+endif
+
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
@@ -33,18 +42,6 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_GTK2=1
 endif
 
-ifdef NSS_DISABLE_DBM
-DEFINES += -DNSS_DISABLE_DBM=1
-endif
-
-ifdef MOZ_UPDATER
-DEFINES += -DMOZ_UPDATER=1
-endif
-
-ifdef MOZ_MEMORY
-DEFINES += -DMOZ_MEMORY=1
-endif
-
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
@@ -52,15 +49,29 @@ endif
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
-DEFINES += \
-  -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) \
-  -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) \
-  -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) \
-	$(NULL)
+DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
+DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
+endif
+
+ifdef MOZ_UPDATER
+DEFINES += -DMOZ_UPDATER=1
+endif
+
+ifdef MOZ_NATIVE_NSPR
+DEFINES += -DMOZ_NATIVE_NSPR=1
+endif
+
+ifdef MOZ_NATIVE_NSS
+DEFINES += -DMOZ_NATIVE_NSS=1
 endif
 
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
+# Set MSVC dlls version to package, if any.
+ifdef WIN32_REDIST_DIR
+DEFINES += -DMOZ_MSVC_REDIST=$(_MSC_VER)
+endif
+
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif
@@ -85,20 +96,16 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 
-include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
+NON_OMNIJAR_FILES =
 
-ifdef MOZ_PKG_PRETTYNAMES
-libs::
-	$(MAKE) -C $(DEPTH)/instantbird/locales langpack-$(AB_CD)
-
-UPLOAD_EXTRA_FILES += $(LANGPACK)
-else
-libs::
-	$(MAKE) -C $(DEPTH)/instantbird/locales langpack-$(AB_CD) PKG_LANGPACK_PATH=
-
-UPLOAD_EXTRA_FILES += $(PKG_LANGPACK_BASENAME).xpi
+ifndef LIBXUL_SDK
+INSTALL_SDK = 1
 endif
 
+GENERATE_CACHE=1
+
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
 ifeq (Darwin, $(OS_ARCH))
 BINPATH = $(_BINPATH)
@@ -108,6 +115,9 @@ BINPATH = bin
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+libs::
+	$(MAKE) -C $(DEPTH)/instantbird/locales langpack
+
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 
 else
@@ -128,6 +138,11 @@ ifdef MOZ_PKG_MANIFEST_P
 endif
 
 installer:
-ifeq ($(OS_ARCH),WINNT)
-	$(MAKE) -C windows
+ifdef INSTALLER_DIR
+	$(MAKE) -C $(INSTALLER_DIR)
 endif
+
+APP_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
+APP_SOURCE_REPO = $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
+make-sourcestamp-file::
+	@echo "$(APP_SOURCE_REPO)/rev/$(APP_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)

im/installer/removed-files.in

@@ -169,7 +169,6 @@ components/zipwriter.xpt
 components/nsPostUpdateWin.js
 #endif /* XP_WIN */
 components/nsResetPref.js
-dependentlibs.list
 d3dx9_43.dll
 #ifdef XP_WIN
 IA2Marshal.dll

im/themes/Makefile.in

@@ -9,4 +9,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ICON_FILES := icon.png
+ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+INSTALL_TARGETS += ICON
+
 include $(topsrcdir)/config/rules.mk