Changeset 24354

Timestamp:

07/15/2008 08:34:17 AM (5 months ago)

Author:

evands

Message:

Awesome updates to the builds scripts from Ryan Govostes, with the following changes:
=== copy_frameworks.sh ===

• silenced the pushd / popd calls
  
• now echos out the next step
  

=== README ===

• changed some of the bash command lists to not go wild if something fails
  
• added section on how to move the Pidgin source tree
  
• clarified when you need to update PO files
  
• updated libpurple build phase instructions
  

=== make_po_files.sh ===

• now echos out the next step
  

=== purple_make.sh ===

• adds --msn and --msn-pecan switches; default is --msn-pecan
  
• adds --ppc and --i386 switches to limit the build to a single arch
  
• supersedes purple_make_without_msn-pecan.sh
  
• now performs incremental builds :) see note
  
• adds --regenerate switch to force autoconf and automake
  
• prints out reverts the same as it does for patches
  

Closes #10473

Files:

• trunk/Utilities/dep-build-scripts/copy_frameworks.sh (modified) (1 diff)
• trunk/Utilities/dep-build-scripts/make_po_files.sh (modified) (1 diff)
• trunk/Utilities/dep-build-scripts/purple_make.sh (modified) (8 diffs)
• trunk/Utilities/dep-build-scripts/README (modified) (7 diffs)

trunk/Utilities/dep-build-scripts/copy_frameworks.sh

@@ -4 +4 @@
-cp -r "`dirname $0`"/build/Frameworks/*.framework "$ADIUM/Frameworks/"
-
-
+ > /dev/null 2>&1
-        rm -rf */AdiumLibpurple.framework 
-        rm -rf */*/Adium.app/Contents/Frameworks/lib*
-
+
+
+

trunk/Utilities/dep-build-scripts/make_po_files.sh

@@ -28 +28 @@
-popd
-
+echo "Done - now run ./copy_frameworks.sh"

trunk/Utilities/dep-build-scripts/purple_make.sh

@@ -5 +5 @@
-cd "$BUILDDIR"
-
-
-
-
-
-
-
-
+
-        echo 'Error: you need to set PIDGIN_SOURCE to be the location of' \
-        'your pidgin source tree.'
@@ -19 +13 @@
-echo "Using Pidgin source from: $PIDGIN_SOURCE"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-pushd $PIDGIN_SOURCE > /dev/null 2>&1
@@ -55 +83 @@
-                                        "$PATCHDIR/libpurple_xmlnode_parser_error_handler.diff" \
-                                        "$PATCHDIR/libpurple_zephyr_fix_krb4_flags.diff" \
-                                        "$PATCHDIR/libpurple_static_for_msn_pecan.diff" \
-                                        "$PATCHDIR/libpurple_jabber_use_builtin_digestmd5.diff" \
-                                        "$PATCHDIR/libpurple_jabber_fallback_to_auth_old_after_gssapi_only_fails.diff" \
-                                        "$PATCHDIR/libpurple_jabber_roster_debug.diff")
+
+##
+# msn-pecan specific patches
+##
+if [ x"$MSN" = x"msn_pecan" ] ; then
+        LIBPURPLE_PATCHES=( \
+                        ${LIBPURPLE_PATCHES[@]} \
+                        "$PATCHDIR/libpurple_static_for_msn_pecan.diff" \
+                )
+fi
-
-for patch in ${LIBPURPLE_PATCHES[@]} ; do
@@ -66 +103 @@
-popd > /dev/null 2>&1
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    case $ARCH in
-                ppc) export HOST=powerpc-apple-darwin9
@@ -85 +146 @@
-
-    #Note that whether we use openssl or cdsa the same underlying workarounds (as seen in jabber.c, only usage at present 12/07) are needed
-
+
+
+
+
-
-    if [ "$DEBUG_SYMBOLS" = "TRUE" ] ; then
@@ -101 +165 @@
-                echo LDFLAGS is $LDFLAGS
-                echo PKG_CONFIG is $PKG_CONFIG
-
-
-
-
-
-
-
+
-        # we don't need pkg-config for this
-        export LIBXML_CFLAGS='-I/usr/include/libxml2' 
@@ -115 +173 @@
-        export MEANWHILE_CFLAGS="-I$TARGET_DIR/include/meanwhile -I$TARGET_DIR/include/glib-2.0 -I$TARGET_DIR/lib/glib-2.0/include"
-        export MEANWHILE_LIBS="-lmeanwhile -lglib-2.0 -liconv"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        pushd libpurple > /dev/null 2>&1
-            make -j $NUMBER_OF_CORES && make install
-        popd > /dev/null 2>&1
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # HACK ALERT! We use the following internal-only headers:
-    cp $PIDGIN_SOURCE/libpurple/protocols/oscar/oscar.h \
@@ -157 +270 @@
-pushd $PIDGIN_SOURCE > /dev/null 2>&1
-        for patch in ${LIBPURPLE_PATCHES[@]} ; do
+                echo "Reverting $patch"
-                patch -R -p0 < $patch || true
-        done

trunk/Utilities/dep-build-scripts/README

@@ -12 +12 @@
-Alternatively, you can substitute curl and xargs:
-
-(mkdir source || true) && cd source && (cat ../urls.txt | xargs -I %url%
-curl -LO %url%) && (ls -1 *.tar.gz | xargs -I %file% tar xzf %file%) &&
-(ls -1 *.tar.bz2 | xargs -I %file% tar xjf %file%) && rm -f *.tar.* &&
+mkdir source; cd source; (cat ../urls.txt | xargs -I %url% curl -LO %url%)
+&& (ls -1 *.tar.gz | xargs -I %file% tar xzf %file%) && (ls -1 *.tar.bz2 |
+xargs -I %file% tar xjf %file%); rm -f *.tar.*;
-
-
@@ -20 +20 @@
-
-The Pidgin source is not installed by the download script. Adium currently uses
-2
+3
-build process expect this version.
-
@@ -34 +34 @@
-process. Please note that this file is nearly 200 MB.
-
-(mkdir im.pidgin.pidgin || true)
-; bzip2 -d pidgin.mtn.bz2;
-mtn db -d pidgin.mtn migrate; mtn -d pidgin.mtn pull --set-default pidgin.im
-"im.pidgin.*";
+mkdir im.pidgin.pidgin
+ && bzip2 -d pidgin.mtn.bz2
+&& mtn db -d pidgin.mtn migrate && mtn -d pidgin.mtn pull --set-default
+pidgin.im "im.pidgin.*" &&
-
-
@@ -47 +47 @@
-
-
+==== MOVING ====
+
+If you move the Pidgin source tree, you must update the absolute path of the
+pidgin.mtn database file in source/im.pidgin.pidgin/_MTN/options. Otherwise,
+you will be unable to pull changesets from the monotone repository.
+
+
-=== DOWNLOADING MSN-PECAN SOURCE TREE ===
-
-* Skip this step
+ * Skip these steps
-
-The msn-pecan source is not installed by the download script. Adium currently
@@ -61 +68 @@
-==== INITIAL CHECKOUT ====
-
-
-
-
+
-
-$ cd source/im.pidgin.pidgin/libpurple/protocols; git clone \
-; cd msn_pecan; git checkout
--b adium_test origin/adium_test; cd ../
+ && ln
+msn_pecan/adium/Makefile.am msn_pecan && cd 
-
-
-==== UPDATING ====
-
-* Skip this step if you are building without msn-pecan.
-
-To update the msn-pecan source, run
@@ -147 +150 @@
-=== LIBPURPLE ===
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-You must have set the PIDGIN_SOURCE variable for this script to run; see
-SETTING PIDGIN PATH above.
-
-This phase builds libpurple. The output of the build process is written to
-STDOUT.
-
-You must run this part of the build process each time you update libpurple.
-
@@ -183 +197 @@
-written to STDOUT.
-
-after you
-update libpurple
+whenever
+libpurple has received localization updates
-
-