gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-28 02:20:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of pear directory

Browse Source
This commit is contained in:
Uwe Steinmann 2025-09-20 21:48:07 +02:00
parent 3d73dc8279
commit bef3b62f5a
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.xml
View File

@ -36,7 +36,8 @@
<include name="install/**" /> <include name="install/**" />
<include name="restapi/**" /> <include name="restapi/**" />
<include name="pdfviewer/**" /> <include name="pdfviewer/**" />
<include name="index.php" /> <include name="www/ext/example/**" />
<include name="www/index.php" />
<include name="CHANGELOG" /> <include name="CHANGELOG" />
<include name=".htaccess" /> <include name=".htaccess" />
<include name="LICENSE" /> <include name="LICENSE" />
@ -129,7 +130,7 @@
<mkdir dir="${builddir}/export/${shortversion}/data/backup" /> <mkdir dir="${builddir}/export/${shortversion}/data/backup" />
<mkdir dir="${builddir}/export/${shortversion}/data/lucene" /> <mkdir dir="${builddir}/export/${shortversion}/data/lucene" />
<mkdir dir="${builddir}/export/${shortversion}/data/staging" /> <mkdir dir="${builddir}/export/${shortversion}/data/staging" />
<mkdir dir="${builddir}/export/${shortversion}/pear" /> <!-- mkdir dir="${builddir}/export/${shortversion}/pear" / -->
<mkdir dir="${builddir}/export/${shortversion}/www" /> <mkdir dir="${builddir}/export/${shortversion}/www" />
<mkdir dir="${builddir}/export/${shortversion}/www/ext" /> <mkdir dir="${builddir}/export/${shortversion}/www/ext" />
<mkdir dir="${builddir}/export/${shortversion}/seeddms-${version}" /> <mkdir dir="${builddir}/export/${shortversion}/seeddms-${version}" />
@ -150,11 +151,11 @@
<copy todir="${builddir}/export/${shortversion}/seeddms-${version}"> <copy todir="${builddir}/export/${shortversion}/seeddms-${version}">
<fileset refid="distfiles" /> <fileset refid="distfiles" />
</copy> </copy>
<copy todir="${builddir}/export/${shortversion}/pear/vendor"> <!-- copy todir="${builddir}/export/${shortversion}/pear/vendor">
<fileset dir="${srcdir}/vendor" defaultexcludes="false" /> <fileset dir="${srcdir}/vendor" defaultexcludes="false" />
</copy> </copy -->
<copy todir="${builddir}/export/${shortversion}/www/ext/example"> <copy todir="${builddir}/export/${shortversion}/www/ext/example">
<fileset dir="${srcdir}/ext/example" defaultexcludes="false" /> <fileset dir="${srcdir}/www/ext/example" defaultexcludes="false" />
</copy> </copy>
<!-- copy todir="${builddir}/export/${shortversion}/pear/SeedDMS"> <!-- copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
<fileset dir="SeedDMS_Core"> <fileset dir="SeedDMS_Core">
@ -185,10 +186,10 @@
<include name="Tools/**" /> <include name="Tools/**" />
</fileset> </fileset>
</copy --> </copy -->
<copy tofile="${builddir}/export/${shortversion}/pear/composer.json" file="composer-dist.json"> <copy tofile="${builddir}/export/${shortversion}/composer.json" file="composer-dist.json">
</copy> </copy>
<phingcall target="composer"> <phingcall target="composer">
<property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/pear/" /> <property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/" />
<property name="composer_envv" value="COMPOSER=${srcdir}/composer-dist.json" /> <property name="composer_envv" value="COMPOSER=${srcdir}/composer-dist.json" />
</phingcall> </phingcall>
<exec command="cd ${builddir}/export/${shortversion} &amp;&amp; ln -s seeddms-${version} seeddms" /> <exec command="cd ${builddir}/export/${shortversion} &amp;&amp; ln -s seeddms-${version} seeddms" />

8
inc/inc.Settings.php
View File

@ -60,7 +60,7 @@ if($settings->_dbDriver == 'sqlite' && empty($settings->_dbDatabase)) {
$settings->_dbDatabase = $__datadir."/content.db"; $settings->_dbDatabase = $__datadir."/content.db";
} }
ini_set('include_path', $settings->_rootDir.'pear'. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_rootDir.'..'. PATH_SEPARATOR .ini_get('include_path'));
if(!empty($settings->_extraPath)) { if(!empty($settings->_extraPath)) {
ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
} }
@ -75,12 +75,8 @@ if(isset($settings->_maxExecutionTime)) {
* relative to it. * relative to it.
*/ */
ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_path'));
/* Add root Dir.'../pear'. Needed because the SeedDMS_Core, etc. are included
* relative to it.
*/
ini_set('include_path', $settings->_rootDir.'../pear'. PATH_SEPARATOR .ini_get('include_path'));
/* composer is installed in pear directory, but install tool does not need it */ /* composer is installed in vendor directory, but install tool does not need it */
if(!defined("SEEDDMS_INSTALL")) if(!defined("SEEDDMS_INSTALL"))
require_once 'vendor/autoload.php'; require_once 'vendor/autoload.php';