[zi-cvs] packages/com.zzoss.plugin.lib Plugin.php,1.2,1.3

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

Modified Files:
	Plugin.php 
Log Message:
E_ALL support

Index: Plugin.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.plugin.lib/Plugin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Plugin.php	14 Jan 2004 15:41:48 -0000	1.2
--- Plugin.php	9 Feb 2004 18:54:30 -0000	1.3
***************
*** 45,49 ****
      var $sources = array();
      
!     var $plugin_params = array();
      
      function setDestDir($dest_dir)
--- 45,51 ----
      var $sources = array();
      
!     var $plugins_params = array();
!     
!     var $output;
      
      function setDestDir($dest_dir)
***************
*** 134,138 ****
              $this->package = $this->packages[$key];
              $this->log .= "\n[$key]\n\n";
!             $this->pkg_root = $this->packages_application[$this->package["name"]]["@"]["baseinstalldir"].DIRECTORY_SEPARATOR;
              
              switch($this->role){
--- 136,145 ----
              $this->package = $this->packages[$key];
              $this->log .= "\n[$key]\n\n";
!             $this->pkg_root = '';
!             if(isset($this->packages_application[$this->package["name"]]["@"]["baseinstalldir"])){
!                 $this->pkg_root = $this->packages_application[$this->package["name"]]["@"]["baseinstalldir"];
!             }
!             $this->pkg_root .= DIRECTORY_SEPARATOR;
!             
              
              switch($this->role){
***************
*** 181,196 ****
          }
          
!         switch($val) {
!             case 'I':
!             case 'U':
                  // Post-processing
                  $packages_installed_dir = $this->registry->getApplicationPath().'packages_installed'.DIRECTORY_SEPARATOR.$this->package["name"].'-'.$this->package["release"]["version"].DIRECTORY_SEPARATOR;
                  System::mkDir(array('-p', $packages_installed_dir));
!                 ZZOSS_InstallerUtils::copy(
                      $this->package["install"]["path"].'package.xml', 
                      $packages_installed_dir.'package.xml'
                      );
                  break;
!             case 'R':
                   // remove package.xml of installed package
                  @unlink($GLOBALS['ZI']['package_src'].'package.xml');
--- 188,203 ----
          }
          
!         switch($this->action) {
!             case 'install':
!             case 'update':
                  // Post-processing
                  $packages_installed_dir = $this->registry->getApplicationPath().'packages_installed'.DIRECTORY_SEPARATOR.$this->package["name"].'-'.$this->package["release"]["version"].DIRECTORY_SEPARATOR;
                  System::mkDir(array('-p', $packages_installed_dir));
!                 copy(
                      $this->package["install"]["path"].'package.xml', 
                      $packages_installed_dir.'package.xml'
                      );
                  break;
!             case 'remove':
                   // remove package.xml of installed package
                  @unlink($GLOBALS['ZI']['package_src'].'package.xml');
***************
*** 288,295 ****
      {
          // iterate builds
!         $pkg_builds = $this->package['release']['builds']['build'];
!         if(!is_array($pkg_builds)) {
              $this->log .= "No build definition.\n";
          } else {
              foreach($pkg_builds as $build) {
                  
--- 295,302 ----
      {
          // iterate builds
!         if(!isset($this->package['release']['builds']['build'])){
              $this->log .= "No build definition.\n";
          } else {
+             $pkg_builds = $this->package['release']['builds']['build'];
              foreach($pkg_builds as $build) {
                  
***************
*** 307,311 ****
      function isStep($step)
      {
!         return is_array($this->queue[$step]);
      }
      
--- 314,322 ----
      function isStep($step)
      {
!         if(!isset($this->queue[$step])){
!             return false;
!         } else {
!             return is_array($this->queue[$step]);
!         }
      }
      
***************
*** 313,324 ****
      {
          // register new plugins of package
          
          // This is here to be downward compatible
!         if(is_array($this->package["release"]["plugin"]["filelist"]["file"])){
              $files = $this->package["release"]["plugin"]["filelist"]["file"];
!         } else {
              $files = $this->package["release"]["plugin"]["file"];
          }
!         if(is_array($files)) {
              //$plugins_install['default'][$this->package['name'].'-'.$this->package['release']['version']] = strlen($this->package["release"]["plugin"]['@']['default']);
              foreach($files as $file) {
--- 324,336 ----
      {
          // register new plugins of package
+         $files = array();
          
          // This is here to be downward compatible
!         if(isset($this->package["release"]["plugin"]["filelist"]["file"])){
              $files = $this->package["release"]["plugin"]["filelist"]["file"];
!         } elseif(isset($this->package["release"]["plugin"]["file"])) {
              $files = $this->package["release"]["plugin"]["file"];
          }
!         if(count($files)) {
              //$plugins_install['default'][$this->package['name'].'-'.$this->package['release']['version']] = strlen($this->package["release"]["plugin"]['@']['default']);
              foreach($files as $file) {



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn