diff --git a/Makefile b/Makefile index 2026cc8..8785ff9 100644 --- a/Makefile +++ b/Makefile @@ -61,9 +61,11 @@ content: html: content @echo making HTML content $(Q)./scripts/show-versions.py + @echo zjy make html -$(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b html -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) > $(BUILDDIR)/doc.log 2>&1 - $(Q)./scripts/filter-doc-log.sh $(BUILDDIR)/doc.log - + @echo zjy filter doc in log + #$(Q)./scripts/filter-doc-log.sh $(BUILDDIR)/doc.log + @echo zjy done singlehtml: content -$(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b singlehtml -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) > $(BUILDDIR)/doc.log 2>&1 $(Q)./scripts/filter-doc-log.sh $(BUILDDIR)/doc.log diff --git a/scripts/build.sh b/scripts/build.sh index 69a082c..0907051 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -40,8 +40,8 @@ echo "Build HTML" cd docs make -v make clean -make -i html -./scripts/filter-doc-log.sh _build/doc.log +make html +#./scripts/filter-doc-log.sh _build/doc.log retval=$? ls -la _build diff --git a/scripts/filter-known-issues.py b/scripts/filter-known-issues.py index 596abde..17a6231 100755 --- a/scripts/filter-known-issues.py +++ b/scripts/filter-known-issues.py @@ -124,7 +124,9 @@ def config_import(paths): def print_error(f, str): + tmp = str.decode("utf-8") + print("zjy", tmp) f.write(tmp) def filter_log(args):