Commit 5f82e79c authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Fixed dist building.

parent c23a0563
......@@ -5,7 +5,7 @@ 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
......@@ -25,30 +25,34 @@ clean:
rm -f qfq_$(PKG_VERSION).zip
git-revision: make-dist-dir
echo $(GIT_REVISION_LONG) > $(DIST)/revision.git
echo $(GIT_REVISION_LONG) > $(DISTDIR)/revision.git
make-dist-dir:
rm -rf $(DIST)/
mkdir $(DIST)
build-dist: t3sphinx make-dist-dir git-revision
cd extension
cp -R $(EXTENSION_CONTENT) ../$(DIST)/
cd ../$(DIST)/
mkdir Documentation.tmp
mv Documentation/_make/build/html Documentation.tmp
rm -rf Documentation
rm -rf $(DISTDIR)/
mkdir $(DISTDIR)
dist-move-doc:
cd $(DISTDIR) ; \
mkdir Documentation.tmp ;\
mv Documentation/_make/build/html Documentation.tmp ;\
rm -rf Documentation ; \
mv Documentation.tmp Documentation
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 $(DIST); zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini
cd $(DISTDIR); zip -r ../qfq-$(NIGHTLY_DATE) $(EXTENSION_CONTENT) revision.git -x config.ini
snapshot: bootstrap build-dist
cd $(DIST) ; zip -r ../qfq-$(NIGHTLY_DATE)-$(GIT_REVISION_SHORT) $(EXTENSION_CONTENT) revision.git -x config.ini
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 $(DIST) ; zip -r "../qfq.$(VERSION)_$(RELEASE_DATE).zip" $(EXTENSION_CONTENT) revision.git -x config.ini
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
......@@ -108,4 +112,4 @@ phpdoc: .phpdocinstall
. .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
.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