|
From: Benjamin C. <bc...@us...> - 2005-06-04 21:48:36
|
Update of /cvsroot/phpbt/phpbt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14125 Modified Files: INSTALL UPGRADING config-dist.php config.php include.php install.php Log Message: Updated upgrade and install stuff Index: INSTALL =================================================================== RCS file: /cvsroot/phpbt/phpbt/INSTALL,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- INSTALL 28 Feb 2002 18:55:41 -0000 1.14 +++ INSTALL 4 Jun 2005 21:48:26 -0000 1.15 @@ -1,5 +1,9 @@ Ok, here's the quick and dirty install instructions: +Required: You must have PEAR and PEAR DB installed. If PEAR is not in the +include path, edit install.php in the test_database function, supplying the full +path to PEAR for the PEAR_PATH constant. + Optional: Install JpGraph (http://www.aditus.nu/jpgraph/) if you wish to use it. 1. Copy the directory tree from the tarball to a location suitable for serving @@ -7,7 +11,7 @@ 2. With your web browser, go the location where you installed the package. You will be presented with a web page that will help you configure and - install the application. + install the application. 3. After completing the installation, login and start reporting bugs. Index: UPGRADING =================================================================== RCS file: /cvsroot/phpbt/phpbt/UPGRADING,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- UPGRADING 25 Oct 2004 12:06:54 -0000 1.13 +++ UPGRADING 4 Jun 2005 21:48:26 -0000 1.14 @@ -1,8 +1,12 @@ +First, backup your database! This upgrade should go smoothly, but +if it doesn't, it's better to be safe than sorry. + Upgrading from 0.9.1 to 1.0 --------------------------- -First, backup your database! This upgrade should go smoothly, but -if it doesn't, it's better to be safe than sorry. +PEAR and PEAR DB have been removed from the distribution, so they must either +be available in the include path (system-wide install of PEAR) or their location +should be specified in the PEAR_PATH constant definition in config-dist.php Following the steps below will upgrade your installation of phpBT. @@ -14,3 +18,19 @@ 3. After running that script your installation has been upgraded. 4. Either copy the files from the new installation over the old one, or point your users to the new location. + +Upgrading from 1.0 RCx to 1.0 RC6 +--------------------------------- + +PEAR and PEAR DB have been removed as of RC 6, so they must either be available +in the include path (system-wide install of PEAR) or their location should be +specified in the PEAR_PATH constant definition in config-dist.php. + +Using the directory where you unpacked the new set of files... +1. Edit config-dist.php, changing the database settings to match those from + your old config.php (DB_* and TBL_PREFIX constants). Save + config-dist.php as config.php. +2. Either copy the files from the new installation over the old one, or + point your users to the new location. + +There is no need to run the upgrade script. The upgrade is complete. Index: config-dist.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- config-dist.php 4 Jun 2005 19:07:38 -0000 1.29 +++ config-dist.php 4 Jun 2005 21:48:26 -0000 1.30 @@ -62,10 +62,11 @@ define ('TBL_PROJECT_GROUP', TBL_PREFIX.'project_group'); define ('TBL_PROJECT_PERM', TBL_PREFIX.'project_perm'); define ('TBL_DATABASE', TBL_PREFIX.'database_server'); -define ('TBL_SITE', TBL_PREFIX.'site'); +define ('TBL_SITE', TBL_PREFIX.'site'); define ('ONEDAY', 86400); +define('PEAR_PATH', '{PEAR_PATH}'); // Set this to '/some/path/' to not use system-wide PEAR require_once (dirname(__FILE__).'/inc/auth.php'); ?> Index: config.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/config.php,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- config.php 4 Jun 2005 19:02:43 -0000 1.41 +++ config.php 4 Jun 2005 21:48:26 -0000 1.42 @@ -66,6 +66,7 @@ define ('ONEDAY', 86400); +define('PEAR_PATH', ''); // Set this to '/some/path/' to not use system-wide PEAR require_once (dirname(__FILE__).'/inc/auth.php'); ?> Index: include.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/include.php,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- include.php 4 Jun 2005 19:02:43 -0000 1.132 +++ include.php 4 Jun 2005 21:48:26 -0000 1.133 @@ -40,7 +40,6 @@ include ('inc/functions.php'); // PEAR::DB -define('PEAR_PATH', ''); // Set this to '/some/path/' to not use system-wide PEAR require_once(PEAR_PATH.'DB.php'); $dsn = array( 'phptype' => DB_TYPE, Index: install.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/install.php,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- install.php 31 May 2005 18:49:39 -0000 1.45 +++ install.php 4 Jun 2005 21:48:26 -0000 1.46 @@ -154,6 +154,8 @@ $patterns[] = '{'.$key.'}'; $replacements[] = $val; } + $patterns[] = '{PEAR_PATH}'; + $replacements[] = PEAR_PATH; $contents = join('', file('config-dist.php')); return str_replace($patterns, $replacements, $contents); @@ -161,7 +163,7 @@ } function test_database(&$params, $testonly = false) { // PEAR::DB - define('PEAR_PATH', 'inc/pear/'); // Set this to '' to use system-wide PEAR + define('PEAR_PATH', ''); // Set this to '/some/path' to not use system-wide PEAR require_once(PEAR_PATH.'DB.php'); $dsn = array( 'phptype' => $params['db_type'], |