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 # Created by .ignore support plugin (hsz.mobi)
/.plantuml_install .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/*.pdf
/.doc_plantuml /doc/jsdoc
/.support /doc/phpdoc
/.support_plantuml
/.plantuml
/doc/plantuml /doc/plantuml
/extension/Documentation/_make/build /extension/Documentation/_make/build
/doc/phpdoc /extension/Documentation/html
/.idea /extension/Resources/Private/vendor
/extension/Resources/Public/Css
/extension/Resources/Public/fonts
/extension/Resources/Public/JavaScript
/fonts
/js
/node_modules /node_modules
/packages /packages
/bower_components
# Created by .ignore support plugin (hsz.mobi)
/.bowerpackages
/.npmpackages
/.phpdocinstall
/js
/css
/fonts
/qfq.flowchart.dia.autosave /qfq.flowchart.dia.autosave
/support /support
/extension/Resources/Public/fonts /vendor
/extension/Resources/Public/JavaScript
/extension/Resources/Public/Css
/doc/jsdoc
/dist/
.python_virtualenv/
.virtual_env
/.support_sonar
/.sonar_scanner
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) { ...@@ -11,6 +11,7 @@ module.exports = function (grunt) {
'javascript/src/*.js' 'javascript/src/*.js'
]; ];
var js_plugins = 'javascript/src/Plugins/*.js'; var js_plugins = 'javascript/src/Plugins/*.js';
var js_worker = 'javascript/src/Worker/*.js';
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
...@@ -19,7 +20,7 @@ module.exports = function (grunt) { ...@@ -19,7 +20,7 @@ module.exports = function (grunt) {
bootstrap: { bootstrap: {
files: [ files: [
{ {
cwd: 'bower_components/bootstrap/dist/css/', cwd: 'node_modules/bootstrap/dist/css/',
src: [ src: [
'bootstrap.min.css', 'bootstrap.min.css',
'bootstrap-theme.min.css' 'bootstrap-theme.min.css'
...@@ -30,7 +31,7 @@ module.exports = function (grunt) { ...@@ -30,7 +31,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/bootstrap/dist/js/', cwd: 'node_modules/bootstrap/dist/js/',
src: [ src: [
'bootstrap.min.js' 'bootstrap.min.js'
], ],
...@@ -39,7 +40,7 @@ module.exports = function (grunt) { ...@@ -39,7 +40,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/bootstrap/dist/fonts/', cwd: 'node_modules/bootstrap/dist/fonts/',
expand: true, expand: true,
src: [ src: [
'*' '*'
...@@ -52,7 +53,7 @@ module.exports = function (grunt) { ...@@ -52,7 +53,7 @@ module.exports = function (grunt) {
bootstrap_dev: { bootstrap_dev: {
files: [ files: [
{ {
cwd: 'bower_components/bootstrap/dist/css/', cwd: 'node_modules/bootstrap/dist/css/',
src: [ src: [
'bootstrap.min.css', 'bootstrap.min.css',
'bootstrap-theme.min.css' 'bootstrap-theme.min.css'
...@@ -63,7 +64,7 @@ module.exports = function (grunt) { ...@@ -63,7 +64,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/bootstrap/dist/js/', cwd: 'node_modules/bootstrap/dist/js/',
src: [ src: [
'bootstrap.min.js' 'bootstrap.min.js'
], ],
...@@ -72,7 +73,7 @@ module.exports = function (grunt) { ...@@ -72,7 +73,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/bootstrap/dist/fonts/', cwd: 'node_modules/bootstrap/dist/fonts/',
expand: true, expand: true,
src: [ src: [
'*' '*'
...@@ -85,7 +86,7 @@ module.exports = function (grunt) { ...@@ -85,7 +86,7 @@ module.exports = function (grunt) {
bootstrap_validator: { bootstrap_validator: {
files: [ files: [
{ {
cwd: 'bower_components/bootstrap-validator/dist/', cwd: 'node_modules/bootstrap-validator/dist/',
src: [ src: [
'validator.min.js' 'validator.min.js'
], ],
...@@ -94,7 +95,7 @@ module.exports = function (grunt) { ...@@ -94,7 +95,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/bootstrap-validator/dist/', cwd: 'node_modules/bootstrap-validator/dist/',
src: [ src: [
'validator.min.js' 'validator.min.js'
], ],
...@@ -107,7 +108,7 @@ module.exports = function (grunt) { ...@@ -107,7 +108,7 @@ module.exports = function (grunt) {
jquery: { jquery: {
files: [ files: [
{ {
cwd: 'bower_components/jquery/dist/', cwd: 'node_modules/jquery/dist/',
src: [ src: [
'jquery.min.js' 'jquery.min.js'
], ],
...@@ -116,7 +117,7 @@ module.exports = function (grunt) { ...@@ -116,7 +117,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/jquery/dist/', cwd: 'node_modules/jquery/dist/',
src: [ src: [
'jquery.min.js' 'jquery.min.js'
], ],
...@@ -129,20 +130,22 @@ module.exports = function (grunt) { ...@@ -129,20 +130,22 @@ module.exports = function (grunt) {
jquery_tablesorter: { jquery_tablesorter: {
files: [ files: [
{ {
cwd: 'bower_components/tablesorter/dist/js/', cwd: 'node_modules/tablesorter/dist/js/',
src: [ src: [
'jquery.tablesorter.min.js' 'jquery.tablesorter.combined.min.js',
'extras/jquery.tablesorter.pager.min.js',
'widgets/widget-columnSelector.min.js'
], ],
expand: true, expand: true,
dest: typo3_js, dest: typo3_js,
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/tablesorter/dist/js/', cwd: 'node_modules/tablesorter/dist/js/',
src: [ src: [
'jquery.tablesorter.min.js', 'jquery.tablesorter.combined.min.js',
'jquery.tablesorter.widgets.min.js', 'extras/jquery.tablesorter.pager.min.js',
'widgets/widget-grouping.min.js' 'widgets/widget-columnSelector.min.js'
], ],
expand: true, expand: true,
dest: 'js/', dest: 'js/',
...@@ -153,7 +156,7 @@ module.exports = function (grunt) { ...@@ -153,7 +156,7 @@ module.exports = function (grunt) {
ChartJS: { ChartJS: {
files: [ files: [
{ {
cwd: 'bower_components/Chart.js/dist/', cwd: 'node_modules/chart.js/dist/',
src: [ src: [
'Chart.min.js' 'Chart.min.js'
], ],
...@@ -162,7 +165,7 @@ module.exports = function (grunt) { ...@@ -162,7 +165,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/Chart.js/dist/', cwd: 'node_modules/chart.js/dist/',
src: [ src: [
'Chart.min.js' 'Chart.min.js'
], ],
...@@ -175,7 +178,7 @@ module.exports = function (grunt) { ...@@ -175,7 +178,7 @@ module.exports = function (grunt) {
jqwidgets: { jqwidgets: {
files: [ files: [
{ {
cwd: 'bower_components/jqwidgets/jqwidgets/', cwd: 'node_modules/jqwidgets-framework/jqwidgets/',
src: [ src: [
'jqx-all.js', 'jqx-all.js',
'globalization/globalize.js' 'globalization/globalize.js'
...@@ -185,7 +188,7 @@ module.exports = function (grunt) { ...@@ -185,7 +188,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/jqwidgets/jqwidgets/styles/', cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [ src: [
'jqx.base.css', 'jqx.base.css',
'jqx.bootstrap.css' 'jqx.bootstrap.css'
...@@ -195,7 +198,7 @@ module.exports = function (grunt) { ...@@ -195,7 +198,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/jqwidgets/jqwidgets/styles/', cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [ src: [
'images/**' 'images/**'
], ],
...@@ -207,7 +210,7 @@ module.exports = function (grunt) { ...@@ -207,7 +210,7 @@ module.exports = function (grunt) {
jqwidgets_devel: { jqwidgets_devel: {
files: [ files: [
{ {
cwd: 'bower_components/jqwidgets/jqwidgets/', cwd: 'node_modules/jqwidgets-framework/jqwidgets/',
src: [ src: [
'jqx-all.js', 'jqx-all.js',
'globalization/globalize.js' 'globalization/globalize.js'
...@@ -217,7 +220,7 @@ module.exports = function (grunt) { ...@@ -217,7 +220,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/jqwidgets/jqwidgets/styles/', cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [ src: [
'jqx.base.css', 'jqx.base.css',
'jqx.bootstrap.css' 'jqx.bootstrap.css'
...@@ -227,7 +230,7 @@ module.exports = function (grunt) { ...@@ -227,7 +230,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/jqwidgets/jqwidgets/styles/', cwd: 'node_modules/jqwidgets-framework/jqwidgets/styles/',
src: [ src: [
'images/**' 'images/**'
], ],
...@@ -239,7 +242,7 @@ module.exports = function (grunt) { ...@@ -239,7 +242,7 @@ module.exports = function (grunt) {
tinymce: { tinymce: {
files: [ files: [
{ {
cwd: 'bower_components/tinymce/', cwd: 'node_modules/tinymce/',
src: [ src: [
'tinymce.min.js' 'tinymce.min.js'
], ],
...@@ -248,7 +251,7 @@ module.exports = function (grunt) { ...@@ -248,7 +251,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/tinymce/', cwd: 'node_modules/tinymce/',
src: [ src: [
'themes/*/theme.min.js', 'themes/*/theme.min.js',
'plugins/*/plugin.min.js', 'plugins/*/plugin.min.js',
...@@ -263,7 +266,7 @@ module.exports = function (grunt) { ...@@ -263,7 +266,7 @@ module.exports = function (grunt) {
tinymce_devel: { tinymce_devel: {
files: [ files: [
{ {
cwd: 'bower_components/tinymce/', cwd: 'node_modules/tinymce/',
src: [ src: [
'tinymce.min.js' 'tinymce.min.js'
], ],
...@@ -272,7 +275,7 @@ module.exports = function (grunt) { ...@@ -272,7 +275,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/tinymce/', cwd: 'node_modules/tinymce/',
src: [ src: [
'themes/*/theme.min.js', 'themes/*/theme.min.js',
'plugins/*/plugin.min.js', 'plugins/*/plugin.min.js',
...@@ -287,7 +290,7 @@ module.exports = function (grunt) { ...@@ -287,7 +290,7 @@ module.exports = function (grunt) {
eventEmitter: { eventEmitter: {
files: [ files: [
{ {
cwd: 'bower_components/eventEmitter/', cwd: 'node_modules/wolfy87-eventemitter/',
src: [ src: [
'EventEmitter.min.js' 'EventEmitter.min.js'
], ],
...@@ -296,7 +299,7 @@ module.exports = function (grunt) { ...@@ -296,7 +299,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/eventEmitter/', cwd: 'node_modules/wolfy87-eventemitter/',
src: [ src: [
'EventEmitter.min.js' 'EventEmitter.min.js'
], ],
...@@ -331,7 +334,7 @@ module.exports = function (grunt) { ...@@ -331,7 +334,7 @@ module.exports = function (grunt) {
typeahead: { typeahead: {
files: [ files: [
{ {
cwd: 'bower_components/corejs-typeahead/dist', cwd: 'node_modules/corejs-typeahead/dist',
src: [ src: [
"typeahead.bundle.min.js" "typeahead.bundle.min.js"
], ],
...@@ -340,7 +343,7 @@ module.exports = function (grunt) { ...@@ -340,7 +343,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/corejs-typeahead/dist', cwd: 'node_modules/corejs-typeahead/dist',
src: [ src: [
"typeahead.bundle.min.js" "typeahead.bundle.min.js"
], ],
...@@ -353,7 +356,7 @@ module.exports = function (grunt) { ...@@ -353,7 +356,7 @@ module.exports = function (grunt) {
codemirror: { codemirror: {
files: [ files: [
{ {
cwd: 'bower_components/codemirror/lib', cwd: 'node_modules/codemirror/lib',
src: [ src: [
"codemirror.js" "codemirror.js"
], ],
...@@ -362,7 +365,7 @@ module.exports = function (grunt) { ...@@ -362,7 +365,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/codemirror/lib', cwd: 'node_modules/codemirror/lib',
src: [ src: [
"codemirror.js" "codemirror.js"
], ],
...@@ -371,7 +374,7 @@ module.exports = function (grunt) { ...@@ -371,7 +374,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/codemirror/lib', cwd: 'node_modules/codemirror/lib',
src: [ src: [
"codemirror.css" "codemirror.css"
], ],
...@@ -380,7 +383,7 @@ module.exports = function (grunt) { ...@@ -380,7 +383,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/codemirror/lib', cwd: 'node_modules/codemirror/lib',
src: [ src: [
"codemirror.css" "codemirror.css"
], ],
...@@ -389,7 +392,7 @@ module.exports = function (grunt) { ...@@ -389,7 +392,7 @@ module.exports = function (grunt) {
flatten: true flatten: true
}, },
{ {
cwd: 'bower_components/codemirror/mode', cwd: 'node_modules/codemirror/mode',
src: [ src: [
"**" "**"
], ],
...@@ -398,7 +401,7 @@ module.exports = function (grunt) { ...@@ -398,7 +401,7 @@ module.exports = function (grunt) {
flatten: false flatten: false
}, },
{ {
cwd: 'bower_components/codemirror/mode', cwd: 'node_modules/codemirror/mode',
src: [ src: [
"**" "**"
], ],
...@@ -424,6 +427,28 @@ module.exports = function (grunt) { ...@@ -424,6 +427,28 @@ module.exports = function (grunt) {
flatten: true 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: { uglify: {
...@@ -492,8 +517,9 @@ module.exports = function (grunt) { ...@@ -492,8 +517,9 @@ module.exports = function (grunt) {
production: { production: {
files: { files: {
"extension/Resources/Public/Css/qfq-bs.css": "less/qfq-bs.css.less", "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/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: { options: {
compress: true compress: true
...@@ -502,8 +528,9 @@ module.exports = function (grunt) { ...@@ -502,8 +528,9 @@ module.exports = function (grunt) {
devel: { devel: {
files: { files: {
"css/qfq-bs.css": "less/qfq-bs.css.less", "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/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: { options: {
banner: "/* Change qfq-bs.css.less, not qfq-bs.css */" 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") PKG_VERSION = $(shell awk '/version/ { print $$3 }' extension/ext_emconf.php | sed "s/'//g")
NIGHTLY_DATE = $(shell date '+%Y%m%d') NIGHTLY_DATE = $(shell date '+%Y%m%d')
...@@ -11,7 +6,7 @@ RELEASE_DATE = $(shell date '+%Y%m%d%H%M') ...@@ -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_SHORT = $(shell git rev-parse --short HEAD || true)
GIT_REVISION_LONG = $(shell git rev-parse HEAD || true)