cvs: pear-core / make-gopear-phar.php

cellog Sun Aug 14 03:11:03 2005 EDT Modified files: /pear-core make-gopear-phar.php Log: tweak OS_Guess addition (include_once 'System.php' needs processing) http://cvs.php.net/diff.php/pear-core/make-gopear-phar.php?r1=1.2&r2=1.3&ty=u Index: pear-core/make-gopear-phar.php diff -u pear-core/make-gopear-phar.php:1.2 pear-core/make-gopear-phar.php:1.3 --- pear-core/make-gopear-phar.php:1.2 Sat Aug 13 18:28:30 2005 +++ pear-core/make-gopear-phar.php Sun Aug 14 03:11:02 2005 @@ -27,6 +27,7 @@ $creator = new PHP_Archive_Creator('index.php', true); foreach ($packages as $package) { + echo "adding PEAR/go-pear-tarballs/$package\n"; $creator->addFile("PEAR/go-pear-tarballs/$package", "PEAR/go-pear-tarballs/$package"); } $commandcontents = file_get_contents(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'go-pear-phar.php'); @@ -147,6 +148,23 @@ $creator->addString($commandcontents, 'PEAR/PackageFile/Generator/v1.php'); $commandcontents = file_get_contents($peardir . DIRECTORY_SEPARATOR . 'PEAR' . + DIRECTORY_SEPARATOR . 'PackageFile' . DIRECTORY_SEPARATOR . 'Generator' . + DIRECTORY_SEPARATOR . 'v2.php'); +$commandcontents = str_replace( + array( + "require_once '", + "include_once '", + "@PEAR-VER@", + ), + array( + "require_once 'phar://go-pear.phar/", + "include_once 'phar://go-pear.phar/", + $pearver, + ), + $commandcontents); +$creator->addString($commandcontents, 'PEAR/PackageFile/Generator/v2.php'); + +$commandcontents = file_get_contents($peardir . DIRECTORY_SEPARATOR . 'PEAR' . DIRECTORY_SEPARATOR . 'Dependency2.php'); $commandcontents = str_replace( array( @@ -162,6 +180,20 @@ $commandcontents); $creator->addString($commandcontents, 'PEAR/Dependency2.php'); +$commandcontents = file_get_contents($peardir . DIRECTORY_SEPARATOR . 'OS' . + DIRECTORY_SEPARATOR . 'Guess.php'); +$commandcontents = str_replace( + array( + "include_once \"", + "@package_version@", + ), + array( + "include_once \"phar://go-pear.phar/", + $pearver, + ), + $commandcontents); +$creator->addString($commandcontents, 'OS/Guess.php'); + $commandcontents = file_get_contents($peardir . DIRECTORY_SEPARATOR . 'PEAR' . DIRECTORY_SEPARATOR . 'PackageFile.php'); $commandcontents = str_replace( @@ -182,6 +214,7 @@ $creator->addDir($peardir, array('tests/', 'scripts/', 'go-pear-phar.php', + '*OS/Guess.php', '*PEAR/Command.php', '*PEAR/Dependency2.php', '*PEAR/PackageFile/Generator/v1.php', @@ -237,7 +270,6 @@ '*PEAR/Validate.php', '*PEAR/XMLParser.php', 'PEAR.php', - '*OS/Guess.php', '*Archive/Tar.php', '*Console/Getopt.php', 'System.php',