adium/adium

Update build.sh to build libpurple from our Pidgin mercurial mirror.
adium-1.5.3
2012-08-09, Thijs Alkemade
fff1bfac2204
Parents 9681461bf730
Children 87b1e45b7cd7
Update build.sh to build libpurple from our Pidgin mercurial mirror.

Yes, I've changed CC and SDK again, but right now I don't feel like supporting building on anywhere else than Smew.
3 files changed, 45 insertions(+), 63 deletions(-)
  • +9 -9
    Dependencies/build.sh
  • +34 -52
    Dependencies/phases/build_purple.sh
  • +2 -2
    Dependencies/phases/make_frameworks.sh
    • --- a/Dependencies/build.sh Thu Aug 09 03:16:10 2012 +0200
    +++ b/Dependencies/build.sh Thu Aug 09 18:57:46 2012 +0200
    @@ -23,7 +23,8 @@
    # Also try /Developer-old, just in case XCode 4 is installed
    DEVELOPER=$(xcode-select -print-path)
    -SDK_ROOT="${DEVELOPER}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
    +# SDK_ROOT="${DEVELOPER}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
    +SDK_ROOT="/Developer/SDKs/MacOSX10.6.sdk/"
    MIN_OS_VERSION="10.6"
    BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
    @@ -68,7 +69,7 @@
    BUILD_OTR=false
    STRAIGHT_TO_LIBPURPLE=false
    DOWNLOAD_LIBPURPLE=false
    -MTN_UPDATE_PARAM=""
    +HG_UPDATE_PARAM=""
    DISTCC_HOSTS=""
    for option in ${@:1} ; do
    case $option in
    @@ -109,12 +110,12 @@
    warning "Building with LLVM! This is unsupported and will probably break things!"
    ;;
    --libpurple-rev=*)
    - MTN_REV=${option##*=}
    - MTN_UPDATE_PARAM="${MTN_UPDATE_PARAM} -r ${MTN_REV}"
    + HG_REV=${option##*=}
    + HG_UPDATE_PARAM="${HG_UPDATE_PARAM} -r ${HG_REV}"
    ;;
    --libpurple-branch=*)
    - MTN_BRANCH=${option##*=}
    - MTN_UPDATE_PARAM="${MTN_UPDATE_PARAM} -b ${MTN_BRANCH}"
    + HG_BRANCH=${option##*=}
    + HG_UPDATE_PARAM="${HG_UPDATE_PARAM} ${HG_BRANCH}"
    ;;
    --libpurple-only)
    STRAIGHT_TO_LIBPURPLE=true
    @@ -161,8 +162,8 @@
    eval `$DEVELOPER/usr/bin/pump --startup`
    else
    # Try to find the right gcc, even when XCode4 is installed
    - export CC="/opt/local/bin/gcc-apple-4.2"
    - export CXX="/opt/local/bin/g++-apple-4.2"
    + export CC="gcc"
    + export CXX="gcc"
    export CCAS="$CC"
    export OBJC="$CC"
    fi
    @@ -184,7 +185,6 @@
    # dependencies that we want to build ourselves.
    # Getting mtn's path before we export our own (safer?) path will ensure it works,
    # even if it's being managed by MacPorts, Fink, or similar.
    -MTN=`which mtn`
    export PATH=$ROOTDIR/build/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:$DEVELOPER/usr/bin:$DEVELOPER/usr/sbin
    export PKG_CONFIG="$ROOTDIR/build/bin/pkg-config"
    export PKG_CONFIG_PATH="$ROOTDIR/build/lib/pkgconfig:/usr/lib/pkgconfig"
    --- a/Dependencies/phases/build_purple.sh Thu Aug 09 03:16:10 2012 +0200
    +++ b/Dependencies/phases/build_purple.sh Thu Aug 09 18:57:46 2012 +0200
    @@ -13,7 +13,7 @@
    if [[ '' != ${version} ]] ; then
    LIBPURPLE_VERSION="${LIBPURPLE_VERSION}.${version}"
    fi
    - done < "${ROOTDIR}/source/im.pidgin.adium/libpurple/version.h"
    + done < "${ROOTDIR}/source/libpurple/libpurple/version.h"
    LIBPURPLE_VERSION="0.${LIBPURPLE_VERSION:3}"
    }
    @@ -23,33 +23,15 @@
    fetch_libpurple() {
    quiet pushd "$ROOTDIR/source"
    - if [ -d "im.pidgin.adium" ]; then
    -
    + if [ -d "libpurple" ]; then
    status "Pulling latest changes to libpurple"
    - cd "im.pidgin.adium"
    - $MTN pull
    - $MTN update ${MTN_UPDATE_PARAM}
    -
    + cd "libpurple"
    + hg pull
    +
    + status "Updating libpurple with ${HG_UPDATE_PARAM}"
    + hg update ${HG_UPDATE_PARAM}
    else
    -
    - quiet mkdir "im.pidgin.adium"
    - cd "im.pidgin.adium"
    -
    - status "Downloading bootstrap database for libpurple"
    - curl -LOf "http://developer.pidgin.im/static/pidgin.mtn.bz2"
    -
    - status "Extracting bootstrap database"
    - bzip2 -d "pidgin.mtn.bz2"
    -
    - status "Migrating database to new schema"
    - $MTN db -d "pidgin.mtn" migrate
    -
    - status "Pulling updates to monotone database"
    - $MTN -d "pidgin.mtn" pull --set-default "mtn.pidgin.im" "im.pidgin.*"
    -
    - status "Checking out im.pidgin.adium branch"
    - $MTN -d "pidgin.mtn" co -b "im.pidgin.adium" .
    -
    + hg clone -b adium "http://hg.adium.im/libpurple/" libpurple
    fi
    quiet popd
    @@ -62,7 +44,7 @@
    if $DOWNLOAD_LIBPURPLE; then
    fetch_libpurple
    fi
    - if [ ! -d "$ROOTDIR/source/im.pidgin.adium" ]; then
    + if [ ! -d "$ROOTDIR/source/libpurple" ]; then
    error "libpurple checkout not found; use --download-libpurple"
    exit 1;
    fi
    @@ -75,7 +57,7 @@
    quiet mkdir -p "$ROOTDIR/build/include/sasl"
    log cp -f "$ROOTDIR/source/cyrus-sasl/include/"*.h "$ROOTDIR/build/include/sasl"
    - quiet pushd "$ROOTDIR/source/im.pidgin.adium"
    + quiet pushd "$ROOTDIR/source/libpurple"
    PROTOCOLS="bonjour,gg,irc,jabber,msn,myspace,novell,oscar,"
    PROTOCOLS+="sametime,simple,yahoo,zephyr"
    @@ -126,8 +108,8 @@
    -DHAVE_OPENSSL -fno-common -DHAVE_ZLIB" \
    "$BASE_LDFLAGS -lsasl2 -ljson-glib-1.0 -lz" \
    "${CONFIG_CMD}" \
    - "${ROOTDIR}/source/im.pidgin.adium/libpurple/purple.h" \
    - "${ROOTDIR}/source/im.pidgin.adium/config.h"
    + "${ROOTDIR}/source/libpurple/libpurple/purple.h" \
    + "${ROOTDIR}/source/libpurple/config.h"
    )
    fi
    @@ -136,28 +118,28 @@
    log make install
    status "Copying internal libpurple headers"
    - log cp -f "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/oscar.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/snactypes.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/peer.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/cmds.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/internal.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/msn/"*.h \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/yahoo/"*.h \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/buddylist.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/gg.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/search.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/auth.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/bosh.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/buddy.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/caps.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/jutil.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/presence.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/si.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/jabber.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/iq.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/namespaces.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/irc/irc.h" \
    - "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/lib/libgadu.h" \
    + log cp -f "$ROOTDIR/source/libpurple/libpurple/protocols/oscar/oscar.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/oscar/snactypes.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/oscar/peer.h" \
    + "$ROOTDIR/source/libpurple/libpurple/cmds.h" \
    + "$ROOTDIR/source/libpurple/libpurple/internal.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/msn/"*.h \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/yahoo/"*.h \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/gg/buddylist.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/gg/gg.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/gg/search.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/auth.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/bosh.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/buddy.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/caps.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/jutil.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/presence.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/si.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/jabber.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/iq.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/namespaces.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/irc/irc.h" \
    + "$ROOTDIR/source/libpurple/libpurple/protocols/gg/lib/libgadu.h" \
    "$ROOTDIR/build/include/libpurple"
    quiet popd
    --- a/Dependencies/phases/make_frameworks.sh Thu Aug 09 03:16:10 2012 +0200
    +++ b/Dependencies/phases/make_frameworks.sh Thu Aug 09 18:57:46 2012 +0200
    @@ -130,7 +130,7 @@
    PURPLE_RSRC_DIR="${ROOTDIR}/Frameworks/libpurple.subproj/libpurple.framework/Resources"
    status "Building libpurple po files"
    - quiet pushd "${ROOTDIR}/source/im.pidgin.adium/po"
    + quiet pushd "${ROOTDIR}/source/libpurple/po"
    log make all
    log make install
    quiet popd
    @@ -147,4 +147,4 @@
    quiet popd
    status "libpurple po files built!"
    -}
    \ No newline at end of file
    +}