[zi-cvs] packages/com.zzoss.installer.lib Registry.php,1.5,1.6 Setup.php,1.2,1.3 package.xml,1.2,1.3

Update of /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib
In directory sc8-pr-cvs1:/tmp/cvs-serv23001/com.zzoss.installer.lib

Modified Files:
	Registry.php Setup.php package.xml 
Log Message:
- fixed bug in ZZOSS_InstallerRegistry::refreshApplications() which caused installer to always switch to first application during installation process, see http://sourceforge.net/tracker/index.php?func=detail&aid=867719&group_id=95735&atid=612476
- use DIRECTORY_SEPARATOR in ZZOSS_InstallerUtils::copy_rec()
- added ZZOSS_InstallerRegistry::getApplicationPathRel();

Index: Registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Registry.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Registry.php	5 Jan 2004 08:45:34 -0000	1.5
--- Registry.php	14 Jan 2004 15:40:55 -0000	1.6
***************
*** 61,65 ****
          
          $this->dir_installer                = $this->dir.'installer'.DIRECTORY_SEPARATOR;
!         $this->dir_distributions            = $this->dir.'distributions'.DIRECTORY_SEPARATOR;
          $this->reg_distributions            = $this->dir_installer.'distributions.reg';
          $this->reg_distributions_resolve    = $this->dir_installer.'distributions_resolve.reg';
--- 61,66 ----
          
          $this->dir_installer                = $this->dir.'installer'.DIRECTORY_SEPARATOR;
!         $this->dir_distributions_rel        = 'distributions'.DIRECTORY_SEPARATOR;
!         $this->dir_distributions            = $this->dir.$this->dir_distributions_rel;
          $this->reg_distributions            = $this->dir_installer.'distributions.reg';
          $this->reg_distributions_resolve    = $this->dir_installer.'distributions_resolve.reg';
***************
*** 92,96 ****
          
          $this->distribution = $distribution;
!         $this->distribution_path = $this->dir_distributions.$distribution.DIRECTORY_SEPARATOR;
          
          // Unset previous settings
--- 93,98 ----
          
          $this->distribution = $distribution;
!         $this->distribution_path_rel = $this->dir_distributions_rel.$this->distribution.DIRECTORY_SEPARATOR;
!         $this->distribution_path = $this->dir_distributions.$this->distribution.DIRECTORY_SEPARATOR;
          
          // Unset previous settings
***************
*** 115,119 ****
          // test if "-" for version is contained
          $this->application = $application;
!         $this->application_path = $this->distribution_path.'applications'.DIRECTORY_SEPARATOR.$application.DIRECTORY_SEPARATOR;
          
          /*
--- 117,122 ----
          // test if "-" for version is contained
          $this->application = $application;
!         $this->application_path_rel = $this->distribution_path_rel.'applications'.DIRECTORY_SEPARATOR.$this->application.DIRECTORY_SEPARATOR;
!         $this->application_path = $this->distribution_path.'applications'.DIRECTORY_SEPARATOR.$this->application.DIRECTORY_SEPARATOR;
          
          /*
***************
*** 134,137 ****
--- 137,145 ----
          return $this->application_path;
      }
+     
+     function getApplicationPathRel()
+     {
+         return $this->application_path_rel;
+     }
      /*
      function registerDistribution($name)

Index: Setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Setup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Setup.php	4 Jan 2004 17:11:34 -0000	1.2
--- Setup.php	14 Jan 2004 15:40:55 -0000	1.3
***************
*** 173,177 ****
      }
      
!     function getInitDir()
      {
          return $this->init_dir;
--- 173,177 ----
      }
      
!     function getDataDir()
      {
          return $this->init_dir;
***************
*** 183,187 ****
      }
      
!     function getDataDir()
      {
          if(!strlen($this->data_dir)){
--- 183,187 ----
      }
      
!     function getInstallerDataDir()
      {
          if(!strlen($this->data_dir)){

Index: package.xml
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/package.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** package.xml	4 Jan 2004 13:26:55 -0000	1.2
--- package.xml	14 Jan 2004 15:40:55 -0000	1.3
***************
*** 28,31 ****
--- 28,34 ----
  - moved FileReplace.php to separate package com.zzoss.filereplace.lib
  - fixed bug in ZZOSS_InstallerUtils::dowlnoadFile() which mistakedly chopped of last directory from a path
+ - fixed bug in ZZOSS_InstallerRegistry::refreshApplications() which caused installer to always switch to first application during installation process, see http://sourceforge.net/tracker/index.php?func=detail&aid=867719&group_id=95735&atid=612476
+ - use DIRECTORY_SEPARATOR in ZZOSS_InstallerUtils::copy_rec()
+ - added ZZOSS_InstallerRegistry::getApplicationPathRel();
  ]]>
          </notes>




-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html