[zi-cvs] packages/com.zzoss.package.lib Package.php,1.14,1.15 package.xml,1.6,1.7 Dependency.php,1.7,NONE

[Sandro Z. <or...@us...>]

Update of /cvsroot/zzossinstaller/packages/com.zzoss.package.lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14579/com.zzoss.package.lib

Modified Files:
	Package.php package.xml 
Removed Files:
	Dependency.php 
Log Message:
move com.zzoss.package.lib/Dependency.php in own package com.zzoss.package.dependency.lib

Index: Package.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.package.lib/Package.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Package.php	24 Apr 2004 15:34:20 -0000	1.14
--- Package.php	6 May 2004 12:32:23 -0000	1.15
***************
*** 1,3 ****
! <?php  
      /*
      Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
--- 1,3 ----
! <?php
      /*
      Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
***************
*** 17,21 ****
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
!     
      /**
      @version $Id$
--- 17,21 ----
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
! 
      /**
      @version $Id$
***************
*** 32,62 ****
  require_once 'ZZOSS_Dir/Dir.php';
  
! /**   
!  * This class parses the XML config file and provides the objects of the  
!  * XML document.   
!  *   
!  * Extends PEAR XML_Parser class.   
!  *   
!  * @version  1   
!  * @author   Sandro Zic <san...@zz...>; |    
!  */   
!    
  class ZZOSS_Package extends PEAR {
!     
      /**
      * Log information.
      */
      var $log = '';
!     
      /**
      * Packages that could not be processed.
      */
      var $pkgs_unprocessed = array();
!     
      /**
      * The path to the bundle tgz.
      */
      var $_bundle_tgz = '';
!     
      /*
      * Destructor
--- 32,62 ----
  require_once 'ZZOSS_Dir/Dir.php';
  
! /**
!  * This class parses the XML config file and provides the objects of the
!  * XML document.
!  *
!  * Extends PEAR XML_Parser class.
!  *
!  * @version  1
!  * @author   Sandro Zic <san...@zz...>; |
!  */
! 
  class ZZOSS_Package extends PEAR {
! 
      /**
      * Log information.
      */
      var $log = '';
! 
      /**
      * Packages that could not be processed.
      */
      var $pkgs_unprocessed = array();
! 
      /**
      * The path to the bundle tgz.
      */
      var $_bundle_tgz = '';
! 
      /*
      * Destructor
***************
*** 70,74 ****
          $this->_PEAR();
      }
!     
      function extractBundles($src, $dest, $backup_dest = NULL)
      {
--- 70,74 ----
          $this->_PEAR();
      }
! 
      function extractBundles($src, $dest, $backup_dest = NULL)
      {
***************
*** 90,103 ****
                  closedir($dp);
              }
!             
              return true;
          }
      }
!     
      function mkBundle($dir_src, $distri_xml = null, $app_xml = null)
      {
          // reset previous bundle tgz
          $this->_bundle_tgz = '';
!         
          // if distri or app XML are not provided, we
          // asumme they are within the src dir
--- 90,103 ----
                  closedir($dp);
              }
! 
              return true;
          }
      }
! 
      function mkBundle($dir_src, $distri_xml = null, $app_xml = null)
      {
          // reset previous bundle tgz
          $this->_bundle_tgz = '';
! 
          // if distri or app XML are not provided, we
          // asumme they are within the src dir
***************
*** 108,115 ****
              $app_xml = $dir_src.DIRECTORY_SEPARATOR.'application.xml';
          }
!         
          // destination directory is the temp dir of the system
          $dir_dest = System::tmpdir().DIRECTORY_SEPARATOR;
!         
          // check whether distribution and app XML exist
          if(!file_exists($distri_xml)){
--- 108,115 ----
              $app_xml = $dir_src.DIRECTORY_SEPARATOR.'application.xml';
          }
! 
          // destination directory is the temp dir of the system
          $dir_dest = System::tmpdir().DIRECTORY_SEPARATOR;
! 
          // check whether distribution and app XML exist
          if(!file_exists($distri_xml)){
***************
*** 119,128 ****
              return PEAR::raiseError("Distribution XML does not exist at '$app_xml'");
          }
!         
          $config = new ZZOSS_Config;
          $config->setFile($distri_xml);
          $xml = $config->query('/distribution');
          $distri_name = $xml['name'];
!         
          $config = new ZZOSS_Config;
          $config->setFile($app_xml);
--- 119,128 ----
              return PEAR::raiseError("Distribution XML does not exist at '$app_xml'");
          }
! 
          $config = new ZZOSS_Config;
          $config->setFile($distri_xml);
          $xml = $config->query('/distribution');
          $distri_name = $xml['name'];
! 
          $config = new ZZOSS_Config;
          $config->setFile($app_xml);
***************
*** 130,149 ****
          $app_name = $xml['name'];
          $app_version = $xml['release']['version'];
!         
          // clean up memory
          unset($config);
          unset($xml);
!         
          //System::mkdir(array('-p', $dir_dest));
!         
          // copy the distribution XML descriptor to the bundle directory
          //copy($distri_xml, $dir_src.'distribution.xml');
          // copy the application XML descriptor to the bundle directory
          //copy($app_xml, $dir_src.'application.xml');
!         
          // Create the bundle.tgz
          $instant_tgz = $app_name.'-'.$app_version.'.tgz';
          $bundle_tgz = $distri_name.'.'.$app_name.'.bundle-'.$app_version.'.tgz';
!         
          if($dp = @opendir($dir_src)) {
              while (false !== ($entry = readdir($dp))) {
--- 130,149 ----
          $app_name = $xml['name'];
          $app_version = $xml['release']['version'];
! 
          // clean up memory
          unset($config);
          unset($xml);
! 
          //System::mkdir(array('-p', $dir_dest));
! 
          // copy the distribution XML descriptor to the bundle directory
          //copy($distri_xml, $dir_src.'distribution.xml');
          // copy the application XML descriptor to the bundle directory
          //copy($app_xml, $dir_src.'application.xml');
! 
          // Create the bundle.tgz
          $instant_tgz = $app_name.'-'.$app_version.'.tgz';
          $bundle_tgz = $distri_name.'.'.$app_name.'.bundle-'.$app_version.'.tgz';
! 
          if($dp = @opendir($dir_src)) {
              while (false !== ($entry = readdir($dp))) {
***************
*** 155,159 ****
              closedir($dp);
          }
!         
          $cwd = getcwd();
          chdir($dir_src);
--- 155,159 ----
              closedir($dp);
          }
! 
          $cwd = getcwd();
          chdir($dir_src);
***************
*** 164,182 ****
          $tar->addModify($distri_xml, '', dirname($distri_xml));
          $tar->addModify($app_xml, '', dirname($app_xml));
!         
          // copy bundle to bundles/ directory of installer
          //copy($dir_src.$bundle_tgz, $dir_dest.$bundle_tgz);
          //@unlink($dir_src.$bundle_tgz);
!         
          // We use PEAR to clean up the temporary bundle upon shutdown
          // with the destructor.
          // Notice that ZZOSS_Package extends PEAR!
          $this->PEAR();
!         
          $this->_bundle_tgz = $dir_dest.$bundle_tgz;
!         
          return $this->_bundle_tgz;
      }
!     
      function extractBundle($file, $dest, $backup_dest = NULL)
      {
--- 164,182 ----
          $tar->addModify($distri_xml, '', dirname($distri_xml));
          $tar->addModify($app_xml, '', dirname($app_xml));
! 
          // copy bundle to bundles/ directory of installer
          //copy($dir_src.$bundle_tgz, $dir_dest.$bundle_tgz);
          //@unlink($dir_src.$bundle_tgz);
! 
          // We use PEAR to clean up the temporary bundle upon shutdown
          // with the destructor.
          // Notice that ZZOSS_Package extends PEAR!
          $this->PEAR();
! 
          $this->_bundle_tgz = $dir_dest.$bundle_tgz;
! 
          return $this->_bundle_tgz;
      }
! 
      function extractBundle($file, $dest, $backup_dest = NULL)
      {
***************
*** 184,188 ****
          if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
              $tmp_src = $dest.'.tmp'.DIRECTORY_SEPARATOR;
!             
              System::mkdir(array('-p',$tmp_src));
              if(ZZOSS_PACKAGE_DEBUG){
--- 184,188 ----
          if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
              $tmp_src = $dest.'.tmp'.DIRECTORY_SEPARATOR;
! 
              System::mkdir(array('-p',$tmp_src));
              if(ZZOSS_PACKAGE_DEBUG){
***************
*** 197,201 ****
                  }
              }
!             
              // Try to extract the distribution
              if(!ZZOSS_Package::extractDistribution($tmp_src, $dest)){
--- 197,201 ----
                  }
              }
! 
              // Try to extract the distribution
              if(!ZZOSS_Package::extractDistribution($tmp_src, $dest)){
***************
*** 208,212 ****
                  }
              }
!             
              if(!is_null($backup_dest)){
                  if(!is_dir($backup_dest)){
--- 208,212 ----
                  }
              }
! 
              if(!is_null($backup_dest)){
                  if(!is_dir($backup_dest)){
***************
*** 218,232 ****
          }
      }
!     
      function getBundleDescr($bundle_tgz, $extract_dir)
      {
          $parts = pathinfo($bundle_tgz);
          if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
!             
              $extract_dir = $extract_dir.DIRECTORY_SEPARATOR;
              if(!is_dir($extract_dir)){
                  return PEAR::raiseError("Is not a directory: '$extract_dir'.");
              }
!             
              System::mkdir(array('-p',$extract_dir));
              if(ZZOSS_PACKAGE_DEBUG){
--- 218,232 ----
          }
      }
! 
      function getBundleDescr($bundle_tgz, $extract_dir)
      {
          $parts = pathinfo($bundle_tgz);
          if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
! 
              $extract_dir = $extract_dir.DIRECTORY_SEPARATOR;
              if(!is_dir($extract_dir)){
                  return PEAR::raiseError("Is not a directory: '$extract_dir'.");
              }
! 
              System::mkdir(array('-p',$extract_dir));
              if(ZZOSS_PACKAGE_DEBUG){
***************
*** 238,242 ****
                  return PEAR::raiseError("unable to unpack $bundle_tgz");
              }
!             
              // Get distribution and application XML data.
              $app_xml = $extract_dir.'application.xml';
--- 238,242 ----
                  return PEAR::raiseError("unable to unpack $bundle_tgz");
              }
! 
              // Get distribution and application XML data.
              $app_xml = $extract_dir.'application.xml';
***************
*** 244,263 ****
              $config->setFile($app_xml);
              $descriptions['application'] = $config->query('/application');
!             
              $distri_xml = $extract_dir.'distribution.xml';
              $config = new ZZOSS_Config;
              $config->setFile($distri_xml);
              $descriptions['distribution'] = $config->query('/distribution');
!             
              return $descriptions;
          }
!         
          return false;
      }
!     
      function extractDistribution($src, $dest)
      {
          $distribution_xml_src = $src.'distribution.xml';
!         
          if(!file_exists($distribution_xml_src)){
              if(ZZOSS_PACKAGE_DEBUG){
--- 244,263 ----
              $config->setFile($app_xml);
              $descriptions['application'] = $config->query('/application');
! 
              $distri_xml = $extract_dir.'distribution.xml';
              $config = new ZZOSS_Config;
              $config->setFile($distri_xml);
              $descriptions['distribution'] = $config->query('/distribution');
! 
              return $descriptions;
          }
! 
          return false;
      }
! 
      function extractDistribution($src, $dest)
      {
          $distribution_xml_src = $src.'distribution.xml';
! 
          if(!file_exists($distribution_xml_src)){
              if(ZZOSS_PACKAGE_DEBUG){
***************
*** 267,275 ****
              return false;
          }
!         
          if(ZZOSS_PACKAGE_DEBUG){
              ZZOSS_Debug::log('ZZOSS_Package', 'Yes, '.$distribution_xml_src.' exists.', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
          }
!         
          // register new distribution
          $distribution_config = new ZZOSS_Config(array('numeric' => array('maintainer')));
--- 267,275 ----
              return false;
          }
! 
          if(ZZOSS_PACKAGE_DEBUG){
              ZZOSS_Debug::log('ZZOSS_Package', 'Yes, '.$distribution_xml_src.' exists.', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
          }
! 
          // register new distribution
          $distribution_config = new ZZOSS_Config(array('numeric' => array('maintainer')));
***************
*** 282,286 ****
          System::mkdir(array('-p',$distribution_dir.'downloads'));
          System::mkdir(array('-p',$distribution_dir.'applications'));
!         System::mkdir(array('-p',$distribution_dir.'cache')); 
          copy($distribution_xml_src, $distribution_dir.'distribution.xml');
          // finally set "rebuild distributions" flag
--- 282,286 ----
          System::mkdir(array('-p',$distribution_dir.'downloads'));
          System::mkdir(array('-p',$distribution_dir.'applications'));
!         System::mkdir(array('-p',$distribution_dir.'cache'));
          copy($distribution_xml_src, $distribution_dir.'distribution.xml');
          // finally set "rebuild distributions" flag
***************
*** 288,292 ****
          fputs($fp,'dummy');
          fclose($fp);
!         
           // Try to extract the application
           if(!ZZOSS_Package::extractApplication($src, $distribution_dir)){
--- 288,292 ----
          fputs($fp,'dummy');
          fclose($fp);
! 
           // Try to extract the application
           if(!ZZOSS_Package::extractApplication($src, $distribution_dir)){
***************
*** 294,306 ****
               return false;
          }
!         
          return true;
      }
!     
      function extractApplication($src, $dest)
      {
          $application_xml_src = $src.'application.xml';
          $packages_xml_src = $src.'packages.xml';
!         
          if(!(file_exists($application_xml_src)/* && file_exists($packages_xml_src)*/)) {
              if(ZZOSS_PACKAGE_DEBUG){
--- 294,306 ----
               return false;
          }
! 
          return true;
      }
! 
      function extractApplication($src, $dest)
      {
          $application_xml_src = $src.'application.xml';
          $packages_xml_src = $src.'packages.xml';
! 
          if(!(file_exists($application_xml_src)/* && file_exists($packages_xml_src)*/)) {
              if(ZZOSS_PACKAGE_DEBUG){
***************
*** 309,313 ****
              return false;
          }
!         
          if(ZZOSS_PACKAGE_DEBUG){
              ZZOSS_Debug::log('ZZOSS_Package', 'Yes, '.$application_xml_src.' and '.$packages_xml_src.' do exist.', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
--- 309,313 ----
              return false;
          }
! 
          if(ZZOSS_PACKAGE_DEBUG){
              ZZOSS_Debug::log('ZZOSS_Package', 'Yes, '.$application_xml_src.' and '.$packages_xml_src.' do exist.', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
***************
*** 320,331 ****
          ZZOSS_InstallerRegistry::mkDirsApplication($application_dir);
          @copy($application_xml_src, $application_dir.'application.xml');
!         
          if(file_exists($packages_xml_src)){
              copy($packages_xml_src, $application_dir.'installer'.DIRECTORY_SEPARATOR.'remote_packages.xml');
          }
!         
          // try to copy tgz files
          if($dp = @opendir($src)) {
!             while (false !== ($file2 = readdir($dp))) { 
                  $parts = pathinfo($file2);
                  if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
--- 320,331 ----
          ZZOSS_InstallerRegistry::mkDirsApplication($application_dir);
          @copy($application_xml_src, $application_dir.'application.xml');
! 
          if(file_exists($packages_xml_src)){
              copy($packages_xml_src, $application_dir.'installer'.DIRECTORY_SEPARATOR.'remote_packages.xml');
          }
! 
          // try to copy tgz files
          if($dp = @opendir($src)) {
!             while (false !== ($file2 = readdir($dp))) {
                  $parts = pathinfo($file2);
                  if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
***************
*** 340,352 ****
              closedir($dp);
          }
!         
          // finally set "rebuild application" flag
          $fp = fopen($dest."installer".DIRECTORY_SEPARATOR."applications.lock","w");
          fputs($fp,'dummy');
          fclose($fp);
!         
          return true;
      }
!     
      function extractPatches($src, $dest)
      {
--- 340,352 ----
              closedir($dp);
          }
! 
          // finally set "rebuild application" flag
          $fp = fopen($dest."installer".DIRECTORY_SEPARATOR."applications.lock","w");
          fputs($fp,'dummy');
          fclose($fp);
! 
          return true;
      }
! 
      function extractPatches($src, $dest)
      {
***************
*** 358,362 ****
          return true;
      }
!     
      function extractPackages($src, $dest, $pkgs_allowed = array())
      {
--- 358,362 ----
          return true;
      }
! 
      function extractPackages($src, $dest, $pkgs_allowed = array())
      {
***************
*** 366,370 ****
          // check source dir and extract all tgz's to modules
          if($dp = @opendir($src)) {
!             while (false !== ($file = readdir($dp))) { 
                  $parts = pathinfo($file);
                  if($parts["extension"] == 'tgz' || $parts["extension"] == 'gz') {
--- 366,370 ----
          // check source dir and extract all tgz's to modules
          if($dp = @opendir($src)) {
!             while (false !== ($file = readdir($dp))) {
                  $parts = pathinfo($file);
                  if($parts["extension"] == 'tgz' || $parts["extension"] == 'gz') {
***************
*** 372,376 ****
                      $pkgsrc = $src.$file;
                      $pkg_dest_dir = $dest.$pkg_name.DIRECTORY_SEPARATOR;
!                     
                      // did we specify the packages we allow to be extracted
                      if(count($pkgs_allowed)){
--- 372,376 ----
                      $pkgsrc = $src.$file;
                      $pkg_dest_dir = $dest.$pkg_name.DIRECTORY_SEPARATOR;
! 
                      // did we specify the packages we allow to be extracted
                      if(count($pkgs_allowed)){
***************
*** 379,383 ****
                          }
                      }
!                     
                      // check if the tgz has changed since we last extracted it
                      if(ZZOSS_PACKAGE_DEBUG){
--- 379,383 ----
                          }
                      }
! 
                      // check if the tgz has changed since we last extracted it
                      if(ZZOSS_PACKAGE_DEBUG){
***************
*** 396,401 ****
                          }
                      }
!                     
!                     
                      if(ZZOSS_PACKAGE_DEBUG){
                          ZZOSS_Debug::log('ZZOSS_Package', 'Attempting to extract '.$pkgsrc.' to '.$dest, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
--- 396,401 ----
                          }
                      }
! 
! 
                      if(ZZOSS_PACKAGE_DEBUG){
                          ZZOSS_Debug::log('ZZOSS_Package', 'Attempting to extract '.$pkgsrc.' to '.$dest, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
***************
*** 419,423 ****
                          $package_config = new ZZOSS_Config(array('numeric' => array('dep','file', 'build', 'maintainer')));
                          $package_config->setFile($package_xml_src);
!                         $package = $package_config->query('/package');  
                          $package_xml_dest = $dest.$package["name"].'-'.$package["release"]["version"].DIRECTORY_SEPARATOR.'package.xml';
                          // create the pckage directory if it does not exist yet
--- 419,423 ----
                          $package_config = new ZZOSS_Config(array('numeric' => array('dep','file', 'build', 'maintainer')));
                          $package_config->setFile($package_xml_src);
!                         $package = $package_config->query('/package');
                          $package_xml_dest = $dest.$package["name"].'-'.$package["release"]["version"].DIRECTORY_SEPARATOR.'package.xml';
                          // create the pckage directory if it does not exist yet
***************
*** 436,440 ****
          }
      }
!     
      function packageSources($bundle_dir, $packages, $app_settings)
      {
--- 436,440 ----
          }
      }
! 
      function packageSources($bundle_dir, $packages, $app_settings)
      {
***************
*** 444,459 ****
              System::mkdir(array('-p', $bundle_dir));
          }
!         
          foreach($packages as $pos => $package){
!             
              $package_unique = $package['@']['name'].'-'.$package['@']['version'];
              $log[$package_unique] = '';
!             
              for($i = 1; $i <= 5; $i++){
                  if(isset($app_settings['source_'.$i]) && strlen($app_settings['source_'.$i])){
                      if(isset($packages[$pos])){
!                         
                          $has_pkg_source = true;
!                         
                          $log[$package_unique] .= '* Scanning '.$app_settings['source_'.$i]."\n";
                          $package_src = ZZOSS_InstallerUtils::fixPath($app_settings['source_'.$i].DIRECTORY_SEPARATOR.$package['@']['name'].DIRECTORY_SEPARATOR);
--- 444,459 ----
              System::mkdir(array('-p', $bundle_dir));
          }
! 
          foreach($packages as $pos => $package){
! 
              $package_unique = $package['@']['name'].'-'.$package['@']['version'];
              $log[$package_unique] = '';
! 
              for($i = 1; $i <= 5; $i++){
                  if(isset($app_settings['source_'.$i]) && strlen($app_settings['source_'.$i])){
                      if(isset($packages[$pos])){
! 
                          $has_pkg_source = true;
! 
                          $log[$package_unique] .= '* Scanning '.$app_settings['source_'.$i]."\n";
                          $package_src = ZZOSS_InstallerUtils::fixPath($app_settings['source_'.$i].DIRECTORY_SEPARATOR.$package['@']['name'].DIRECTORY_SEPARATOR);
***************
*** 461,465 ****
                          $package_tgz = $package_unique.'.tgz';
                          $package_xml = $package_src.'package.xml';
!                         
                          if(!file_exists($package_xml)){
                              $package_tgz_path = ZZOSS_InstallerUtils::fixPath($app_settings['source_'.$i].DIRECTORY_SEPARATOR.$package_tgz);
--- 461,465 ----
                          $package_tgz = $package_unique.'.tgz';
                          $package_xml = $package_src.'package.xml';
! 
                          if(!file_exists($package_xml)){
                              $package_tgz_path = ZZOSS_InstallerUtils::fixPath($app_settings['source_'.$i].DIRECTORY_SEPARATOR.$package_tgz);
***************
*** 485,489 ****
                          } else {
                              $log[$package_unique] .= '  Found package.xml'."\n";
!                             
                              // check if the tgz has changed since we last registered it
                              if( file_exists($package_dest.$package_tgz) &&
--- 485,489 ----
                          } else {
                              $log[$package_unique] .= '  Found package.xml'."\n";
! 
                              // check if the tgz has changed since we last registered it
                              if( file_exists($package_dest.$package_tgz) &&
***************
*** 495,503 ****
                                  continue;
                              }
!                             
                              include_once 'ZZOSS_Package/Archive.php';
                              $pkg_tgz_path = ZZOSS_PackageArchive::create($package_src, $package_dest);
                              $log[$package_unique] .= '  Created package '.$pkg_tgz_path.'.'."\n";
!                             
                              // remove this package from stack
                              unset($packages[$pos]);
--- 495,503 ----
                                  continue;
                              }
! 
                              include_once 'ZZOSS_Package/Archive.php';
                              $pkg_tgz_path = ZZOSS_PackageArchive::create($package_src, $package_dest);
                              $log[$package_unique] .= '  Created package '.$pkg_tgz_path.'.'."\n";
! 
                              // remove this package from stack
                              unset($packages[$pos]);
***************
*** 507,520 ****
              }
          }
!         
          if(!$has_pkg_source){
              return false;
          }
!         
          $this->pkgs_unprocessed = $packages;
!         
          // If a temporary directory has been created for temporary package.xml files,
          // then remove it now.
!         
          // is handled by a shutdown function of PEAR::System
          /*if(isset($pkg_tmpdir) && is_dir($pkg_tmpdir)){
--- 507,520 ----
              }
          }
! 
          if(!$has_pkg_source){
              return false;
          }
! 
          $this->pkgs_unprocessed = $packages;
! 
          // If a temporary directory has been created for temporary package.xml files,
          // then remove it now.
! 
          // is handled by a shutdown function of PEAR::System
          /*if(isset($pkg_tmpdir) && is_dir($pkg_tmpdir)){
***************
*** 522,529 ****
              //System::rm(array('-rf', $pkg_tmpdir));
          }*/
!         
          // General info
          $this->log = 'Destination: '.$bundle_dir."\n\n";
!         
          // compose log
          foreach($log as $package => $info){
--- 522,529 ----
              //System::rm(array('-rf', $pkg_tmpdir));
          }*/
! 
          // General info
          $this->log = 'Destination: '.$bundle_dir."\n\n";
! 
          // compose log
          foreach($log as $package => $info){
***************
*** 532,549 ****
              $this->log .= "\n";
          }
!         
          return true;
      }
!     
      function getLog()
      {
          return $this->log;
      }
!     
      function hasUnprocessedPkgs()
      {
          return @count($this->pkgs_unprocessed);
      }
!     
      function getUnprocessedPkgs()
      {
--- 532,549 ----
              $this->log .= "\n";
          }
! 
          return true;
      }
! 
      function getLog()
      {
          return $this->log;
      }
! 
      function hasUnprocessedPkgs()
      {
          return @count($this->pkgs_unprocessed);
      }
! 
      function getUnprocessedPkgs()
      {

--- Dependency.php DELETED ---

Index: package.xml
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.package.lib/package.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** package.xml	24 Apr 2004 15:34:20 -0000	1.6
--- package.xml	6 May 2004 12:32:23 -0000	1.7
***************
*** 4,8 ****
      <name>com.zzoss.package.lib</name>
      <summary>Classes to manage ZZ/OSS Installer or PEAR packages.</summary>
!     <description>Methods for extracting, bundling, checking dependencies, etc.</description>
      <maintainers>
          <maintainer>
--- 4,8 ----
      <name>com.zzoss.package.lib</name>
      <summary>Classes to manage ZZ/OSS Installer or PEAR packages.</summary>
!     <description>Methods for extracting, bundling, etc.</description>
      <maintainers>
          <maintainer>
***************
*** 20,24 ****
      </maintainers>
      <release>
!         <version>1.1.0</version>
          <date>{zi_release_date}</date>
          <license url="http://www.gnu.org/licenses/lgpl.txt" version="2">LGPL</license>
--- 20,24 ----
      </maintainers>
      <release>
!         <version>1.2.0</version>
          <date>{zi_release_date}</date>
          <license url="http://www.gnu.org/licenses/lgpl.txt" version="2">LGPL</license>
***************
*** 26,31 ****
          <notes>
  <![CDATA[
! - added method packageSources() which moves or creates package archives to the specified directory from source directories
! - refreshPackages() now always refreshes the package registry, regardless if a flag has been set or not
  ]]>
          </notes>
--- 26,30 ----
          <notes>
  <![CDATA[
! - moved dependency class to separate package com.zzoss.package.dependency.lib
  ]]>
          </notes>
***************
*** 34,38 ****
          </copyright>
          <filelist>
-             <file role="php" baseinstalldir="ZZOSS_Package" name="Dependency.php"/>
              <file role="php" baseinstalldir="ZZOSS_Package" name="Package.php"/>
          </filelist>
--- 33,36 ----
***************
*** 48,51 ****
--- 46,76 ----
      <changelog>
          <release>
+             <version>1.1.0</version>
+             <date>2004-04-06</date>
+             <license url="http://www.gnu.org/licenses/lgpl.txt" version="2">LGPL</license>
+             <state>stable</state>
+             <notes>
+ <![CDATA[
+ - added method packageSources() which moves or creates package archives to the specified directory from source directories
+ - refreshPackages() now always refreshes the package registry, regardless if a flag has been set or not
+ ]]>
+             </notes>
+             <copyright>
+                 <holder year="2003-{zi_copyright_year}" url="http://www.zzoss.com">ZZ/OSS</holder>
+             </copyright>
+             <filelist>
+                 <file role="php" baseinstalldir="ZZOSS_Package" name="Dependency.php"/>
+                 <file role="php" baseinstalldir="ZZOSS_Package" name="Package.php"/>
+             </filelist>
+             <deps>
+                 <dep type="pkg" rel="ge" version="1.0.0">com.zzoss.dir.lib</dep>
+                 <dep type="pkg" rel="ge" version="1.0">com.zzoss.config.lib</dep>
+                 <dep type="pkg" rel="ge" version="0.4">com.zzoss.debug.lib</dep>
+                 <dep type="pkg" rel="ge" version="1.0.0">com.zzoss.package.archive.lib</dep>
+                 <dep type="pkg" rel="ge" version="1.3b3">PEAR</dep>
+                 <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep>
+             </deps>
+         </release>
+         <release>
              <version>1.0</version>
              <date>2003-12-18</date>