summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChandan Singh <csingh43@bloomberg.net>2019-04-24 22:53:19 +0100
committerChandan Singh <csingh43@bloomberg.net>2019-05-21 12:41:18 +0100
commit070d053e5cc47e572e9f9e647315082bd7a15c63 (patch)
tree7fb0fdff52f9b5f8a18ec8fe9c75b661f9e0839e /doc
parent6c59e7901a52be961c2a1b671cf2b30f90bc4d0a (diff)
downloadbuildstream-070d053e5cc47e572e9f9e647315082bd7a15c63.tar.gz
Move source from 'buildstream' to 'src/buildstream'
This was discussed in #1008. Fixes #1009.
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile8
-rw-r--r--doc/source/format_project.rst2
-rw-r--r--doc/source/using_config.rst2
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 6597cf81b..f4e8b20b9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,7 +32,7 @@ BST2HTMLOPTS = --force
endif
# Help Python find buildstream and its plugins
-PYTHONPATH=$(CURDIR)/..:$(CURDIR)/../buildstream/plugins
+PYTHONPATH=$(CURDIR)/..:$(CURDIR)/../src/buildstream/plugins
.PHONY: all clean templates templates-clean sessions sessions-prep sessions-clean badges badges-clean html devhelp
@@ -82,9 +82,9 @@ clean: templates-clean sessions-clean badges-clean
templates:
mkdir -p source/elements
mkdir -p source/sources
- $(SPHINXAPIDOC) --force --separate --module-first --no-headings --no-toc -o source $(CURDIR)/../buildstream *_pb2*.py
- $(call plugin-doc-skeleton,$(CURDIR)/../buildstream/plugins/elements,elements)
- $(call plugin-doc-skeleton,$(CURDIR)/../buildstream/plugins/sources,sources)
+ $(SPHINXAPIDOC) --force --separate --module-first --no-headings --no-toc -o source $(CURDIR)/../src/buildstream *_pb2*.py
+ $(call plugin-doc-skeleton,$(CURDIR)/../src/buildstream/plugins/elements,elements)
+ $(call plugin-doc-skeleton,$(CURDIR)/../src/buildstream/plugins/sources,sources)
templates-clean:
rm -rf source/elements
diff --git a/doc/source/format_project.rst b/doc/source/format_project.rst
index f9d999a19..f5758657d 100644
--- a/doc/source/format_project.rst
+++ b/doc/source/format_project.rst
@@ -1017,5 +1017,5 @@ Builtin defaults
BuildStream defines some default values for convenience, the default
values overridden by your project's ``project.conf`` are presented here:
- .. literalinclude:: ../../buildstream/data/projectconfig.yaml
+ .. literalinclude:: ../../src/buildstream/data/projectconfig.yaml
:language: yaml
diff --git a/doc/source/using_config.rst b/doc/source/using_config.rst
index 58ef160c1..2b74b2de5 100644
--- a/doc/source/using_config.rst
+++ b/doc/source/using_config.rst
@@ -282,5 +282,5 @@ Default configuration
---------------------
The default BuildStream configuration is specified here for reference:
- .. literalinclude:: ../../buildstream/data/userconfig.yaml
+ .. literalinclude:: ../../src/buildstream/data/userconfig.yaml
:language: yaml