gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2023-01-21 13:33:54 +01:00
commit e34830a53e
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -91,7 +91,8 @@ apidoc:
# line break. Result is put back # line break. Result is put back
# into the original format by replacing all '|' by newline. # into the original format by replacing all '|' by newline.
# #
PKGFILE=SeedDMS_Core/package.xml
changelog: changelog:
@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.preRC]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n' @sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' ${PKGFILE} | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.preRC]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
.PHONY: doc webdav webapp repository changelog .PHONY: doc webdav webapp repository changelog

4
build.xml
View File

@ -151,7 +151,7 @@
<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}/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">
<include name="Core/**" /> <include name="Core/**" />
<include name="Core.php" /> <include name="Core.php" />
@ -179,7 +179,7 @@
<fileset dir="../seeddms-ext/http_webdav_server"> <fileset dir="../seeddms-ext/http_webdav_server">
<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}/pear/composer.json" file="composer-dist.json">
</copy> </copy>
<phingcall target="composer"> <phingcall target="composer">

13
composer-dist.json
View File

@ -19,7 +19,11 @@
"dragonmantank/cron-expression": "^2.2", "dragonmantank/cron-expression": "^2.2",
"zf1/zend-search-lucene": "*", "zf1/zend-search-lucene": "*",
"symfony/http-foundation": "^5.4", "symfony/http-foundation": "^5.4",
"seeddms/core": "dev-master" "seeddms/core": "dev-master",
"seeddms/lucene": "dev-master",
"seeddms/preview": "dev-master",
"seeddms/sqlitefts": "dev-master",
"seeddms/http_webdav_server": "dev-master"
}, },
"repositories": [ "repositories": [
{ {
@ -49,6 +53,13 @@
"options": { "options": {
"symlink": false "symlink": false
} }
},
{
"type": "path",
"url": "/home/cvs/seeddms-ext/http_webdav_server",
"options": {
"symlink": false
}
} }
] ]

2
inc/inc.FulltextInit.php
View File

@ -15,7 +15,7 @@ if($settings->_enableFullSearch) {
); );
$fulltextservice->addService('sqlitefts', $indexconf); $fulltextservice->addService('sqlitefts', $indexconf);
require_once('SeedDMS/SQLiteFTS.php'); require_once('vendor/seeddms/sqlitefts/SQLiteFTS.php');
} elseif($settings->_fullSearchEngine == 'lucene') { } elseif($settings->_fullSearchEngine == 'lucene') {
$indexconf = array( $indexconf = array(
'Indexer' => 'SeedDMS_Lucene_Indexer', 'Indexer' => 'SeedDMS_Lucene_Indexer',

2
webdav/webdav.php
View File

@ -1,6 +1,6 @@
<?php <?php
require_once "HTTP/WebDAV/Server.php"; require_once "vendor/seeddms/http_webdav_server/HTTP/WebDAV/Server.php";
/** /**
* SeedDMS access using WebDAV * SeedDMS access using WebDAV