gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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 2020-10-21 09:37:46 +02:00
commit 71d9e14d69
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -175,7 +175,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}] }]
}, },
'coreui': { 'tdk': {
files: [{ files: [{
expand: true, expand: true,
src: [ src: [

18
Makefile
View File

@ -1,8 +1,8 @@
VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();') VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();')
SRC=CHANGELOG inc conf utils index.php .htaccess languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer SRC=CHANGELOG inc conf utils index.php .htaccess languages op out controllers doc TODO LICENSE webdav install restapi pdfviewer
# webapp VIEWS ?= bootstrap
NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca views/tdk NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore
EXTENSIONS := \ EXTENSIONS := \
dynamic_content.tar.gz\ dynamic_content.tar.gz\
@ -15,8 +15,18 @@ PHPDOC=~/Downloads/phpDocumentor.phar
dist: dist:
mkdir -p tmp/seeddms-$(VERSION) mkdir -p tmp/seeddms-$(VERSION)
cp -a $(SRC) tmp/seeddms-$(VERSION) cp -a $(SRC) tmp/seeddms-$(VERSION)
mkdir -p tmp/seeddms-$(VERSION)/views
mkdir -p tmp/seeddms-$(VERSION)/styles
for view in $(VIEWS) ; do \
if [ -d "views/$$view" ] ; then \
cp -a views/$$view tmp/seeddms-$(VERSION)/views ; \
fi ; \
if [ -d "styles/$$view" ] ; then \
cp -a styles/$$view tmp/seeddms-$(VERSION)/styles ; \
fi ; \
done
(cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES); mv conf conf.template) (cd tmp/seeddms-$(VERSION); rm -rf $(NODISTFILES); mv conf conf.template)
(cd tmp; tar --exclude=.svn --exclude=.gitignore --exclude=views/blue --exclude=views/hc --exclude=views/clean --exclude=styles/blue --exclude=styles/hc --exclude=styles/clean -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION)) (cd tmp; tar --exclude=.svn --exclude=.gitignore -czvf ../seeddms-$(VERSION).tar.gz seeddms-$(VERSION))
rm -rf tmp rm -rf tmp
pear: pear: