cvs: php4 /pear/PEAR/Command Package.php
| From: | Tomas V.V.Cox | Date: | Sat, 14 Jun 2003 16:56:19 +0000 |
| Subject: | cvs: php4 /pear/PEAR/Command Package.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-10962@lists.php.net to get a copy of this message | ||
cox Sat Jun 14 12:56:19 2003 EDT
Modified files:
/php4/pear/PEAR/Command Package.php
Log:
Fix some typos in makerpm and removed unused debug code
Index: php4/pear/PEAR/Command/Package.php
diff -u php4/pear/PEAR/Command/Package.php:1.53 php4/pear/PEAR/Command/Package.php:1.54
--- php4/pear/PEAR/Command/Package.php:1.53 Tue Jun 10 16:03:43 2003
+++ php4/pear/PEAR/Command/Package.php Sat Jun 14 12:56:19 2003
@@ -17,7 +17,7 @@
// | Martin Jansen <mj@php.net> |
// +----------------------------------------------------------------------+
//
-// $Id: Package.php,v 1.53 2003/06/10 20:03:43 imajes Exp $
+// $Id: Package.php,v 1.54 2003/06/14 16:56:19 cox Exp $
require_once 'PEAR/Common.php';
require_once 'PEAR/Command/Common.php';
@@ -441,17 +441,17 @@
$php = PHP_BINDIR . '/php' . (OS_WINDOWS ? '.exe' : '');
putenv("TEST_PHP_EXECUTABLE=$php");
$ip = ini_get("include_path");
- $ps = OS_WINDOWS ? ';' : ':';
+ $ps = OS_WINDOWS ? ';' : ':';
$run_tests = $rtsts = $this->config->get('php_dir') . DIRECTORY_SEPARATOR .
'run-tests.php';
if (!file_exists($run_tests)) {
$run_tests = PEAR_INSTALL_DIR . DIRECTORY_SEPARATOR . 'run-tests.php';
if (!file_exists($run_tests)) {
- return $this->raiseError("No run-tests.php file found. Please copy this
".
+ return $this->raiseError("No run-tests.php file found. Please copy this
".
"file from the sources of your PHP
distribution to $rtsts");
}
}
- $plist = implode(" ", $params);
- $cmd = "$php -C -d include_path=$cwd$ps$ip -f $run_tests -- $plist";
+ $plist = implode(" ", $params);
+ $cmd = "$php -C -d include_path=$cwd$ps$ip -f $run_tests -- $plist";
system($cmd);
return true;
}
@@ -583,22 +583,14 @@
array('installroot' => $instroot,
'nodeps' => true));
$pkgdir = "$info[package]-$info[version]";
-// print "instroot=$instroot\n";
-// print_r($info);
-// return true;
-
$info['rpm_xml_dir'] = '/var/lib/pear';
$this->config->set('verbose', $tmp);
if (!$tar->extractList("$pkgdir/package.xml", $tmpdir, $pkgdir)) {
return $this->raiseError("failed to extract $params[0]");
}
- if (!file_exists("$tmpdir/package.xml")) {
+ if (!file_exists("package.xml")) {
return $this->raiseError("no package.xml found in $params[0]");
}
-// System::mkdir("-p $instroot$info[rpm_xml_dir]");
-// if (!@copy("$tmpdir/package.xml",
"$instroot$info[rpm_xml_dir]/$info[package].xml")) {
-// return $this->raiseError("could not copy package.xml file:
$php_errormsg");
-// }
if (isset($options['spec-template'])) {
$spec_template = $options['spec-template'];
} else {
@@ -631,7 +623,7 @@
} else {
$arch = 'noarch';
}
- $cfk = array('master_server', 'php_dir', 'ext_dir',
'doc_dir',
+ $cfg = array('master_server', 'php_dir', 'ext_dir',
'doc_dir',
'bin_dir', 'data_dir', 'test_dir');
foreach ($cfg as $k) {
$info[$k] = $this->config->get($k);