Author: Derick Rethans Date: 2006-01-16 13:22:26 +0100 (Mon, 16 Jan 2006) New Revision: 1918
Log: - Added rc1 release file - Fixes packaging scripts to deal with changes in the components and the RC/rc idiocy. Added: releases/1.0rc1 Modified: scripts/generate_package_xml.php scripts/generate_super_package_xml.php scripts/package.php Added: releases/1.0rc1 =================================================================== --- releases/1.0rc1 2006-01-16 12:11:28 UTC (rev 1917) +++ releases/1.0rc1 2006-01-16 12:22:26 UTC (rev 1918) @@ -0,0 +1,31 @@ +NOTES + +Major changes: +- Exception usage has been redone, we no longer use error codes. +- Various updates to the components. + +Limitations: +- The UserInput component requires the filter extension to PHP, you should + install that yourself through pecl (http://pecl.php.net/package/filter), or + with the PEAR installer (pear install pecl/filter). +- The ImageAnalysis component requires the exif extension to PHP. + + +PACKAGES + +Archive: 1.0rc1 +Base: 1.0rc1 +Cache: 1.0rc1 +Configuration: 1.0rc1 +ConsoleTools: 1.0rc1 +Database: 1.0rc1 +Debug: 1.0rc1 +EventLog: 1.0rc1 +Execution: 1.0rc1 +ImageAnalysis: 1.0rc1 +ImageConversion: 1.0rc1 +Mail: 1.0rc1 +PersistentObject: 1.0rc1 +PhpGenerator: 1.0rc1 +Translation: 1.0rc1 +UserInput: 1.0rc1 Modified: scripts/generate_package_xml.php =================================================================== --- scripts/generate_package_xml.php 2006-01-16 12:11:28 UTC (rev 1917) +++ scripts/generate_package_xml.php 2006-01-16 12:22:26 UTC (rev 1918) @@ -133,7 +133,6 @@ public function run() { // General info output - $this->output->outputLine( $this->input->getSynopsis() ); $this->output->outputLine( "eZ Enterprise Components package manager.", 'info' ); $this->output->outputText( "Version: ", 'info' ); $this->output->outputLine( "0.1.0\n", 'version' ); @@ -141,14 +140,14 @@ switch ( true ) { - case count( $this->input->getOptionValues() ) === 0 || $this->input->getOption( 'h' )->value !== false: + case count( $this->input->getOptionValues() ) === 0 || $this->input->getOption( 'h' )->value === true: $this->showHelp(); break; default: - $version = $this->input->getOption( 'v' ); - if ( !preg_match( '/[0-9]+\.[0-9]+(\.|beta)[0-9]+/', $version->value ) ) + $version = $this->input->getOption( 'v' )->value; + if ( !preg_match( '/[0-9]+\.[0-9]+(\.|beta|rc)[0-9]+/', $version ) ) { - $this->raiseError( 'Invalid version number <'.$version->value.'>, must be in format <x.y[state[z]]>.'); + $this->raiseError( "Invalid version number <{$version}>, must be in format <x.y[state[z]]>." ); } $this->paths['package'] = realpath( $this->input->getOption( 'p' )->value ); $this->paths['install'] = DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . 'ezc' . DIRECTORY_SEPARATOR . $this->input->getOption( 'p' )->value; @@ -160,8 +159,8 @@ { $this->raiseError( "Could not create installation directory <".$this->paths['install'].">."); } - $this->createLinkMess( $version->value ); - $this->processPackage( $version->value ); + $this->createLinkMess( $version ); + $this->processPackage( $version ); break; } @@ -238,7 +237,7 @@ array( new ezcConsoleOptionRule( $p ) ) ) ); - $p->addDependency( new ezcConsoleOptionRule( $v ) ); + $p->addDependency( new ezcConsoleOptionRule( $b ) ); $this->input->registerOption( new ezcConsoleOption( @@ -280,7 +279,7 @@ { $this->input->process(); } - catch ( ezcConsoleInputException $e ) + catch ( ezcConsoleOptionException $e ) { $this->raiseError( $e ); } @@ -365,6 +364,7 @@ { $helpTopic = $this->input->getOption( 'h' )->value; + $this->output->outputLine( $this->input->getSynopsis() ); $this->output->outputLine( "Usage: $ generate_package_xml.php -p <PackageName> -v <PackageVersion> -s <PackageStatus>", 'help' ); $this->output->outputLine( "Must be run from within /your/svn/co/ezcomponents/packages .", 'help' ); @@ -452,7 +452,7 @@ // add license and CREDITS files $linkPaths[$installDir . DIRECTORY_SEPARATOR . 'docs' . DIRECTORY_SEPARATOR . 'LICENSE'] = $packageDir . '/../../../../LICENSE'; - $linkPaths[$installDir . DIRECTORY_SEPARATOR . 'docs' . DIRECTORY_SEPARATOR . 'CREDITS'] = $packageDir . '/../../../../CREDITS'; + $linkPaths[$installDir . DIRECTORY_SEPARATOR . 'docs' . DIRECTORY_SEPARATOR . 'CREDITS'] = $packageDir . '/CREDITS'; // create real dir structure foreach ( $realPaths as $path ) @@ -559,6 +559,8 @@ */ protected function generatePackageXml( $name, $path, $state, $version, $short, $long, $changelog, $baseVersion ) { + $version = str_replace( 'rc', 'RC', $version ); + $baseVersion = str_replace( 'rc', 'RC', $baseVersion ); $autoloadDir = $this->paths['install'] . DIRECTORY_SEPARATOR . 'ezc' . DIRECTORY_SEPARATOR . 'autoload'; if ( !is_dir( $path ) ) { @@ -627,7 +629,7 @@ $this->raiseError( 'PackageFileManager error <'.$e->getMessage().'>.' ); if ( $name !== 'Base' ) { - $e = $pkg->setPackageDepWithChannel( 'required', 'Base', self::CHANNEL, $baseVersion ); + $e = $pkg->addPackageDepWithChannel( 'required', 'Base', self::CHANNEL, $baseVersion ); if ( PEAR::isError( $e ) ) $this->raiseError( 'PackageFileManager error <'.$e->getMessage().'>.' ); } Modified: scripts/generate_super_package_xml.php =================================================================== --- scripts/generate_super_package_xml.php 2006-01-16 12:11:28 UTC (rev 1917) +++ scripts/generate_super_package_xml.php 2006-01-16 12:22:26 UTC (rev 1918) @@ -162,7 +162,8 @@ if ( !trim( $release ) == '' && $foundPackageTag ) { $releaseData = array_map( 'trim', explode( ': ', $release ) ); - $e = $pkg->addPackageDepWithChannel( 'required', $releaseData[0], CHANNEL_URI, $releaseData[1] ); + $version = str_replace( 'rc', 'RC', $releaseData[1] ); + $e = $pkg->addPackageDepWithChannel( 'required', $releaseData[0], CHANNEL_URI, $version ); if ( PEAR::isError( $e ) ) die( $output->formatText( "Error in PackageFileManager2: <" . $e->getMessage() . ">.\n", 'failure' ) ); } @@ -191,7 +192,7 @@ $version = $input->getOption( 'v' )->value; $version = str_replace( 'rc', 'RC', $version ); -$stability = ( strpos( $version, 'beta' ) !== false || strpos( $version, 'RC' ) !== false ) ) ? 'beta' : 'stable'; +$stability = ( strpos( $version, 'beta' ) !== false || strpos( $version, 'RC' ) !== false ) ? 'beta' : 'stable'; $e = $pkg->setReleaseStability( $stability ); if ( PEAR::isError( $e ) ) Modified: scripts/package.php =================================================================== --- scripts/package.php 2006-01-16 12:11:28 UTC (rev 1917) +++ scripts/package.php 2006-01-16 12:22:26 UTC (rev 1918) @@ -24,9 +24,13 @@ addAditionalFiles( $packageDir, $packageList ); setBaseNonDevel( $packageDir ); +echo "Creating Archives: "; `cd $basePackageDir; tar cvjf /tmp/ezcomponents-$version.tar.bz2 .`; +echo "tar.bz2 "; `cd $basePackageDir; zip -r /tmp/ezcomponents-$version.zip ezcomponents-$version`; +echo "zip "; `rm -rf $basePackageDir`; +echo "Done\n\n"; function addPackages( $fileName, $packageDir ) { @@ -103,8 +107,6 @@ echo "Adding additional files: "; echo "LICENSE "; copy( "LICENSE", "$packageDir/LICENSE" ); - echo "CREDITS "; - copy( "CREDITS", "$packageDir/CREDITS" ); echo "descriptions.txt "; $f = fopen( "$packageDir/descriptions.txt", "w" ); -- svn-components mailing list [email protected] http://lists.ez.no/mailman/listinfo/svn-components
