org.guifications.plugins.buildsystem_rewrite: ed231df4462445a7baa33c8c8980bc938696b292

[grim at guifications.org]

-----------------------------------------------------------------
Revision: ed231df4462445a7baa33c8c8980bc938696b292
Ancestor: ceb62b22b2473f7c993e813dea646501661e6c19
Author: grim at guifications.org
Date: 2008-05-01T02:47:54
Branch: org.guifications.plugins.buildsystem_rewrite

Modified files:
        configure.ac plugin_pack.py

ChangeLog: 

I'm happy with the output...

I'll say that *AGAIN*...

I am _HAPPY_ with the output!

Still in disbelief?

I *AM* _HAPPY_ with the *OUTPUT* of the _NEW_ *BUILDSYSTEM*!


-----------------------------------------------------------------
This revision's diffstat output:
 configure.ac   |   25 +++++++------------------
 plugin_pack.py |   34 ++++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 30 deletions(-)
-------------- next part --------------
============================================================
--- configure.ac	7c0fb927181b8265c11b273a2883548480cf60df
+++ configure.ac	66586d77d975fe3b392c94ec97066a0a7004eaa7
@@ -366,12 +366,8 @@ if test x"$HAVE_PURPLE" = x"yes" ; then
 if test x"$HAVE_PURPLE" = x"yes" ; then
 	echo Installing purple plugins to.....: `eval eval echo $PURPLE_LIBDIR`
 	echo Installing purple plugin data to.: `eval eval echo $PURPLE_DATADIR`
-	if test x"$PP_PURPLE_BUILD" = x"" ; then
-		echo Purple plugins to be built.......: none
-	else
-		echo Purple plugins to be built.......:
-		echo $PP_PURPLE_BUILD
-	fi
+	echo Purple plugins to be built.......:
+	eval $PP_PURPLE_BUILD
 fi
 echo;
 
@@ -379,12 +375,8 @@ if test x"$HAVE_PIDGIN" = x"yes" ; then
 if test x"$HAVE_PIDGIN" = x"yes" ; then
 	echo Installing pidgin plugins to.....: `eval eval echo $PIDGIN_LIBDIR`
 	echo Installing pidgin plugin data to.: `eval eval echo $PIDGIN_DATADIR`
-	if test x"$PP_PIDGIN_BUILD" = x"" ; then
-		echo Pidgin plugins to be built.......: none
-	else
-		echo Pidgin plugins to be built.......:
-		echo $PP_PIDGIN_BUILD
-	fi
+	echo Pidgin plugins to be built.......:
+	eval $PP_PIDGIN_BUILD
 fi
 echo;
 
@@ -392,12 +384,9 @@ if test x"$HAVE_FINCH" = x"yes" ; then
 if test x"$HAVE_FINCH" = x"yes" ; then
 	echo Installing finch plugins to......: `eval eval echo $FINCH_LIBDIR`
 	echo Installing finch plugin data to..: `eval eval echo $FINCH_DATADIR`
-	if test x"$PP_FINCH_BUILD" = x"" ; then
-		echo Finch plugins to be built........: none - THIS IS NORMAL
-	else
-		echo Finch plugins to be built........:
-		echo $PP_FINCH_BUILD
-	fi
+	echo Finch plugins to be built........: none - THIS IS NORMAL
+	# uncomment this when we have finch plugins
+	# eval $PP_FINCH_BUILD
 fi
 echo;
 
============================================================
--- plugin_pack.py	0314e915d44bc6d66ad737f9be434f21a915c67e
+++ plugin_pack.py	627888226f559b45a9ca79514ab3779fa606e344
@@ -203,9 +203,9 @@ class PluginPack:
 	def build_dirs(self, args):
 		"""Displays a list of the plugins that can be built"""
 		if len(args) != 2:
-			print >> sys.stderr, 'build_dirs expects 2 arguments:'
-			print >> sys.stderr, '\ta comma separated list of dependencies'
-			print >> sys.stderr, '\ta comma separated list of plugins to build'
+			printerr('build_dirs expects 2 arguments:')
+			printerr('\ta comma separated list of dependencies')
+			printerr('\ta comma separated list of plugins to build')
 			sys.exit(1)
 
 		# store the external depedencies
@@ -313,9 +313,9 @@ class PluginPack:
 		print 'PP_BUILD_DIRS=`echo $PP_BUILD | sed \'s/,/\ /g\'`'
 		print 'AC_SUBST(PP_BUILD_DIRS)'
 		print
-		print 'PP_PURPLE_BUILD=`$PYTHON $srcdir/plugin_pack.py -p show_names $PP_BUILD`'
-		print 'PP_PIDGIN_BUILD=`$PYTHON $srcdir/plugin_pack.py -P show_names $PP_BUILD`'
-		print 'PP_FINCH_BUILD=`$PYTHON $srcdir/plugin_pack.py -f show_names $PP_BUILD`'
+		print 'PP_PURPLE_BUILD="$PYTHON $srcdir/plugin_pack.py -p show_names $PP_BUILD"'
+		print 'PP_PIDGIN_BUILD="$PYTHON $srcdir/plugin_pack.py -P show_names $PP_BUILD"'
+		print 'PP_FINCH_BUILD="$PYTHON $srcdir/plugin_pack.py -f show_names $PP_BUILD"'
 	commands['config_file'] = config_file
 
 	def dependency_graph(self, args):
@@ -380,15 +380,26 @@ class PluginPack:
 	def show_names(self, args):
 		"""Displays the names of the given comma separated list of provides"""
 
-		names = []
+		provides = args[0].split(',')
+		if len(provides) == 0:
+			print "none"
 
-		provides = args[0].split(',')
+		line = " "
+
 		for provide in provides:
-			if provide in self.plugins:
-				names.append(self.plugins[provide].name)
+			if not provide in self.plugins:
+				continue
 
-		print string.join(names, ', ')
+			name = self.plugins[provide].name
 
+			if len(line) + len(name) + 2 > 75:
+				print line.rstrip(',')
+				line = ' '
+			
+			line += ' %s,' % name 
+
+		if len(line) > 1:
+			print line.rstrip(',')
 	commands['show_names'] = show_names
 
 	def info(self, args):
@@ -489,6 +500,5 @@ def main():
 	except KeyError:
 		printerr('\'%s\' command not found' % (cmd))
 
-
 if __name__ == '__main__':
 	main()