Commit 8ae6d860 authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Use build-dist when building distributions.

parent 86457e0a
......@@ -13,7 +13,7 @@ doc: phpdoc jsdoc plantuml
maintainer-clean:
rm -f .bowerpackages .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
rm -rf doc support bower_components node_modules .python_virtualenv
rm -rf doc support bower_components node_modules .python_virtualenv build-dist
archive: clean qfq.zip
......@@ -23,7 +23,10 @@ qfq.zip:
clean:
rm -f qfq_$(PKG_VERSION).zip
copy-dist: t3sphinx
git-revision:
echo $(GIT_REVISION_LONG) > dist/revision.git
build-dist: t3sphinx git-revision
rm -rf dist/
mkdir dist
cd extension
......@@ -34,20 +37,17 @@ copy-dist: t3sphinx
rm -rf Documentation
mv Documentation.tmp Documentation
git-revision:
echo $(GIT_REVISION_LONG) > extension/revision.git
nightly: bootstrap git-revision
nightly: bootstrap build-dist
cd dist; zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini
snapshot: bootstrap git-revision
snapshot: bootstrap build-dist
cd dist ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT) $(EXTENSION_CONTENT) revision.git -x config.ini
release: bootstrap git-revision
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 dist ; 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
......@@ -106,4 +106,4 @@ phpdoc: .phpdocinstall
. .python_virtualenv/bin/activate ; pip install --upgrade sphinx==1.5.5
touch $@
.PHONY: nightly maintainer-clean snapshot release revision.git
.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist
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