Commit 40c6541c authored by Marc Egger's avatar Marc Egger
Browse files

fix makefile again

parent cabc5d28
......@@ -13,7 +13,7 @@ DISTDIR=dist
# Use by jenkins to separate temp directories used by pip in order to allow concurrent builds
PIP_TMP ?= /tmp
all: archive t3sphinx
all: archive
maintainer-clean:
rm -f .doc_plantuml .npmpackages .phpdocinstall .plantuml_install .support .support_plantuml
......@@ -53,7 +53,7 @@ dist-move-doc:
dist-copy-extension:
cd extension ; cp -R $(EXTENSION_CONTENT) ../$(DISTDIR)/
build-dist: t3sphinx make-dist-dir dist-copy-extension dist-move-doc git-revision
build-dist: make-dist-dir dist-copy-extension dist-move-doc git-revision
echo "Distribution made in $(DIST)"
nightly: basic build-dist
......@@ -66,9 +66,6 @@ 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
t3sphinx: .virtual_env
. .python_virtualenv/bin/activate ; cd extension/Documentation/_make; make html
plantuml:
cd doc/diagram ; $(MAKE)
......@@ -111,7 +108,7 @@ basic: .npmpackages .virtual_env
pip-temp-directory:
test -d "$(PIP_TMP)" || mkdir -p "$(PIP_TMP)"
.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
.PHONY: nightly maintainer-clean snapshot release git-revision build-dist make-dist-dir dist-move-doc dist-copy-extension pip-temp-directory plantuml sonar
copyReleaseNotes:
cp extension/Documentation/Release.rst extension/RELEASE.txt
......
Markdown is supported
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