adium 3524:7574b4d0bd70: Consolidate stderr and stdout logging i...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/7574b4d0bd70
revision:	3524:7574b4d0bd70
author:		Stephen Holt <sholt at adium.im>
date:		Sun Nov 14 15:57:27 2010 -0800

Consolidate stderr and stdout logging into build.log, but stamp each with [ERROR] or [INFO] respectively.

Hopefully, this makes build logs easier to read, while nicely calling out errors in the build.
Subject: adium 3525:7bb367533f10: Don't create an error.log

details:	http://hg.adium.im/adium/rev/7bb367533f10
revision:	3525:7bb367533f10
author:		Stephen Holt <sholt at adium.im>
date:		Sun Nov 14 18:55:24 2010 -0800

Don't create an error.log
Subject: adium 3526:e01de4bd02f9: Add option to download initial bootstrap mtn database for libpurple.  Default is to not download bootstrap.

details:	http://hg.adium.im/adium/rev/e01de4bd02f9
revision:	3526:e01de4bd02f9
author:		Stephen Holt <sholt at adium.im>
date:		Sun Nov 14 19:10:14 2010 -0800

Add option to download initial bootstrap mtn database for libpurple.  Default is to not download bootstrap.
Subject: adium 3527:21cb54d03750: Donno why, but the freedesktop.org decided to move gst-plugins-farsight into an "obsolete" tree.

details:	http://hg.adium.im/adium/rev/21cb54d03750
revision:	3527:21cb54d03750
author:		Stephen Holt <sholt at adium.im>
date:		Sun Nov 14 19:53:16 2010 -0800

Donno why, but the freedesktop.org decided to move gst-plugins-farsight into an "obsolete" tree.

diffs (98 lines):

diff -r 16da0d46b737 -r 21cb54d03750 Dependencies/build.sh
--- a/Dependencies/build.sh	Sun Nov 14 10:17:32 2010 -0600
+++ b/Dependencies/build.sh	Sun Nov 14 19:53:16 2010 -0800
@@ -109,9 +109,12 @@
 			MTN_BRANCH=${option##*=}
 			MTN_UPDATE_PARAM="${MTN_UPDATE_PARAM} -b ${MTN_BRANCH}"
 			;;
-        --libpurple-only)
-            STRAIGHT_TO_LIBPURPLE=true
-            ;;
+		--libpurple-only)
+			STRAIGHT_TO_LIBPURPLE=true
+			;;
+		--download-libpurple)
+			DOWNLOAD_LIBPURPLE=true
+			;;
 		-h|-help|--help)
 			echo 'The following options are valid:
 
@@ -127,6 +130,7 @@
   --libpurple-branch=[branch] : Force a secific libpurple branch
   --libpurple-only            : Assume all dependencies are already built
                                 and start the build with libpurple itself
+  --download-libpurple        : Download the libpurple mtn bootstrap db.
   --help                      : This help text
 	
 Note that explicitly setting any arch flags implies a forced reconfigure.'
@@ -144,7 +148,6 @@
 ERR_FILE="${ROOTDIR}/error.log"
 
 : > ${LOG_FILE}
-: > ${ERR_FILE}
 
 # set -arch flags now, after the user has had a chance to disable one or more
 set_arch_flags
diff -r 16da0d46b737 -r 21cb54d03750 Dependencies/phases/build_purple.sh
--- a/Dependencies/phases/build_purple.sh	Sun Nov 14 10:17:32 2010 -0600
+++ b/Dependencies/phases/build_purple.sh	Sun Nov 14 19:53:16 2010 -0800
@@ -59,7 +59,10 @@
 # libpurple
 #
 build_libpurple() {
-	#fetch_libpurple
+	if $DOWNLOAD_LIBPURPLE; then
+	  fetch_libpurple
+	fi
+	
 	prereq "cyrus-sasl" \
 		"ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-2.1.18.tar.gz"
 	
diff -r 16da0d46b737 -r 21cb54d03750 Dependencies/phases/build_vv_dependencies.sh
--- a/Dependencies/phases/build_vv_dependencies.sh	Sun Nov 14 10:17:32 2010 -0600
+++ b/Dependencies/phases/build_vv_dependencies.sh	Sun Nov 14 19:53:16 2010 -0800
@@ -196,7 +196,7 @@
 GST_DEPS=( ${GST_DEPS[@]} "libgstrtp-${GSTREAMER_VERSION}.0.dylib" "libgstsdp-${GSTREAMER_VERSION}.0.dylib" "libgstrtsp-${GSTREAMER_VERSION}.0.dylib" )
 build_gst_plugins_farsight() {
 	prereq "gst-plugins-farsight" \
-		"http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz"
+		"http://farsight.freedesktop.org/releases/obsolete/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz"
 	
 	quiet pushd "$ROOTDIR/source/gst-plugins-farsight"
 	
diff -r 16da0d46b737 -r 21cb54d03750 Dependencies/phases/utility.sh
--- a/Dependencies/phases/utility.sh	Sun Nov 14 10:17:32 2010 -0600
+++ b/Dependencies/phases/utility.sh	Sun Nov 14 19:53:16 2010 -0800
@@ -26,6 +26,15 @@
 #
 # Logs the given commands output to $LOG_FILE
 #
+
+stampErr() {
+	while IFS='' read -r line; do echo "[ERROR]: $line" >> ${LOG_FILE}; done
+}
+
+stampLog() {
+	while IFS='' read -r line; do echo "[INFO]: $line" >> ${LOG_FILE}; done
+}
+
 log() {
 	local localPWD=`pwd`
 	echo "
@@ -34,15 +43,9 @@
 	${localPWD}/${@:1}
 " >> ${LOG_FILE}
 
-	echo "
-
-Running command:
-	${localPWD}/${@:1}
-" >> ${ERR_FILE}
-
 	(
 		${@:1}
-	) >> ${LOG_FILE} 2>> ${ERR_FILE}
+	) > >(stampLog) 2> >(stampErr)
 }
 
 ##