Commit 7bb0138f authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Install python virtual environment in order to install sphinx.

Run sphinx before rolling ZIP files.
parent 9d8f902e
...@@ -13,7 +13,7 @@ doc: phpdoc jsdoc plantuml ...@@ -13,7 +13,7 @@ doc: phpdoc jsdoc plantuml
maintainer-clean: maintainer-clean:
rm -f .bowerpackages .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml 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
archive: clean qfq.zip archive: clean qfq.zip
...@@ -26,24 +26,24 @@ clean: ...@@ -26,24 +26,24 @@ clean:
git-revision: git-revision:
echo $(GIT_REVISION_LONG) > extension/revision.git echo $(GIT_REVISION_LONG) > extension/revision.git
nightly: bootstrap git-revision nightly: bootstrap git-revision t3sphinx
cd extension; zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini cd extension; zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini
snapshot: bootstrap git-revision snapshot: bootstrap git-revision t3sphinx
cd extension ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT) $(EXTENSION_CONTENT) revision.git -x config.ini cd extension ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT) $(EXTENSION_CONTENT) revision.git -x config.ini
release: bootstrap git-revision release: bootstrap git-revision t3sphinx
if [ -z "$(VERSION)" ] ; then echo "Set VERSION make variable to the release version (fmt: maj.min.micro)" ; exit 1 ; fi 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 cd extension ; zip -r "../qfq.$(VERSION)_$(RELEASE_DATE).zip" $(EXTENSION_CONTENT) revision.git -x config.ini
t3sphinx: t3sphinx: .virtual_env
cd extension/Documentation/_make; make html . .python_virtualenv/bin/activate ; cd extension/Documentation/_make; make html
plantuml: uml/javascript/classdiagram.pu .support_plantuml plantuml: uml/javascript/classdiagram.pu .support_plantuml
java -jar support/plantuml/plantuml.jar -tpng -o ../../doc/plantuml/javascript uml/javascript/classdiagram.pu 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 npm install
bower install bower install
grunt default grunt default
...@@ -90,4 +90,9 @@ phpdoc: .phpdocinstall ...@@ -90,4 +90,9 @@ phpdoc: .phpdocinstall
mkdir -p doc/plantuml/php mkdir -p doc/plantuml/php
touch $@ touch $@
.virtual_env:
virtualenv .python_virtualenv
. .python_virtualenv/bin/activate ; pip install sphinx==1.5.5
touch $@
.PHONY: nightly maintainer-clean snapshot release revision.git .PHONY: nightly maintainer-clean snapshot release revision.git
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