Bug 956609 - Land the IM front-end in comm-central: Remove purple references, r=florian.
authorPatrick Cloke <clokep@gmail.com>
Sun, 05 Jan 2014 20:40:33 -0500
changeset 17379 bd40ffb0777d6150f11d49d8ab30e88f277dcdce
parent 17378 714d7b91360ade0ee9fa259ac08884129bf139aa
child 17380 8543b65a1a732593e6117227d217dabc8b7f120c
push id1151
push userbugzilla@standard8.plus.com
push dateMon, 03 Feb 2014 22:50:32 +0000
treeherdercomm-aurora@267d8e9143d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs956609
Bug 956609 - Land the IM front-end in comm-central: Remove purple references, r=florian.
im/app.mozbuild
im/build.mk
im/configure.in
im/installer/package-manifest.in
im/locales/Makefile.in
im/locales/l10n.ini
--- a/im/app.mozbuild
+++ b/im/app.mozbuild
@@ -11,10 +11,9 @@ if not CONFIG['COMM_BUILD']:
         include('/toolkit/toolkit.mozbuild')
 
     if CONFIG['MOZ_EXTENSIONS']:
         add_tier_dir('app', 'extensions')
 else:
     add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
     add_tier_dir('app', 'chat')
-    add_tier_dir('app', 'purple')
     add_tier_dir('app', 'instantbird')
--- a/im/build.mk
+++ b/im/build.mk
@@ -125,12 +125,11 @@ upload:
 ifdef UPLOAD_CMD
 	$(PRE_UPLOAD_CMD)
 	$(UPLOAD_CMD)
 	$(POST_UPLOAD_CMD)
 endif
 
 ib::
 	@$(MAKE) -C chat export libs
-	@$(MAKE) -C purple export libs
 	@$(MAKE) -C instantbird libs
 
 endif # COMM_BUILD
--- a/im/configure.in
+++ b/im/configure.in
@@ -1,232 +1,8 @@
 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)
-
-dnl Get version of libpurple from the version files.
-if test "$COMM_BUILD" = "1"; then
-  commdir=$topsrcdir
-else
-  commdir=$topsrcdir/..
-fi
-PURPLE_MAJOR_VERSION=`cat $commdir/purple/config/version.txt |cut -d '.' -f 1`
-PURPLE_MINOR_VERSION=`cat $commdir/purple/config/version.txt |cut -d '.' -f 2`
-PURPLE_MICRO_VERSION=`cat $commdir/purple/config/version.txt |cut -d '.' -f 3`
-AC_SUBST(PURPLE_MAJOR_VERSION)
-AC_SUBST(PURPLE_MINOR_VERSION)
-AC_SUBST(PURPLE_MICRO_VERSION)
-
-dnl ========================================================
-dnl =
-dnl = Libpurple related checks
-dnl =
-dnl ========================================================
-
-dnl ========================================================
-dnl PKG_CHECK_MODULES and its dependencies.
-dnl ========================================================
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-define(AC_FD_MSG, 6)dnl
-[#] AC_FD_MSG checking for... messages and results
-define(AC_FD_CC, 5)dnl
-[#] AC_FD_CC compiler messages saved in config.log
-
-dnl Check whether to use -n, \c, or newline-tab to separate
-dnl checking messages from result messages.
-dnl Idea borrowed from dist 3.0.
-dnl Internal use only.
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-dnl AC_MSG_CHECKING(FEATURE-DESCRIPTION)
-define(AC_MSG_CHECKING,
-[echo $ac_n "checking $1""... $ac_c" 1>&AC_FD_MSG
-echo "configure:app-sub-configure: checking $1" >&AC_FD_CC])
-
-dnl AC_MSG_RESULT(RESULT-DESCRIPTION)
-define(AC_MSG_RESULT,
-[echo "$ac_t""$1" 1>&AC_FD_MSG])
-
-dnl The name of shell var CACHE-ID must contain `_cv_' in order to get saved.
-dnl AC_CACHE_VAL(CACHE-ID, COMMANDS-TO-SET-IT)
-define(AC_CACHE_VAL,
-[dnl We used to use the below line, but it fails if the 1st arg is a
-dnl shell variable, so we need the eval.
-dnl if test "${$1+set}" = set; then
-dnl the '' avoids an AIX 4.1 sh bug ("invalid expansion").
-if eval "test \"`echo '$''{'$1'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&AC_FD_MSG
-else
-  $2
-fi
-])
-
-dnl AC_PATH_PROG(VARIABLE, PROG-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AC_PATH_PROG,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$4], , $PATH, [$4])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_$1="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 3rd arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$3], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$3"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-# PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-# defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-# also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES],
-[succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
-
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            ## Remove evil flags like -Wl,--export-dynamic
-            $1_LIBS="`$PKG_CONFIG --libs \"$2\" |sed s/-Wl,--export-dynamic//g`"
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-        fi
-
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     if test "$COMPILE_ENVIRONMENT"; then
-       ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-     fi
-  fi
-])
-
-
-dnl ========================================================
-dnl Check for libxml2.
-dnl ========================================================
-if test "${OS_TARGET}" = "Linux"; then
-    PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
-fi
-
-STATIC_PRPLS="jabber gg oscar msn myspace novell qq sametime simple yahoo netsoul"
-
-MOZ_ARG_ENABLE_BOOL(purple-plugins,
-[  --enable-purple-plugins      Enable usage of system libpurple plugins],
-    PURPLE_PLUGINS=1,
-    PURPLE_PLUGINS= )
-AC_SUBST(PURPLE_PLUGINS)
-
-dnl =========================================================
-dnl = Bonjour
-dnl =========================================================
-PURPLE_BONJOUR=1
-MOZ_ARG_DISABLE_BOOL(bonjour,
-[  --disable-bonjour          Disable Bonjour protocol support],
-    PURPLE_BONJOUR=)
-AC_SUBST(PURPLE_BONJOUR)
-
-if test "$PURPLE_BONJOUR"; then
-    case "$OS_TARGET" in
-        WINNT|Darwin)
-            dnl =========================================================
-            dnl = Bonjour SDK should be installed on Mac OS X, we provide the
-            dnl = header for Windows
-            dnl =========================================================
-            STATIC_PRPLS="$STATIC_PRPLS bonjour"
-            ;;
-        *)
-            dnl =========================================================
-            dnl = Attempt to autodetect Avahi
-            dnl =========================================================
-            PKG_CHECK_MODULES(AVAHI, avahi-client avahi-glib, PURPLE_AVAHI=1)
-
-            if test -z "$PURPLE_AVAHI"; then
-                AC_MSG_ERROR([Could not find avahi-client or avahi-glib. To build without Bonjour, reconfigure with --disable-bonjour.])
-            fi
-            AC_SUBST(AVAHI_CFLAGS)
-            AC_SUBST(AVAHI_LIBS)
-            ;;
-    esac
-fi
-AC_SUBST(STATIC_PRPLS)
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -216,35 +216,22 @@
 @BINPATH@/components/odnoklassniki.js
 @BINPATH@/components/odnoklassniki.manifest
 @BINPATH@/components/smileProtocolHandler.js
 @BINPATH@/components/smileProtocolHandler.manifest
 @BINPATH@/components/logger.js
 @BINPATH@/components/logger.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; 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
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Default Profile Settings
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; default pref files
 @BINPATH@/defaults/pref/all-instantbird.js
 @BINPATH@/defaults/pref/channel-prefs.js
-@BINPATH@/defaults/pref/purple-prefs.js
 @BINPATH@/greprefs.js
 
 ; login manager
 @BINPATH@/components/loginmgr.xpt
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
 @BINPATH@/components/nsLoginManagerPrompter.js
 @BINPATH@/components/passwordmgr.manifest
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -80,17 +80,16 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
 
 install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$*
 	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) -C ../../purple/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 
 # Note the funny extra "../" in SFX_HEADER is because the repackage-zip command
 # is actually run effectively from within the mozilla/ part of the objdir, so
--- a/im/locales/l10n.ini
+++ b/im/locales/l10n.ini
@@ -3,17 +3,16 @@
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [general]
 depth = ../..
 
 [compare]
 dirs = instantbird
     chat
-    purple
     instantbird/branding/release
     instantbird/branding/nightly
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini