diff options
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/jsbuilder/build.php | 14 | ||||
| -rw-r--r-- | buildscripts/phing/tasks/BuildPradoPEARPackageTask.php | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/buildscripts/jsbuilder/build.php b/buildscripts/jsbuilder/build.php index 7070f67f..80e6b3ee 100644 --- a/buildscripts/jsbuilder/build.php +++ b/buildscripts/jsbuilder/build.php @@ -40,13 +40,13 @@ define('DOC_OUTPUT_DIR', realpath(dirname(__FILE__).'/../../docs/Javascript')); */
define('BUILD_DOC', sprintf('perl "%s" --no-sources -d "%s" ', JS_DOC, DOC_OUTPUT_DIR).'%s');
+include_once(dirname(__FILE__).'/jsmin.php');
+
if(SOURCE_DIR===false || TARGET_DIR===false)
die('Unable to determine the build path.');
if(!is_writable(TARGET_DIR))
die('Unable to create files under '.TARGET_DIR.'.');
-include(dirname(__FILE__).'/jsmin.php');
-
/**
* list of js library files to be compressed and built
*/
@@ -82,7 +82,7 @@ $libraries = array( // 'extra/behaviour.js',
'extended/date.js',
-
+
//prado core
'prado/prado.js',
'prado/form.js',
@@ -159,9 +159,9 @@ foreach($libraries as $libFile => $sourceFiles) $sourceFile=SOURCE_DIR.'/'.$sourceFile;
if(!is_file($sourceFile))
echo "Source file not found: $sourceFile\n";
-
+
echo "...adding $sourceFile\n";
- $contents.=file_get_contents($sourceFile)."\n\n";
+ $contents.=file_get_contents($sourceFile)."\n\n";
}
$tempFile=$libFile.'.tmp';
file_put_contents($tempFile,$contents);
@@ -169,7 +169,7 @@ foreach($libraries as $libFile => $sourceFiles) $jsMin -> minify();
unset($jsMin);
@unlink($tempFile);
- echo "Saving file {$libFile}\n";
+ echo "Saving file {$libFile}\n";
$builds++;
}
if(isset($argv[1]) && preg_match('/doc*/', $argv[1]))
@@ -183,7 +183,7 @@ if(isset($argv[1]) && preg_match('/doc*/', $argv[1])) $command = sprintf(BUILD_DOC, $files);
system($command);
}
-else if($builds > 0)
+else if($builds > 0)
echo "\nJavascript build complete, {$builds} file(s) compressed.";
else
echo "No files to build.";
diff --git a/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php b/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php index 212c6f9c..0e764146 100644 --- a/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php +++ b/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php @@ -44,13 +44,14 @@ class BuildPradoPEARPackageTask extends MatchingTask { * @param PEAR_PackageFileManager2 $pkg */ private function setOptions($pkg) { - $options['baseinstalldir'] = 'prado'; + $options['baseinstalldir'] = 'prado3'; $options['packagedirectory'] = $this->dir->getAbsolutePath(); if(empty($this->filesets)) { throw new BuildException("You must use a <fileset> tag to specify the files to include in the package.xml"); } + // Use PEAR_PackageFileManager_Fileset from phing as file list generator $options['filelistgenerator'] = 'Fileset'; // Some Phing-specific options needed by our Fileset reader @@ -67,6 +68,7 @@ class BuildPradoPEARPackageTask extends MatchingTask { } else { $this->log("Creating [default] package.xml file in base directory.", PROJECT_MSG_INFO); } + $options['dir_roles'] = array('framework' => 'php'); $pkg->setOptions($options); } @@ -88,7 +90,7 @@ class BuildPradoPEARPackageTask extends MatchingTask { $this->setOptions($package); // the hard-coded stuff - $package->setPackage('prado'); + $package->setPackage('prado3'); $package->setSummary('PRADO is a component-based and event-driven framework for rapid Web programming in PHP 5.'); $package->setDescription('PRADO reconceptualizes Web application development in terms of components, events and properties instead of procedures, URLs and query parameters. @@ -117,7 +119,9 @@ o Team Integration - PRADO enables separation of content and presentation. Compo $package->setLicense('BSD', 'http://www.opensource.org/licenses/bsd-license.php'); // Add package maintainers - $package->addMaintainer('lead', 'xue', 'Qiang Xue', 'qiang.xue@gmail.com'); + $package->addMaintainer('lead', 'qxue', 'Qiang Xue', 'qiang.xue@gmail.com'); + $package->addMaintainer('lead', 'jrags', 'Jason Ragsdale', 'jrags@jasrags.net'); + $package->addMaintainer('lead', 'knut', 'Knut Urdalen', 'knut.urdalen@gmail.com'); // "core" dependencies $package->setPhpDep('5.0.0'); |