Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Solved #880

Browse source
This commit is contained in:
tomas 2005-05-01 17:17:49 +00:00
parent c9e69334a4
commit 5001ed991a
3 changed files with 44 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/modules/archiveServer/var/conf.php.template
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.4 $ Version : $Revision: 1.5 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php.template,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php.template,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -82,7 +82,7 @@ $config = array(
'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer', 'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans', 'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans',
'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access', 'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access',
'pearPath' => 'ls_install_dir/lib/php/php', 'pearPath' => 'ls_install_dir/usr/lib/php/php',
'isArchive' => TRUE, 'isArchive' => TRUE,
'validate' => TRUE, 'validate' => TRUE,
'useTrash' => FALSE, 'useTrash' => FALSE,

4
livesupport/modules/storageServer/var/conf.php.template
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.5 $ Version : $Revision: 1.6 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php.template,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php.template,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -88,7 +88,7 @@ $config = array(
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
'pearPath' => 'ls_install_dir/lib/php/php', 'pearPath' => 'ls_install_dir/usr/lib/php/php',
'isArchive' => FALSE, 'isArchive' => FALSE,
'validate' => TRUE, 'validate' => TRUE,
'useTrash' => TRUE, 'useTrash' => TRUE,

71
livesupport/tools/pear/bin/install.sh
View file

@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# #
# Author : $Author: maroy $ # Author : $Author: tomas $
# Version : $Revision: 1.2 $ # Version : $Revision: 1.3 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -32,47 +32,56 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
description="PEAR packages needed by LiveSupport" description="PEAR packages needed by LiveSupport"
#PEAR-1.4.0a11.tgz #PEAR-1.4.0a11
packages=" packages="
Archive_Tar-1.3.1.tgz Archive_Tar-1.3.1
Console_Getopt-1.2.tgz Console_Getopt-1.2
XML_RPC-1.3.0RC1.tgz XML_RPC-1.3.0RC1
PEAR-1.3.5.tgz PEAR-1.3.5
Calendar-0.5.2.tgz Calendar-0.5.2
DB-1.7.6.tgz DB-1.7.6
File-1.2.0.tgz File-1.2.0
File_Find-0.3.1.tgz File_Find-0.3.1
HTML_Common-1.2.1.tgz HTML_Common-1.2.1
HTML_QuickForm-3.2.4pl1.tgz HTML_QuickForm-3.2.4pl1
XML_Util-1.1.1.tgz XML_Util-1.1.1
XML_Parser-1.2.6.tgz XML_Parser-1.2.6
XML_Beautifier-1.1.tgz XML_Beautifier-1.1
XML_Serializer-0.15.0.tgz XML_Serializer-0.15.0
" "
reldir=`dirname $0`/.. reldir=`dirname $0`/..
basedir=`cd $reldir; pwd;` basedir=`cd $reldir; pwd;`
rootdir=`cd $basedir/../..; pwd;`
tmpdir=$basedir/tmp
etcdir=$basedir/etc etcdir=$basedir/etc
usrdir=$rootdir/usr srcdir=$basedir/src
echo "installing $description (with rootdir: $rootdir)" dest_usrdir=`cd $basedir/../../usr; pwd;`
destdir=$dest_usrdir/lib/php
mkdir -p $destdir
mkdir -p $destdir/etc
cd $basedir/src echo "configuring $description (with destdir: $destdir)"
configtemplate=$etcdir/pear.conf.template
configfile=$destdir/etc/pear.conf
pearcmd="pear -c $configtemplate"
cp $configtemplate $configfile
$pearcmd config-set php_dir $destdir/php || exit 1
$pearcmd config-set bin_dir $destdir/bin || exit 1
$pearcmd config-set doc_dir $destdir/php/docs || exit 1
$pearcmd config-set data_dir $destdir/php/data || exit 1
$pearcmd config-set cache_dir $destdir/php/cache || exit 1
$pearcmd config-set test_dir $destdir/php/tests || exit 1
#$pearcmd config-show; exit
echo "installing $description (with destdir: $destdir)"
cd $srcdir
for i in $packages for i in $packages
do echo $i do echo $i
pear install -R $rootdir $i || \ $pearcmd install $i.tgz || \
{ echo "*** ERROR installing $i"; exit 1; } { echo "*** ERROR installing $i"; exit 1; }
done done
# ugly work-around, as some system install the modules under
# usr/share/pear, but we're expecting it to be at usr/lib/php
if [ -d $usrdir/share/pear ]; then
rm -rf $usrdir/lib/php
mv -f $usrdir/share/pear $usrdir/lib/php
fi
echo "PEAR packages install finished OK" echo "PEAR packages install finished OK"
exit 0 exit 0