From 06d49bb89584921d17f3309530fc9544ef5b88c3 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 13 Jun 2016 23:41:19 -0700 Subject: [PATCH 1/2] sync ordering of stddef.h includes with expat 2.1.1 --- Modules/expat/xmlrole.c | 4 ++-- Modules/expat/xmltok.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c index 9a8f85dd253..44772e21dd3 100644 --- a/Modules/expat/xmlrole.c +++ b/Modules/expat/xmlrole.c @@ -2,6 +2,8 @@ See the file COPYING for copying permission. */ +#include + #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) @@ -16,8 +18,6 @@ #endif #endif /* ndef COMPILED_FROM_DSP */ -#include - #include "expat_external.h" #include "internal.h" #include "xmlrole.h" diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c index 205c07eb848..bf09dfc72b9 100644 --- a/Modules/expat/xmltok.c +++ b/Modules/expat/xmltok.c @@ -2,6 +2,8 @@ See the file COPYING for copying permission. */ +#include + #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) @@ -16,8 +18,6 @@ #endif #endif /* ndef COMPILED_FROM_DSP */ -#include - #include "expat_external.h" #include "internal.h" #include "xmltok.h" From 4b9e75ba7f5d2f0baf0603eed9b4029af8e82ff3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 15 Jun 2016 08:57:32 +0200 Subject: [PATCH 2/2] Docs: add html-stable autobuild variant --- Doc/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Doc/Makefile b/Doc/Makefile index ea3023157dd..2220d92d91c 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -161,7 +161,7 @@ autobuild-dev: -make suspicious # for quick rebuilds (HTML only) -autobuild-html: +autobuild-dev-html: make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' # for stable releases: only build if not in pre-release stage (alpha, beta) @@ -173,3 +173,9 @@ autobuild-stable: esac @make autobuild-dev +autobuild-stable-html: + @case $(DISTVERSION) in *[ab]*) \ + echo "Not building; $(DISTVERSION) is not a release version."; \ + exit 1;; \ + esac + @make autobuild-dev-html