Commits

dwt committed 340f29f Merge
  • Participants
  • Parent commits fe7f07e, 036d162

Comments (0)

Files changed (3)

Dependencies/build.sh

 NATIVE_BUILD=false
 BUILD_OTR=false
 STRAIGHT_TO_LIBPURPLE=false
-DOWNLOAD_LIBPURPLE=false
 MTN_UPDATE_PARAM=""
-DISTCC_HOSTS=""
-for option in ${@:1} ; do
+for option in "${@:1}" ; do
 	case $option in
 		--configure)
 			FORCE_CONFIGURE=true
 			BUILD_OTR=true
 			status "Building libotr"
 			;;
-		--enable-distcchost=*)
-			asserttools "/Developer/usr/bin/distcc"
-			asserttools "/Developer/usr/bin/pump"
-			export DISTCC_HOSTS="${DISTCC_HOSTS:=} ${option##*=},lzo,cpp"
-			;;
 		--enable-llvm)
 			asserttools "/Developer/usr/bin/llvm-gcc"
 			export CC="/Developer/usr/bin/llvm-gcc"
 		--libpurple-only)
 			STRAIGHT_TO_LIBPURPLE=true
 			;;
-		--download-libpurple)
-			DOWNLOAD_LIBPURPLE=true
-			;;
 		-h|-help|--help)
 			echo 'The following options are valid:
 
                                 (currently breaks liboil on x86_64)
   --build-otr                 : Build libotr and dependancies instead
                                 of libpurple.
-  --enable-distcchost=[host]  : Add a host to the distcc conf. Enables distcc build.
-                                `man distcc` for more information.
   --enable-llvm               : Enable building with llvm-gcc.
                                 WARNING: This is currently broken!
   --libpurple-rev=[rev]       : Force a specific libpurple revision
   --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.'
 	esac
 done
 
-if [ "$DISTCC_HOSTS" != "" ]; then
-	export DISTCC_HOSTS="--randomize ${DISTCC_HOSTS} localhost/${NUMBER_OF_CORES}"
-	export DISTCC_COMPILER=$(${CC:=/Developer/usr/bin/gcc} --version|head -n1)
-	export CC="/Developer/usr/bin/distcc ${CC:=/Developer/usr/bin/gcc}"
-	export CXX="/Developer/usr/bin/distcc ${CXX:=/Developer/usr/bin/g++}"
-	NUMBER_OF_CORES=`/Developer/usr/bin/distcc -j`
-	eval `/Developer/usr/bin/pump --startup`
-fi
-
 # this file contans the stdio and stderr of the most recent build
 LOG_FILE="${ROOTDIR}/build.log"
 ERR_FILE="${ROOTDIR}/error.log"
 
-: > ${LOG_FILE}
+: > "${LOG_FILE}"
+: > "${ERR_FILE}"
 
 # set -arch flags now, after the user has had a chance to disable one or more
 set_arch_flags
     fi
 fi
 
-if [ "$DISTCC_HOSTS" != "" ]; then
-	/Developer/usr/bin/pump --shutdown
-fi
-
 make_framework $@
 
 #ugly.  gotta be a better way

Dependencies/phases/utility.sh

 #
 # 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`
+	local localPWD="`pwd`"
 	echo "
 
 Running command:
 	${localPWD}/${@:1}
-" >> ${LOG_FILE}
+" >> "${LOG_FILE}"
+
+	echo "
+
+Running command:
+	${localPWD}/${@:1}
+" >> "${ERR_FILE}"
 
 	(
-		${@:1}
-	) > >(stampLog) 2> >(stampErr)
+		"${@:1}"
+	) >> "${LOG_FILE}" 2>> "${ERR_FILE}"
 }
 
 ##
 # found.
 asserttools() {
 	missing=false
-	for tool in ${@:1}; do
+	for tool in "${@:1}"; do
 		if ! which $tool &> /dev/null; then
 			error "Missing required tool $tool."
 			missing=true
 # Tries to execute a command silently, and catches the error if it fails.
 #
 quiet() {
-	${@:1} &> /dev/null || true
+	"${@:1}" &> /dev/null || true
 }
 
 ##
 		local files="${ROOTDIR}/sandbox/root-${ARCHS[0]}/lib/pkgconfig/*"
 		for f in ${files} ; do
 			status "patching pkgconfig file: ${f}"
-			local basename=`basename ${f}`
+			local basename=`basename "${f}"`
 			local SEDREP=`echo $ROOTDIR | awk '{gsub("\\\\\/", "\\\\\\/");print}'`
 			local SEDPAT="s/^prefix=.*/prefix=${SEDREP}\\/build/"
 			sed -e "${SEDPAT}" "${f}" > "${ROOTDIR}/build/lib/pkgconfig/${basename}"
 	local files="${ROOTDIR}/sandbox/root-${ARCHS[0]}/lib/*.la"
 	for f in ${files} ; do
 		status "patching .la file: ${f}"
-		local basename=`basename ${f}`
+		local basename=`basename "${f}"`
 		local SEDREP=`echo $ROOTDIR | awk '{gsub("\\\\\/", "\\\\\\/");print}'`
 		local SEDPAT="s/^libdir=.*/libdir=\'${SEDREP}\\/build\\/lib\'/"
 		sed -e "${SEDPAT}" "${f}" > "${ROOTDIR}/build/lib/${basename}"

Frameworks/Adium Framework/Source/AICorePluginLoader.m

 							confirmLoading:NO
 							   pluginArray:pluginArray];
 	}
-
-	//Load any external plugins the user has installed
-	for (NSString *path in [adium allResourcesForName:EXTERNAL_PLUGIN_FOLDER withExtensions:EXTENSION_ADIUM_PLUGIN]) {
-		[[self class] loadPluginAtPath:path confirmLoading:YES pluginArray:pluginArray];
+	
+	// This is usefull if external plugins aren't ready for the new version yet, while you still run another version
+	// of Adium in the background to collaborate while you test your changes
+	if ( ! [[NSUserDefaults standardUserDefaults] boolForKey:@"PreventLoadingExternalPlugins"]) {
+		//Load any external plugins the user has installed
+		for (NSString *path in [adium allResourcesForName:EXTERNAL_PLUGIN_FOLDER withExtensions:EXTENSION_ADIUM_PLUGIN]) {
+			[[self class] loadPluginAtPath:path confirmLoading:YES pluginArray:pluginArray];
+		}
 	}
 
 	for (NSString *path in deferredPluginPaths) {