Bug 955009 - Ship libpurple as an add-on / allow it to be disabled in configure, call purple's subconfigure from im/configure.in, and packaging changes, r=clokep.
authorFlorian Quèze <florian@queze.net>
Fri, 28 Feb 2014 01:39:11 +0100
changeset 17639 116c2a4f5b6e8c088ee51d6da2bab939926bd989
parent 17638 f33bbb41b11cabdeeff0af2116bc84acbb6ef059
child 17640 febc91ed7a0b27593cd51c30f93a2acf02472e39
push id1175
push usermbanner@mozilla.com
push dateTue, 18 Mar 2014 08:37:15 +0000
treeherdercomm-aurora@3b5242ee031a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs955009
Bug 955009 - Ship libpurple as an add-on / allow it to be disabled in configure, call purple's subconfigure from im/configure.in, and packaging changes, r=clokep.
im/configure.in
im/installer/Makefile.in
im/installer/package-manifest.in
--- a/im/configure.in
+++ b/im/configure.in
@@ -1,8 +1,20 @@
 dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*-
 dnl vi: set tabstop=2 shiftwidth=2 expandtab:
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Things we need to carry from confvars.sh
 AC_SUBST(INSTANTBIRD_VERSION)
+
+if test -d $topsrcdir/extensions/purple ; then
+  tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1
+  m4 "${topsrcdir}/build/autoconf/subconfigure.m4" \
+   "${topsrcdir}/build/autoconf/altoptions.m4" \
+   "${topsrcdir}/extensions/purple/configure.in" > $tmpscript
+  . $tmpscript
+  rm -f $tmpscript
+
+  MOZ_PURPLE=1
+  AC_SUBST(MOZ_PURPLE)
+fi
--- a/im/installer/Makefile.in
+++ b/im/installer/Makefile.in
@@ -75,16 +75,20 @@ endif
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif
 
 ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI
 endif
 
+ifdef MOZ_PURPLE
+DEFINES += -DMOZ_PURPLE
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -127,16 +127,19 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 @BINPATH@/defaults/profile/localstore.rdf
 @BINPATH@/defaults/profile/prefs.js
 @BINPATH@/defaults/profile/mimeTypes.rdf
 
 #ifdef XP_MACOSX
 @BINPATH@/components/ibDockBadge.js
 @BINPATH@/components/ibDockBadge.manifest
+#ifdef MOZ_PURPLE
+@BINPATH@/components/components.manifest
+#endif
 #else
 @BINPATH@/components/components.manifest
 @BINPATH@/components/@DLL_PREFIX@trayToolkit@DLL_SUFFIX@
 @BINPATH@/components/trayToolkit.xpt
 @BINPATH@/components/profileMigrator.js
 @BINPATH@/components/profileMigrator.manifest
 #endif
 @BINPATH@/components/instantbird.xpt
@@ -202,16 +205,31 @@
 @BINPATH@/components/yahoo.manifest
 @BINPATH@/components/odnoklassniki.js
 @BINPATH@/components/odnoklassniki.manifest
 @BINPATH@/components/smileProtocolHandler.js
 @BINPATH@/components/smileProtocolHandler.manifest
 @BINPATH@/components/logger.js
 @BINPATH@/components/logger.manifest
 
+#ifdef MOZ_PURPLE
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; libpurple
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+@BINPATH@/chrome/purple@JAREXT@
+@BINPATH@/chrome/purple.manifest
+@BINPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@
+@BINPATH@/components/purplexpcom.xpt
+@BINPATH@/components/prpl.manifest
+#ifdef UNIX_BUT_NOT_MAC
+@BINPATH@/components/@DLL_PREFIX@bonjour@DLL_SUFFIX@
+#endif
+@BINPATH@/defaults/pref/purple-prefs.js
+#endif
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Default Profile Settings
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; default pref files
 @BINPATH@/defaults/pref/all-instantbird.js
 @BINPATH@/defaults/pref/channel-prefs.js
 @BINPATH@/greprefs.js