premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

back-port travis aafigure workaround

This commit is contained in:
arvidn 2017-06-14 03:53:09 -04:00 committed by Arvid Norberg
parent 7e106b2660
commit 5cb16f7878
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -96,7 +96,7 @@ install:
script: script:
# disable invoking docutils for now, until we can have a modern version of it # disable invoking docutils for now, until we can have a modern version of it
- cd docs - cd docs
- if [[ $docs == "1" && $TRAVIS_OS_NAME == "osx" ]]; then make RST2HTML=rst2html.py; fi - if [[ $docs == "1" && $TRAVIS_OS_NAME == "osx" ]]; then make RST2HTML=rst2html.py AAFIGURE=echo; fi
- cd .. - cd ..
- cd test - cd test

6
docs/makefile
View File

@ -9,6 +9,10 @@ ifndef RST2HTML
RST2HTML:=rst2html RST2HTML:=rst2html
endif endif
ifndef AAFIGURE
AAFIGURE=aafigure
endif
REFERENCE_TARGETS = \ REFERENCE_TARGETS = \
manual-ref \ manual-ref \
reference \ reference \
@ -120,7 +124,7 @@ ifneq ($(STAGE),)
endif endif
%.png:%.diagram %.png:%.diagram
aafigure --scale 0.6 -o $@ $? $(AAFIGURE) --scale 0.6 -o $@ $?
ifneq ($(STAGE),) ifneq ($(STAGE),)
cp $@ $(WEB_PATH)/$@ cp $@ $(WEB_PATH)/$@
endif endif