adium 2681:26fceb5368dc: Make library versions a little easier t...
commits at adium.im
commits at adium.im
Fri Sep 4 20:45:18 UTC 2009
details: http://hg.adium.im/adium/rev/26fceb5368dc
revision: 2681:26fceb5368dc
author: Stephen Holt <sholt at adium.im>
date: Fri Sep 04 16:52:43 2009 -0400
Make library versions a little easier to maintain.
* Place version variable definitions for libraries above where they're building functions are defined and their sources pulled.
* Dynamically sniff out the libpurple version we're building since mtn could possibly change it on us at any time.
Subject: adium 2682:e18ba043e821: Status updates and warning messages are really only useful when the screen doesn't fill up with configure and make output. Added logging to the build process.
details: http://hg.adium.im/adium/rev/e18ba043e821
revision: 2682:e18ba043e821
author: Stephen Holt <sholt at adium.im>
date: Thu Sep 03 16:59:46 2009 -0400
Status updates and warning messages are really only useful when the screen doesn't fill up with configure and make output. Added logging to the build process.
diffs (741 lines):
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/build.sh
--- a/Dependencies/build.sh Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/build.sh Thu Sep 03 16:59:46 2009 -0400
@@ -94,7 +94,7 @@
BASE_CFLAGS="-I$ROOTDIR/build/include -L$ROOTDIR/build/lib"
BASE_LDFLAGS="-Wl,-headerpad_max_install_names \
-I$ROOTDIR/build/include -L$ROOTDIR/build/lib"
- warning "Building with LLVM! This is unsupported and will probably break things!"
+ warning "Building with LLVM! This is unsupported and will probably break things!"
;;
--libpurple-rev=*)
MTN_REV=${option##*=}
@@ -126,6 +126,12 @@
;;
esac
done
+
+# this file contans the stdio and stderr of the most recent build
+LOG_FILE="${ROOTDIR}/build.log"
+
+: > ${LOG_FILE}
+
# set -arch flags now, after the user has had a chance to diasble one or more
set_arch_flags
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/patches/glib-Makefile.in.diff
--- a/Dependencies/patches/glib-Makefile.in.diff Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/patches/glib-Makefile.in.diff Thu Sep 03 16:59:46 2009 -0400
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2009-08-30 04:31:36.000000000 -0400
-+++ Makefile.in 2009-08-30 04:33:02.000000000 -0400
-@@ -346,7 +346,7 @@
+--- Makefile.in.orig 2009-08-28 19:17:39.000000000 -0400
++++ Makefile.in 2009-09-04 12:57:26.000000000 -0400
+@@ -388,7 +388,7 @@
gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
TEST_PROGS =
AUTOMAKE_OPTIONS = 1.7
@@ -9,7 +9,7 @@
DIST_SUBDIRS = $(SUBDIRS) build
bin_SCRIPTS = glib-gettextize
AM_CPPFLAGS = \
-@@ -1016,7 +1016,7 @@
+@@ -1141,7 +1141,7 @@
@if test -f glibconfig.h; then :; \
else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
stamp-gc-h: config.status
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/phases/build_dependencies.sh
--- a/Dependencies/phases/build_dependencies.sh Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/phases/build_dependencies.sh Thu Sep 03 16:59:46 2009 -0400
@@ -8,18 +8,18 @@
#
build_pkgconfig() {
prereq "pkg-config" \
- "http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz"
+ "http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz"
quiet pushd "$ROOTDIR/source/pkg-config"
if needsconfigure $@; then
status "Configuring pkg-config"
- ./configure --prefix="$ROOTDIR/build"
+ log ./configure --prefix="$ROOTDIR/build"
fi
status "Building and installing pkg-config"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -38,17 +38,19 @@
if needsconfigure $@; then
status "Configuring gettext"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-java \
- --disable-static \
- --enable-shared \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ log ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-java \
+ --disable-static \
+ --enable-shared \
+ --disable-dependency-tracking
fi
status "Building and installing gettext"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
# Undo all of our patches... goodbye!
revpatch "$ROOTDIR/patches/gettext-Makefile.in.diff" -p0
@@ -59,9 +61,10 @@
##
# glib
#
+GLIB_VERSION=2.0
build_glib() {
prereq "glib" \
- "ftp://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-2.20.2.tar.gz"
+ "ftp://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-2.20.5.tar.gz"
quiet pushd "$ROOTDIR/source/glib"
@@ -93,8 +96,8 @@
fi
status "Building and installing glib"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
# Revert the patches
revpatch "$ROOTDIR/patches/glib-Makefile.in.diff" -p0
@@ -106,6 +109,7 @@
##
# Meanwhile
#
+MEANWHILE_VERSION=1
build_meanwhile() {
prereq "meanwhile" \
"http://downloads.sourceforge.net/project/meanwhile/meanwhile/1.0.2/meanwhile-1.0.2.tar.gz"
@@ -134,22 +138,25 @@
rm -f libtool
status "Configuring Meanwhile"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- GLIB_LIBS="$ROOTDIR/build/lib" \
- GLIB_CFLAGS="-I$ROOTDIR/build/include/glib-2.0 \
- -I$ROOTDIR/build/lib/glib-2.0/include" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-static \
- --enable-shared \
- --disable-doxygen \
- --disable-mailme \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ export GLIB_LIBS="$ROOTDIR/build/lib"
+ export GLIB_CFLAGS="-I$ROOTDIR/build/include/glib-2.0 \
+ -I$ROOTDIR/build/lib/glib-2.0/include"
+ log ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-static \
+ --enable-shared \
+ --disable-doxygen \
+ -disable-mailme \
+ --disable-dependency-tracking
fi
status "Building and installing Meanwhile"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" make -j $NUMBER_OF_CORES
- make install
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ log make -j $NUMBER_OF_CORES
+ log make install
# Undo all the patches
revpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0
@@ -183,8 +190,8 @@
fi
status "Building and installing Gadu-Gadu"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -192,6 +199,7 @@
##
# intltool
#
+INTL_VERSION=8
build_intltool() {
# We used to use 0.36.2, but I switched to the latest MacPorts is using
prereq "intltool" \
@@ -201,12 +209,12 @@
if needsconfigure $@; then
status "Configuring intltool"
- ./configure --prefix="$ROOTDIR/build" --disable-dependency-tracking
+ log ./configure --prefix="$ROOTDIR/build" --disable-dependency-tracking
fi
status "Building and installing intltool"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -214,6 +222,7 @@
##
# json-glib
#
+JSON_GLIB_VERSION=1.0
build_jsonglib() {
prereq "json-glib" \
"http://folks.o-hand.com/~ebassi/sources/json-glib-0.6.2.tar.gz"
@@ -222,21 +231,22 @@
if needsconfigure $@; then
status "Configuring json-glib"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- GLIB_LIBS="$ROOTDIR/build/lib" \
- GLIB_CFLAGS="-I$ROOTDIR/build/include/glib-2.0 \
- -I$ROOTDIR/build/lib/glib-2.0/include" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ export GLIB_LIBS="$ROOTDIR/build/lib"
+ export GLIB_CFLAGS="-I$ROOTDIR/build/include/glib-2.0 \
+ -I$ROOTDIR/build/lib/glib-2.0/include"
+ log ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-dependency-tracking
fi
status "Building and installing json-glib"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
# C'mon, why do you make me do this?
- ln -fs "$ROOTDIR/build/include/json-glib-1.0/json-glib" \
+ log ln -fs "$ROOTDIR/build/include/json-glib-1.0/json-glib" \
"$ROOTDIR/build/include/json-glib"
quiet popd
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/phases/build_purple.sh
--- a/Dependencies/phases/build_purple.sh Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/phases/build_purple.sh Thu Sep 03 16:59:46 2009 -0400
@@ -1,6 +1,23 @@
#!/bin/bash -eu
##
+# sniff_libpurple_version
+#
+# We pull libpurple from monotone, so we may not know the version number
+# ahead of time
+#
+sniff_libpurple_version() {
+ LIBPURPLE_VERSION=''
+ while read LINE ; do
+ local version=`expr "'${LINE}'" : '.* PURPLE_.*_VERSION (\([0-9]*\)).*'`
+ if [[ '' != ${version} ]] ; then
+ LIBPURPLE_VERSION="${LIBPURPLE_VERSION}.${version}"
+ fi
+ done < "${ROOTDIR}/source/im.pidgin.adium/libpurple/version.h"
+ LIBPURPLE_VERSION="0.${LIBPURPLE_VERSION:3}"
+}
+
+##
# fetch_libpurple
#
fetch_libpurple() {
@@ -11,7 +28,7 @@
status "Pulling latest changes to libpurple"
cd "im.pidgin.adium"
$MTN pull
- $MTN update "${MTN_UPDATE_PARAM}"
+ $MTN update ${MTN_UPDATE_PARAM}
else
@@ -49,7 +66,7 @@
# Copy the headers from Cyrus-SASL
status "Copying headers from Cyrus-SASL"
quiet mkdir -p "$ROOTDIR/build/include/sasl"
- cp -f "$ROOTDIR/source/cyrus-sasl/include/"*.h "$ROOTDIR/build/include/sasl"
+ log cp -f "$ROOTDIR/source/cyrus-sasl/include/"*.h "$ROOTDIR/build/include/sasl"
quiet pushd "$ROOTDIR/source/im.pidgin.adium"
@@ -106,11 +123,11 @@
fi
status "Building and installing libpurple"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
status "Copying internal libpurple headers"
- cp -f "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/oscar.h" \
+ 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" \
@@ -131,4 +148,5 @@
"$ROOTDIR/build/include/libpurple"
quiet popd
-}
+ sniff_libpurple_version
+}
\ No newline at end of file
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/phases/build_vv_dependencies.sh
--- a/Dependencies/phases/build_vv_dependencies.sh Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/phases/build_vv_dependencies.sh Thu Sep 03 16:59:46 2009 -0400
@@ -3,6 +3,7 @@
##
# xml2
#
+XML_VERSION=2.2
build_libxml2() {
prereq "xml2" \
"ftp://xmlsoft.org:21//libxml2/libxml2-sources-2.7.3.tar.gz"
@@ -11,16 +12,17 @@
if needsconfigure $@; then
status "Configuring xml2"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --with-python=no \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ log ./configure \
+ --prefix="$ROOTDIR/build" \
+ --with-python=no \
+ --disable-dependency-tracking
fi
status "Building and installing xml2"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -69,8 +71,8 @@
fi
status "Building and installing gst-plugins-base"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -100,8 +102,8 @@
fi
status "Building and installing gst-plugins-good"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -130,8 +132,8 @@
fi
status "Building and installing gst-plugins-bad"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -148,15 +150,15 @@
if needsconfigure $@; then
status "Configuring gst-plugins-farsight"
export NM="nm -arch all"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ log ./configure --prefix="$ROOTDIR/build" \
+ --disable-dependency-tracking
fi
status "Building and installing gst-plugins-farsight"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -175,6 +177,7 @@
##
# gstreamer
#
+GSTREAMER_VERSION=0.10
build_gstreamer() {
build_libxml2 $@
@@ -195,8 +198,8 @@
status "Building and installing gstreamer"
warning "Building too much! Patch the Makefile"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
@@ -215,15 +218,16 @@
if needsconfigure $@; then
status "Configuring NICE"
export NM="nm -arch all"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ log ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-dependency-tracking
fi
status "Building and installing NICE"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
@@ -235,23 +239,24 @@
build_nice $@
prereq "farsight" \
- "http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.14.tar.gz"
+ "http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.15.tar.gz"
quiet pushd "$ROOTDIR/source/farsight"
if needsconfigure $@; then
status "Configuring farsight"
export NM="nm -arch all"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-python \
- --disable-dependency-tracking
+ export CFLAGS="$ARCH_CFLAGS"
+ export LDFLAGS="$ARCH_LDFLAGS"
+ log ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-python \
+ --disable-dependency-tracking
fi
status "Building and installing farsight"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet popd
}
\ No newline at end of file
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/phases/make_frameworks.sh
--- a/Dependencies/phases/make_frameworks.sh Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/phases/make_frameworks.sh Thu Sep 03 16:59:46 2009 -0400
@@ -4,42 +4,34 @@
# prep_headers
#
prep_headers() {
- GLIB_VERSION=2.0
- GSTREAMER_VERSION=0.10
- INTL_VERSION=8
- JSON_GLIB_VERSION=1.0
- MEANWHILE_VERSION=1
- XML_VERSION=2.2
- LIBPURPLE_VERSION=0.6.2
-
## purple prereqs
quiet mkdir "${ROOTDIR}/build/lib/include" || true
#libintl
status "Staging libintl headers"
local libintlDir="${ROOTDIR}/build/lib/include/libintl-${INTL_VERSION}"
quiet mkdir "${libintlDir}" || true
- cp "${ROOTDIR}/build/include/libintl.h" "${libintlDir}/"
+ log cp "${ROOTDIR}/build/include/libintl.h" "${libintlDir}/"
#glib
status "Staging glib headers"
local glibDir="${ROOTDIR}/build/lib/include/libglib-${GLIB_VERSION}.0"
quiet mkdir "${glibDir}" || true
- cp -R "${ROOTDIR}/build/include/glib-${GLIB_VERSION}" "${glibDir}"
- cp "${ROOTDIR}/build/lib/glib-${GLIB_VERSION}/include/glibconfig.h" \
+ log cp -R "${ROOTDIR}/build/include/glib-${GLIB_VERSION}" "${glibDir}"
+ log cp "${ROOTDIR}/build/lib/glib-${GLIB_VERSION}/include/glibconfig.h" \
"${glibDir}"
#gmodule
status "Staging gmodule headers"
local gmoduleDir="${ROOTDIR}/build/lib/include/libgmodule-${GLIB_VERSION}.0"
quiet mkdir "${gmoduleDir}" || true
- cp "${ROOTDIR}/build/include/glib-${GLIB_VERSION}/gmodule.h" "${gmoduleDir}"
+ log cp "${ROOTDIR}/build/include/glib-${GLIB_VERSION}/gmodule.h" "${gmoduleDir}"
#gobject
status "Staging gobject headers"
local gobjectDir="${ROOTDIR}/build/lib/include/libgobject-${GLIB_VERSION}.0"
quiet mkdir "${gobjectDir}" || true
- cp "${ROOTDIR}/build/include/glib-${GLIB_VERSION}/glib-object.h" "${gobjectDir}"
- cp -R "${ROOTDIR}/build/include/glib-${GLIB_VERSION}/gobject/" "${gobjectDir}"
+ log cp "${ROOTDIR}/build/include/glib-${GLIB_VERSION}/glib-object.h" "${gobjectDir}"
+ log cp -R "${ROOTDIR}/build/include/glib-${GLIB_VERSION}/gobject/" "${gobjectDir}"
#gthread
status "Staging gthread non-headers"
@@ -57,7 +49,7 @@
status "Staging json-glib headers"
local jsonDir="${ROOTDIR}/build/lib/include/libjson-glib-${JSON_GLIB_VERSION}.0"
quiet mkdir "${jsonDir}" || true
- cp -R "${ROOTDIR}/build/include/json-glib-${JSON_GLIB_VERSION}/json-glib" "${jsonDir}"
+ log cp -R "${ROOTDIR}/build/include/json-glib-${JSON_GLIB_VERSION}/json-glib" "${jsonDir}"
## VV stuff
@@ -65,7 +57,7 @@
status "Staging gstreamer and plugins headers"
local gstDir="${ROOTDIR}/build/lib/include/libgstreamer-${GSTREAMER_VERSION}.0"
quiet mkdir "${gstDir}" || true
- cp -R "${ROOTDIR}/build/include/gstreamer-${GSTREAMER_VERSION}" "${gstDir}"
+ log cp -R "${ROOTDIR}/build/include/gstreamer-${GSTREAMER_VERSION}" "${gstDir}"
local non_includes=( "libgstbase-${GSTREAMER_VERSION}.0" \
"libgstfarsight-${GSTREAMER_VERSION}.0" \
@@ -79,14 +71,14 @@
status "Staging libxml headers"
local xml2Dir="${ROOTDIR}/build/lib/include/libxml-${XML_VERSION}"
quiet mkdir "${xml2Dir}" || true
- cp -R "${ROOTDIR}/build/include/libxml2" "${xml2Dir}"
+ log cp -R "${ROOTDIR}/build/include/libxml2" "${xml2Dir}"
#libpurple
status "Staging libpurple headers"
local purpleDir="${ROOTDIR}/build/lib/include/libpurple-${LIBPURPLE_VERSION}"
quiet rm -rf "${purpleDir}"
- cp -R "${ROOTDIR}/build/include/libpurple" "${purpleDir}"
- cp "${ROOTDIR}/build/include/libgadu.h" "${purpleDir}/"
+ log cp -R "${ROOTDIR}/build/include/libpurple" "${purpleDir}"
+ log cp "${ROOTDIR}/build/include/libgadu.h" "${purpleDir}/"
status "Completed staging headers"
}
@@ -108,21 +100,21 @@
if [ -h ${file} ] ; then
local resolvedLink=`/usr/bin/readlink -n ${file}`
status "... ${file} -> ${ROOTDIR}/build/lib/${resolvedLink}"
- rm "${file}"
- cp "${ROOTDIR}/build/lib/${resolvedLink}" "${file}"
+ log rm "${file}"
+ log cp "${ROOTDIR}/build/lib/${resolvedLink}" "${file}"
fi
done
status "Making a framework for libpurple-${LIBPURPLE_VERSION} and all dependencies..."
- python "${ROOTDIR}/framework_maker/frameworkize.py" \
+ log python "${ROOTDIR}/framework_maker/frameworkize.py" \
"${ROOTDIR}/build/lib/libpurple.${LIBPURPLE_VERSION}.dylib" \
"${FRAMEWORK_DIR}"
status "Adding the Adium framework header..."
- cp "${ROOTDIR}/libpurple-full.h" \
+ log cp "${ROOTDIR}/libpurple-full.h" \
"${FRAMEWORK_DIR}/libpurple.subproj/libpurple.framework/Headers/libpurple.h"
- cp "${ROOTDIR}/Libpurple-Info.plist" \
+ log cp "${ROOTDIR}/Libpurple-Info.plist" \
"${FRAMEWORK_DIR}/libpurple.subproj/libpurple.framework/Resources/Info.plist"
status "Done!"
@@ -136,19 +128,19 @@
status "Building libpurple po files"
quiet pushd "${ROOTDIR}/source/im.pidgin.adium/po"
- make all
- make install
+ log make all
+ log make install
quiet popd
status "Copy po files to frameowrk"
quiet pushd "${ROOTDIR}/build/share/locale"
quiet mkdir "${PURPLE_RSRC_DIR}" || true
- cp -v -r * "${PURPLE_RSRC_DIR}"
+ log cp -v -r * "${PURPLE_RSRC_DIR}"
quiet popd
status "Trimming the fat..."
quiet pushd "${PURPLE_RSRC_DIR}"
- find . \( -name gettext-runtime.mo -or -name gettext-tools.mo -or -name glib20.mo \) -type f -delete
+ log find . \( -name gettext-runtime.mo -or -name gettext-tools.mo -or -name glib20.mo \) -type f -delete
quiet popd
status "libpurple po files built!"
diff -r 1c28a6a970ce -r e18ba043e821 Dependencies/phases/utility.sh
--- a/Dependencies/phases/utility.sh Thu Sep 03 16:58:29 2009 -0400
+++ b/Dependencies/phases/utility.sh Thu Sep 03 16:59:46 2009 -0400
@@ -22,6 +22,22 @@
}
##
+# log <command>
+#
+# Logs the given commands output to $LOG_FILE
+#
+log() {
+ local localPWD=`pwd`
+ echo "
+
+Running command:
+ ${localPWD}/${@:1}
+" >> ${LOG_FILE}
+
+ "${@:1}" >> ${LOG_FILE} 2>&1
+}
+
+##
# asserttools <tool> ...
#
# Checks to make sure the listed tools are installed, and errors if one is not
@@ -202,11 +218,11 @@
export CFLAGS="${1}"
export LDFLAGS="${2}"
- ${3} --prefix="$ROOTDIR/build"
+ log ${3} --prefix="$ROOTDIR/build"
status "...making and installing for native host"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
# we're done now, exit early
return
@@ -217,12 +233,12 @@
export CFLAGS="${1}"
export LDFLAGS="${2}"
- ${3} --host="${HOSTS[0]}" --build="${HOSTS[0]}" \
+ log ${3} --host="${HOSTS[0]}" --build="${HOSTS[0]}" \
--prefix="$ROOTDIR/build"
status "...making and installing for ${ARCH[0]} Only"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
# we're done now, exit early
return
@@ -234,13 +250,13 @@
quiet mkdir "${ROOTDIR}/sandbox/root-${ARCHS[i]}"
export CFLAGS="${1} -arch ${ARCHS[i]}"
export LDFLAGS="${2} -arch ${ARCHS[i]}"
-
- ${3} --host="${HOSTS[i]}" --build="${HOSTS[i]}" \
+ local arch=`arch`
+ log ${3} --host="${HOSTS[i]}" --build="${HOSTS[i]}" \
--prefix="${ROOTDIR}/sandbox/root-${ARCHS[i]}"
status "...making and installing for ${HOSTS[i]}"
- make -j $NUMBER_OF_CORES
- make install
+ log make -j $NUMBER_OF_CORES
+ log make install
quiet make clean
done
@@ -263,7 +279,7 @@
#copy headers
local files="${ROOTDIR}/sandbox/root-${ARCHS[0]}/include/*"
for f in ${files} ; do
- cp -R ${f} "${ROOTDIR}/build/include"
+ log cp -R ${f} "${ROOTDIR}/build/include"
done
#copy pkgconfig files and modify prefix
@@ -290,7 +306,7 @@
local files="${ROOTDIR}/sandbox/root-${ARCHS[0]}/lib/*"
for f in ${files} ; do
if [ -h ${f} ] ; then
- cp -a ${f} "${ROOTDIR}/build/lib"
+ log cp -a ${f} "${ROOTDIR}/build/lib"
fi
done
quiet rm -rf "${ROOTDIR}/sandbox"
@@ -309,7 +325,7 @@
export CFLAGS="${1}"
export LDFLAGS="${2}"
- ${3}
+ log ${3}
# we're done here
return
@@ -319,7 +335,7 @@
export CFLAGS="${1} -arch ${ARCHS[i]}"
export LDFLAGS="${2} -arch ${ARCHS[i]}"
CONFIG_CMD="${3} --host=${HOSTS[i]}"
- ${CONFIG_CMD}
+ log ${CONFIG_CMD}
#only do this for more than 1 arch
if [[ 1 < ${#ARCHS[@]} ]] ; then
@@ -340,7 +356,7 @@
export CFLAGS="${1} ${ARCH_FLAGS}"
export LDFLAGS="${2} ${ARCH_FLAGS}"
local self_host=`gcc -dumpmachine`
- ${3}
+ log ${3}
# mux headers
for FILE in ${@:4} ; do
More information about the commits
mailing list