Changeset 3053

Timestamp:

10/19/08 06:54:43 (3 months ago)

Author:

impl

Message:

Fix #875: Clean up the Phing components of the project configuration system

Location:

branches/1.0

Files:

• CHANGELOG (modified) (1 diff)
• src/build/agavi/phing/AgaviBuildLogger.php (modified) (2 diffs)
• src/build/agavi/script/agavi.php (modified) (6 diffs)

branches/1.0/CHANGELOG

@@ -2 +2 @@
 ===============
 
-1.0.0 beta 4 (October 17, 2008)
+1.0.0 beta 4 (October 19, 2008)
 -------------------------------
 
+CHG: Clean up the Phing components of the project configuration system (#875) (Noah)
 CHG: Change Form Population Filter to use validation system's ability to more accurately handle different sources of input (#786) (David)
 CHG: Validation system needs to be able to tell two fields of same names, but from different sources, apart (#785) (Dominik)

branches/1.0/src/build/agavi/phing/AgaviBuildLogger.php

@@ -14 +14 @@
 // +---------------------------------------------------------------------------+
 
-require_once('phing/listener/DefaultLogger.php');
+require_once('phing/listener/AnsiColorLogger.php');
 
 /**
@@ -30 +30 @@
  * @version    $Id$
  */
-class AgaviBuildLogger extends DefaultLogger
+class AgaviBuildLogger extends AnsiColorLogger
 {
   public function buildStarted(BuildEvent $event)

branches/1.0/src/build/agavi/script/agavi.php

@@ -41 +41 @@
 $GLOBALS['PROPERTIES'] = array();
 $GLOBALS['SHOW_LIST'] = false;
+$GLOBALS['VERBOSE'] = false;
 $GLOBALS['LOGGER'] = 'AgaviProxyBuildLogger';
 $GLOBALS['BUILD'] = new PhingFile(BUILD_DIRECTORY . '/build.xml');
@@ -52 +53 @@
   $GLOBALS['OUTPUT']->write('  -v --version                     Displays relevant version information' . PHP_EOL);
   $GLOBALS['OUTPUT']->write('  -l --list --targets              Displays the list of available targets' . PHP_EOL);
-  $GLOBALS['OUTPUT']->write('  -D --define <property> <value>   Defines a build property' . PHP_EOL);
+  $GLOBALS['OUTPUT']->write('  -D --define <property> <value>   Defines a configuration property' . PHP_EOL);
+  $GLOBALS['OUTPUT']->write('  --verbose                        Provides more verbose configuration information' . PHP_EOL);
   $GLOBALS['OUTPUT']->write('  --agavi-source-directory <path>  Sets the Agavi source directory to <path>' . PHP_EOL);
   $GLOBALS['OUTPUT']->write('  --include-path <path>            Appends <path> to the PHP include path' . PHP_EOL);
-  $GLOBALS['OUTPUT']->write('  --logger <class>                 Sets the build logger class to <class>' . PHP_EOL);
+  $GLOBALS['OUTPUT']->write('  --logger <class>                 Sets the configuration logger class to <class>' . PHP_EOL);
 }
 
@@ -66 +68 @@
 function input_version(AgaviOptionParser $parser, $name, $arguments, $scriptArguments)
 {
-  $GLOBALS['OUTPUT']->write('Agavi build system, script version $Id$' . PHP_EOL);
+  $GLOBALS['OUTPUT']->write('Agavi project configuration system, script version $Id$' . PHP_EOL);
   $GLOBALS['OUTPUT']->write(Phing::getPhingVersion() . PHP_EOL);
   exit(0);
@@ -82 +84 @@
   
   $GLOBALS['PROPERTIES'][$name] = $value;
+}
+
+function input_verbose(AgaviOptionParser $parser, $name, $arguments, $scriptArguments)
+{
+  $GLOBALS['VERBOSE'] = true;
 }
 
@@ -113 +120 @@
 $parser->addOption('list', array('l'), array('list', 'targets'), 'input_list');
 $parser->addOption('define', array('D'), array('define'), 'input_define', 2);
+$parser->addOption('verbose', array(), array('verbose'), 'input_verbose');
 $parser->addOption('agavi_source_directory', array(), array('agavi-source-directory'), 'input_agavi_source_directory', 1);
 $parser->addOption('include_path', array(), array('include-path'), 'input_include_path', 1);
@@ -222 +230 @@
   }
   $logger = new $GLOBALS['LOGGER']();
-  $logger->setMessageOutputLevel(Project::MSG_INFO);
+  $logger->setMessageOutputLevel($GLOBALS['VERBOSE'] ? Project::MSG_VERBOSE : Project::MSG_INFO);
   $logger->setOutputStream($GLOBALS['OUTPUT']);
   $logger->setErrorStream($GLOBALS['ERROR']);