Commit bbfc391d authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/raos_work'

parents e4e0fc47 2c9e7d5e
......@@ -24,3 +24,4 @@
/extension/Resources/Public/JavaScript
/extension/Resources/Public/Css
/doc/jsdoc
/dist/
......@@ -5,7 +5,8 @@ NIGHTLY_DATE = $(shell date '+%Y%m%d')
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.example.ini RELEASE.txt
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
DISTDIR=dist
all: archive t3sphinx
......@@ -13,7 +14,7 @@ doc: phpdoc jsdoc plantuml
maintainer-clean:
rm -f .bowerpackages .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
rm -rf doc support
rm -rf doc support bower_components node_modules .python_virtualenv build-dist
archive: clean qfq.zip
......@@ -23,27 +24,43 @@ qfq.zip:
clean:
rm -f qfq_$(PKG_VERSION).zip
git-revision:
echo $(GIT_REVISION_LONG) > extension/revision.git
git-revision: make-dist-dir
echo $(GIT_REVISION_LONG) > $(DISTDIR)/revision.git
nightly: bootstrap git-revision
cd extension; zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini
make-dist-dir:
rm -rf $(DISTDIR)/
mkdir $(DISTDIR)
snapshot: bootstrap git-revision
cd extension ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT) $(EXTENSION_CONTENT) revision.git -x config.ini
dist-move-doc:
cd $(DISTDIR) ; \
mkdir Documentation.tmp ;\
mv Documentation/_make/build/html Documentation.tmp ;\
rm -rf Documentation ; \
mv Documentation.tmp Documentation
release: bootstrap git-revision
if [ -z "$(VERSION)" ] ; then echo "Set VERSION make variable to the release version (fmt: maj.min.micro)" ; exit 1 ; fi
cd extension ; zip -r "../qfq.$(VERSION)_$(RELEASE_DATE).zip" $(EXTENSION_CONTENT) revision.git -x config.ini
dist-copy-extension:
cd extension ; cp -R $(EXTENSION_CONTENT) ../$(DISTDIR)/
build-dist: t3sphinx make-dist-dir dist-copy-extension dist-move-doc git-revision
echo "Distribution made in $(DIST)"
nightly: bootstrap build-dist
cd $(DISTDIR); zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini
t3sphinx:
cd extension/Documentation/_make; make html
snapshot: bootstrap build-dist
cd $(DISTDIR) ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT) $(EXTENSION_CONTENT) revision.git -x config.ini
release: bootstrap 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
t3sphinx: .virtual_env
. .python_virtualenv/bin/activate ; cd extension/Documentation/_make; make html
plantuml: uml/javascript/classdiagram.pu .support_plantuml
java -jar support/plantuml/plantuml.jar -tpng -o ../../doc/plantuml/javascript uml/javascript/classdiagram.pu
bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install
bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install .virtual_env
npm install
bower install
grunt default
......@@ -90,4 +107,9 @@ phpdoc: .phpdocinstall
mkdir -p doc/plantuml/php
touch $@
.PHONY: nightly maintainer-clean snapshot release revision.git
.virtual_env:
virtualenv .python_virtualenv
. .python_virtualenv/bin/activate ; pip install --upgrade sphinx==1.5.5
touch $@
.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment