Skip to content

Commit 67b971a

Browse files
committed
Clean up unused stuff
1 parent f6102f7 commit 67b971a

File tree

1 file changed

+4
-39
lines changed

1 file changed

+4
-39
lines changed

pear/PEAR/Packager.php

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*
2727
* TODO:
2828
* - add an extra param the dir where to place the created package
29-
* - finish and test Windows support
3029
*
3130
* @since PHP 4.0.2
3231
* @author Stig Bakken <[email protected]>
@@ -35,51 +34,16 @@ class PEAR_Packager extends PEAR_Common
3534
{
3635
// {{{ properties
3736

38-
/** assoc with information about the package */
39-
var $pkginfo = array();
40-
41-
/** name of the package directory, for example Foo-1.0 */
42-
var $pkgdir;
43-
44-
/** directory where PHP code files go */
45-
var $phpdir;
46-
47-
/** directory where PHP extension files go */
48-
var $extdir;
49-
50-
/** directory where documentation goes */
51-
var $docdir;
52-
53-
/** directory where system state information goes */
54-
var $statedir;
55-
5637
/** debug mode (integer) */
5738
var $debug = 0;
5839

59-
/** temporary directory */
60-
var $tmpdir;
61-
62-
/** whether file list is currently being copied */
63-
var $recordfilelist;
64-
65-
/** temporary space for copying file list */
66-
var $filelist;
67-
68-
/** package name and version, for example "HTTP-1.0" */
69-
var $pkgver;
70-
7140
// }}}
7241

7342
// {{{ constructor
7443

75-
function PEAR_Packager($phpdir = PEAR_INSTALL_DIR,
76-
$extdir = PEAR_EXTENSION_DIR,
77-
$docdir = '')
44+
function PEAR_Packager()
7845
{
7946
$this->PEAR();
80-
$this->phpdir = $phpdir;
81-
$this->extdir = $extdir;
82-
$this->docdir = $docdir;
8347
}
8448

8549
// }}}
@@ -135,14 +99,15 @@ function package($pkgfile = null)
13599
return $this->raiseError("File $fname does not exist");
136100
} else {
137101
$filelist[$i++] = $fname;
102+
$this->log(2, "Adding file $fname");
138103
}
139104
}
140105
// XXX TODO: Rebuild the package file as the old method did?
141106
142107
// TAR the Package -------------------------------------------
143108
$dest_package = $this->orig_pwd . DIRECTORY_SEPARATOR . "{$pkgver}.tgz";
144-
$tar = new Archive_Tar($dest_package, true);
145-
$tar->setErrorHandling(PEAR_ERROR_PRINT);
109+
$tar =& new Archive_Tar($dest_package, true);
110+
$tar->setErrorHandling(PEAR_ERROR_PRINT); // XXX Don't print errors
146111
// ----- Creates with the package.xml file
147112
if (!$tar->create($pkgfile)) {
148113
return $this->raiseError('an error ocurred during package creation');

0 commit comments

Comments
 (0)