From: Dave Miller Date: Mon, 4 Sep 2023 05:28:23 +0000 (-0400) Subject: Bug 1769248: get ReadTheDocs to build the POD docs (#136) X-Git-Tag: bugzilla-5.2~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cc54f6da7776eacb2f9832ab15bcadeea8e75d5;p=thirdparty%2Fbugzilla.git Bug 1769248: get ReadTheDocs to build the POD docs (#136) --- diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000000..7eada0dd63 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,12 @@ +version: 2 +build: + os: "ubuntu-20.04" + tools: + python: "3.10" + apt_packages: + - libfile-copy-recursive-perl + jobs: + post_build: + - perl docs/makedocs.pl --pod-only + - cp -rp docs/en/html/integrating/api/ "$READTHEDOCS_OUTPUT/html/integrating/api" + - cp -p docs/en/html/style.css "$READTHEDOCS_OUTPUT/html/" diff --git a/docs/en/rst/conf.py b/docs/en/rst/conf.py index eec01c5318..2e37edd17e 100644 --- a/docs/en/rst/conf.py +++ b/docs/en/rst/conf.py @@ -383,13 +383,10 @@ pdf_fit_background_mode = 'scale' # Temporary highlighting of TODO items todo_include_todos = False -# The readthedocs.org website cannot access POD. -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' - -if on_rtd: - base_api_url = 'https://www.bugzilla.org/docs/5.0/en/html/integrating/api/' -else: - base_api_url = '../integrating/api/' +# Originally, the readthedocs.org website could not access POD, +# so we would conditionally override that here if we were building +# on RTD, but that's no longer the case. +base_api_url = '../integrating/api/' extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug %s'), 'api': (base_api_url + '%s', "%s")} diff --git a/docs/makedocs.pl b/docs/makedocs.pl index 87e346e237..a95954c36a 100755 --- a/docs/makedocs.pl +++ b/docs/makedocs.pl @@ -33,6 +33,7 @@ BEGIN { chdir dirname($0); } use lib qw(.. ../lib lib); use Cwd; +use File::Copy qw(copy); use File::Copy::Recursive qw(rcopy); use File::Find; use File::Path qw(rmtree make_path); @@ -83,12 +84,19 @@ END_HTML $converter->contents_page_start($contents_start); $converter->contents_page_end(""); - $converter->add_css('./../../../../style.css'); + if (exists($::ENV{'READTHEDOCS'})) { + $converter->add_css('./../../style.css'); + } else { + $converter->add_css('./../../../../style.css'); + } $converter->javascript_flurry(0); $converter->css_flurry(0); make_path('html/integrating/api'); $converter->batch_convert(['../../'], 'html/integrating/api'); + if (exists($::ENV{'READTHEDOCS'})) { + copy('../style.css', 'html/style.css') or die "Copy failed: $!"; + } print "\n"; }