Commit 477f6997 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into 4901PdfSplit

# Conflicts:
#	extension/Documentation/Manual.rst
parents e2a701f3 a6622ff1
/.python_virtualenv
/.plantuml_install
# Created by .ignore support plugin (hsz.mobi)
.python_virtualenv/
.virtual_env
.bowerpackages
.doc_plantuml
.idea
.npmpackages
.phpdocinstall
.plantuml
.plantuml_install
.python_virtualenv
.sonar_scanner
.support
.support_plantuml
.support_sonar
test.json
test.php
*.autosave
/bower_components
/composer.phar
/css
/dist/
/doc/*.pdf
/.doc_plantuml
/.support
/.support_plantuml
/.plantuml
/doc/jsdoc
/doc/phpdoc
/doc/plantuml
/extension/Documentation/_make/build
/doc/phpdoc
/.idea
/extension/Documentation/html
/extension/Resources/Private/vendor
/extension/Resources/Public/Css
/extension/Resources/Public/fonts
/extension/Resources/Public/JavaScript
/fonts
/js
/node_modules
/packages
/bower_components
# Created by .ignore support plugin (hsz.mobi)
/.bowerpackages
/.npmpackages
/.phpdocinstall
/js
/css
/fonts
/qfq.flowchart.dia.autosave
/support
/extension/Resources/Public/fonts
/extension/Resources/Public/JavaScript
/extension/Resources/Public/Css
/doc/jsdoc
/dist/
.python_virtualenv/
.virtual_env
/.support_sonar
/.sonar_scanner
/vendor
before_script:
- VERSION=`cat ./version`
snapshot:
except:
- tags
script:
- make VERSION=$VERSION snapshot
- chmod a+r qfq_$VERSION_*.zip
- scp qfq_$VERSION_*.zip w16:qfq/snapshots/
release:
only:
- tags
script:
- make VERSION=$VERSION release
- chmod a+r qfq_$VERSION_*.zip
- scp qfq_$VERSION_*.zip w16:qfq/releases/
This diff is collapsed.
......@@ -11,6 +11,7 @@ module.exports = function (grunt) {
'javascript/src/*.js'
];
var js_plugins = 'javascript/src/Plugins/*.js';
var js_worker = 'javascript/src/Worker/*.js';
// Project configuration.
grunt.initConfig({
......@@ -19,7 +20,7 @@ module.exports = function (grunt) {
bootstrap: {
files: [
{
cwd: 'bower_components/bootstrap/dist/css/',
cwd: 'node_modules/bootstrap/dist/css/',
src: [
'bootstrap.min.css',
'bootstrap-theme.min.css'
......@@ -30,7 +31,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/js/',
cwd: 'node_modules/bootstrap/dist/js/',
src: [
'bootstrap.min.js'
],
......@@ -39,7 +40,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/fonts/',
cwd: 'node_modules/bootstrap/dist/fonts/',
expand: true,
src: [
'*'
......@@ -52,7 +53,7 @@ module.exports = function (grunt) {
bootstrap_dev: {
files: [
{
cwd: 'bower_components/bootstrap/dist/css/',
cwd: 'node_modules/bootstrap/dist/css/',
src: [
'bootstrap.min.css',
'bootstrap-theme.min.css'
......@@ -63,7 +64,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/js/',
cwd: 'node_modules/bootstrap/dist/js/',
src: [
'bootstrap.min.js'
],
......@@ -72,7 +73,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap/dist/fonts/',
cwd: 'node_modules/bootstrap/dist/fonts/',
expand: true,
src: [
'*'
......@@ -85,7 +86,7 @@ module.exports = function (grunt) {
bootstrap_validator: {
files: [
{
cwd: 'bower_components/bootstrap-validator/dist/',
cwd: 'node_modules/bootstrap-validator/dist/',
src: [
'validator.min.js'
],
......@@ -94,7 +95,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/bootstrap-validator/dist/',
cwd: 'node_modules/bootstrap-validator/dist/',
src: [
'validator.min.js'
],
......@@ -107,7 +108,7 @@ module.exports = function (grunt) {
jquery: {
files: [
{
cwd: 'bower_components/jquery/dist/',
cwd: 'node_modules/jquery/dist/',
src: [
'jquery.min.js'
],
......@@ -116,7 +117,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jquery/dist/',
cwd: 'node_modules/jquery/dist/',
src: [
'jquery.min.js'
],
......@@ -129,20 +130,22 @@ module.exports = function (grunt) {
jquery_tablesorter: {
files: [
{
cwd: 'bower_components/tablesorter/dist/js/',
cwd: 'node_modules/tablesorter/dist/js/',
src: [
'jquery.tablesorter.min.js'
'jquery.tablesorter.combined.min.js',
'extras/jquery.tablesorter.pager.min.js',
'widgets/widget-columnSelector.min.js'
],
expand: true,
dest: typo3_js,
flatten: true
},
{
cwd: 'bower_components/tablesorter/dist/js/',
cwd: 'node_modules/tablesorter/dist/js/',
src: [
'jquery.tablesorter.min.js',
'jquery.tablesorter.widgets.min.js',
'widgets/widget-grouping.min.js'
'jquery.tablesorter.combined.min.js',
'extras/jquery.tablesorter.pager.min.js',
'widgets/widget-columnSelector.min.js'
],
expand: true,
dest: 'js/',
......@@ -153,7 +156,7 @@ module.exports = function (grunt) {
ChartJS: {
files: [
{
cwd: 'bower_components/Chart.js/dist/',
cwd: 'node_modules/chart.js/dist/',
src: [
'Chart.min.js'
],
......@@ -162,7 +165,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/Chart.js/dist/',
cwd: 'node_modules/chart.js/dist/',
src: [
'Chart.min.js'
],
......@@ -175,7 +178,7 @@ module.exports = function (grunt) {
jqwidgets: {
files: [
{
cwd: 'bower_components/jqwidgets/jqwidgets/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/',
src: [
'jqx-all.js',
'globalization/globalize.js'
......@@ -185,7 +188,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'jqx.base.css',
'jqx.bootstrap.css'
......@@ -195,7 +198,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'images/**'
],
......@@ -207,7 +210,7 @@ module.exports = function (grunt) {
jqwidgets_devel: {
files: [
{
cwd: 'bower_components/jqwidgets/jqwidgets/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/',
src: [
'jqx-all.js',
'globalization/globalize.js'
......@@ -217,7 +220,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'jqx.base.css',
'jqx.bootstrap.css'
......@@ -227,7 +230,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/jqwidgets/jqwidgets/styles/',
cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [
'images/**'
],
......@@ -239,7 +242,7 @@ module.exports = function (grunt) {
tinymce: {
files: [
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'tinymce.min.js'
],
......@@ -248,7 +251,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'themes/*/theme.min.js',
'plugins/*/plugin.min.js',
......@@ -263,7 +266,7 @@ module.exports = function (grunt) {
tinymce_devel: {
files: [
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'tinymce.min.js'
],
......@@ -272,7 +275,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/tinymce/',
cwd: 'node_modules/tinymce/',
src: [
'themes/*/theme.min.js',
'plugins/*/plugin.min.js',
......@@ -287,7 +290,7 @@ module.exports = function (grunt) {
eventEmitter: {
files: [
{
cwd: 'bower_components/eventEmitter/',
cwd: 'node_modules/wolfy87-eventemitter/',
src: [
'EventEmitter.min.js'
],
......@@ -296,7 +299,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/eventEmitter/',
cwd: 'node_modules/wolfy87-eventemitter/',
src: [
'EventEmitter.min.js'
],
......@@ -331,7 +334,7 @@ module.exports = function (grunt) {
typeahead: {
files: [
{
cwd: 'bower_components/corejs-typeahead/dist',
cwd: 'node_modules/corejs-typeahead/dist',
src: [
"typeahead.bundle.min.js"
],
......@@ -340,7 +343,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/corejs-typeahead/dist',
cwd: 'node_modules/corejs-typeahead/dist',
src: [
"typeahead.bundle.min.js"
],
......@@ -353,7 +356,7 @@ module.exports = function (grunt) {
codemirror: {
files: [
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.js"
],
......@@ -362,7 +365,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.js"
],
......@@ -371,7 +374,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.css"
],
......@@ -380,7 +383,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/lib',
cwd: 'node_modules/codemirror/lib',
src: [
"codemirror.css"
],
......@@ -389,7 +392,7 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'bower_components/codemirror/mode',
cwd: 'node_modules/codemirror/mode',
src: [
"**"
],
......@@ -398,7 +401,7 @@ module.exports = function (grunt) {
flatten: false
},
{
cwd: 'bower_components/codemirror/mode',
cwd: 'node_modules/codemirror/mode',
src: [
"**"
],
......@@ -424,6 +427,28 @@ module.exports = function (grunt) {
flatten: true
}
]
},
worker: {
files: [
{
src: js_worker,
expand: true,
dest: "js/Worker/",
flatten: true
},
{
src: js_worker,
expand: true,
dest: typo3_js,
flatten: true
},
{
src: js_worker,
expand: true,
dest: "mockup/Worker/",
flatten: true
}
]
}
},
uglify: {
......@@ -492,8 +517,9 @@ module.exports = function (grunt) {
production: {
files: {
"extension/Resources/Public/Css/qfq-bs.css": "less/qfq-bs.css.less",
"extension/Resources/Public/Css/qfq-letter.css": "less/qfq-letter.css.less",
"extension/Resources/Public/Css/qfq-plain.css": "less/qfq-plain.css.less",
"extension/Resources/Public/Css/bs-tablesorter.css": "less/bs-tablesorter.less"
"extension/Resources/Public/Css/tablesorter-bootstrap.css": "less/tablesorter-bootstrap.less"
},
options: {
compress: true
......@@ -502,8 +528,9 @@ module.exports = function (grunt) {
devel: {
files: {
"css/qfq-bs.css": "less/qfq-bs.css.less",
"css/qfq-letter.css": "less/qfq-letter.css.less",
"css/qfq-plain.css": "less/qfq-plain.css.less",
"css/bs-tablesorter.css": "less/bs-tablesorter.less"
"css/tablesorter-bootstrap.css": "less/tablesorter-bootstrap.less"
},
options: {
banner: "/* Change qfq-bs.css.less, not qfq-bs.css */"
......
PHPDOC ?= support/pear/phpdoc
JSDOC ?= jsdoc
SONAR_SCANNER_VERSION = 3.0.3.778
PKG_VERSION = $(shell awk '/version/ { print $$3 }' extension/ext_emconf.php | sed "s/'//g")
NIGHTLY_DATE = $(shell date '+%Y%m%d')
......@@ -11,7 +6,7 @@ RELEASE_DATE = $(shell date '+%Y%m%d%H%M')
GIT_REVISION_SHORT = $(shell git rev-parse --short HEAD || true)
GIT_REVISION_LONG = $(shell git rev-parse HEAD || true)
EXTENSION_CONTENT = Classes Configuration Documentation qfq Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png config.qfq.example.ini RELEASE.txt
EXTENSION_CONTENT = Classes Configuration Documentation qfq Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png ext_conf_template.txt config.qfq.example.php RELEASE.txt
DISTDIR=dist
......@@ -20,22 +15,26 @@ PIP_TMP ?= /tmp
all: archive t3sphinx
doc: phpdoc jsdoc plantuml
maintainer-clean:
rm -f .bowerpackages .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
rm -rf doc/jsdoc doc/phpdoc doc/plantuml support bower_components node_modules .python_virtualenv build-dist
rm -f .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
rm -rf doc/jsdoc doc/phpdoc doc/plantuml support node_modules .python_virtualenv build-dist
archive: clean qfq.zip
qfq.zip:
cd extension/Resources/Private/vendor/phpoffice; rm -rf phpspreadsheet/{C*,bin,c*,d*,m*,p*,sa*,.g*,.p*,.s*,.t*}
cd extension; zip -r ../$@ $(EXTENSION_CONTENT)
clean:
cd doc/diagram ; $(MAKE) $@
update-qfq-doc:
rsync -av --delete --exclude=_make --exclude=_static extension/Documentation/ ../qfq-doc/Documentation/
update-qfq-doc:
rsync -av --delete --exclude=_make --exclude=_static extension/Documentation/ ../qfq-doc/Documentation/; \
cd ../qfq-doc/; \
git commit -a; \
git push
wget -O /dev/null https://docs.typo3.org/~mbless/github.com/T3DocumentationStarter/Public-Info-053.git.make/request_rebuild.php
git-revision: make-dist-dir
echo $(GIT_REVISION_LONG) > $(DISTDIR)/revision.git
......@@ -57,13 +56,13 @@ dist-copy-extension:
build-dist: t3sphinx make-dist-dir dist-copy-extension dist-move-doc git-revision
echo "Distribution made in $(DIST)"
nightly: bootstrap build-dist
nightly: basic build-dist
cd $(DISTDIR); zip -r ../qfq_$(VERSION)_$(RELEASE_DATE).zip $(EXTENSION_CONTENT) revision.git -x config.ini
snapshot: bootstrap build-dist
snapshot: basic build-dist
cd $(DISTDIR) ; zip -r ../qfq_$(VERSION)_$(RELEASE_DATE).zip $(EXTENSION_CONTENT) revision.git -x config.ini
release: bootstrap build-dist
release: basic build-dist
if [ -z "$(VERSION)" ] ; then echo "Set VERSION make variable to the release version (fmt: maj.min.micro)" ; exit 1 ; fi
cd $(DISTDIR) ; zip -r "../qfq_$(VERSION)_$(RELEASE_DATE).zip" $(EXTENSION_CONTENT) revision.git -x config.ini
......@@ -73,31 +72,16 @@ t3sphinx: .virtual_env
plantuml:
cd doc/diagram ; $(MAKE)
bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install .virtual_env .sonar_scanner
bootstrap: .npmpackages .plantuml_install .virtual_env
npm update
bower update
grunt default
composer update
cd extension/Resources/Private; composer update
jsdoc: .npmpackages
$(JSDOC) -c JSDocConf.json
phpdoc: .phpdocinstall
$(PHPDOC)
.phpdocinstall: .support
if [ ! -f "`pwd`/support/pear.config" ]; then \
pear config-create "`pwd`/support" "`pwd`/support/pear.config" ; \
pear -c "`pwd`/support/pear.config" channel-discover pear.phpdoc.org ; \
fi
pear -c "`pwd`/support/pear.config" install --alldeps phpDocumentor
touch $@
.sonar_scanner: .support_sonar
cd support/sonar ;\
wget https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$(SONAR_SCANNER_VERSION)-linux.zip ;\
unzip -o sonar-scanner-cli-$(SONAR_SCANNER_VERSION)-linux.zip
touch $@
basic: .npmpackages .virtual_env
npm update
grunt default
cd extension/Resources/Private; composer update; cd vendor/phpoffice/phpspreadsheet; rm -rf .github bin docs samples .g* .s* .t* C* c* m* p*
.plantuml_install: .support_plantuml
wget --no-check-certificate -O support/plantuml/plantuml.jar 'https://downloads.sourceforge.net/project/plantuml/plantuml.jar'
......@@ -105,15 +89,9 @@ phpdoc: .phpdocinstall
.npmpackages: package.json
npm ls -g grunt-cli 2>/dev/null || { echo "Please install grunt-cli npm package using 'npm install -g grunt-cli'" 1>&2 ; exit 1; }
npm ls -g jsdoc 2>/dev/null || { echo "Please install jsdoc npm package using 'npm install -g jsdoc'" 1>&2 ; exit 1; }
npm ls -g bower 2>/dev/null || { echo "Please install bower npm package using 'npm install -g bower'" 1>&2 ; exit 1; }
npm install
touch $@
.bowerpackages: bower.json
bower --silent install
touch $@
.support:
mkdir -p support
touch $@
......@@ -122,10 +100,6 @@ phpdoc: .phpdocinstall
mkdir -p support/plantuml
touch $@
.support_sonar: .support
mkdir -p support/sonar
touch $@
.virtual_env: pip-temp-directory
virtualenv .python_virtualenv
. .python_virtualenv/bin/activate ; TMPDIR="$(PIP_TMP)" pip install --upgrade sphinx==1.5.5
......@@ -134,13 +108,9 @@ phpdoc: .phpdocinstall
pip-temp-directory:
test -d "$(PIP_TMP)" || mkdir -p "$(PIP_TMP)"
sonar: .sonar_scanner
support/sonar/sonar-scanner-$(SONAR_SCANNER_VERSION)-linux/bin/sonar-scanner
.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension pip-temp-directory plantuml sonar
copyReleasNotes:
copyReleaseNotes:
cp extension/Documentation/Release.rst extension/RELEASE.txt
cp extension/Documentation/Release.rst CHANGELOG.md
[![pipeline status](https://git.math.uzh.ch/typo3/qfq/badges/master/pipeline.svg)](https://git.math.uzh.ch/typo3/qfq/commits/master)
QFQ: Quick Form Query - Typo3 Extbase Extension
===============================================
......
{
"name": "qfq",
"authors": [
"Carsten Rose <carsten.rose@math.uzh.ch>"
],
"description": "",
"main": "",
"moduleType": [],
"license": "MIT",
"homepage": "",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"bootstrap": "^3.3.6",
"jqwidgets": "4.2.1",
"tablesorter": "jquery.tablesorter#^2.25.6",
"eventEmitter": "^4.3.0",
"bootstrap-validator": "^0.11.5",
"Chart.js": "^2.1.2",
"tinymce": "tinymce-dist#^4.4.3",
"corejs-typeahead": "^1.1.1",
"codemirror": "^5.24.0"
}
}
{
"require-dev": {
"phpunit/phpunit": "^6.5"
}
}
This diff is collapsed.
Setup
==
=====
Include the main CodeMirror JavaScript in the HTML source:
......@@ -9,7 +9,7 @@ Add the class `qfq-codemirror` to a `<textarea>` element. This class marks the e
.Helper.codemirror()`.
Configuration
<