Commit aff76ae9 authored by Phil Dawson's avatar Phil Dawson
Browse files

Merge branch 'phil/437-junction-tutorial' into 'master'

Phil/437 junction tutorial

See merge request BuildStream/buildstream!550
parents 92714b03 b4f25190
Loading
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -118,8 +118,11 @@ html devhelp: templates sessions
	    $(SPHINXBUILD) -b $@ $(ALLSPHINXOPTS) "$(BUILDDIR)/$@" \
	    $(SPHINXBUILD) -b $@ $(ALLSPHINXOPTS) "$(BUILDDIR)/$@" \
	    $(wildcard source/*.rst) \
	    $(wildcard source/*.rst) \
	    $(wildcard source/tutorial/*.rst) \
	    $(wildcard source/tutorial/*.rst) \
            $(wildcard source/advanced-features/*.rst) \
	    $(wildcard source/examples/*.rst) \
	    $(wildcard source/examples/*.rst) \
	    $(wildcard source/elements/*.rst) \
	    $(wildcard source/elements/*.rst) \
	    $(wildcard source/sources/*.rst)
	    $(wildcard source/sources/*.rst)
	@echo
	@echo
	@echo "Build of $@ finished, output: $(CURDIR)/$(BUILDDIR)/$@"
	@echo "Build of $@ finished, output: $(CURDIR)/$(BUILDDIR)/$@"
# Makefile for Sphinx documentation
#
+9 −0
Original line number Original line Diff line number Diff line
kind: import

sources:
- kind: local
  path: files/callHello.sh

depends:
  - filename: hello.bst
    junction: hello-junction.bst
+8 −0
Original line number Original line Diff line number Diff line
kind: junction

# Specify the source of the BuildStream project
# We are going to use the autotools examples distributed with BuildStream in the
# doc/examples/autotools directory
sources:
- kind: local
  path: ../autotools
+3 −0
Original line number Original line Diff line number Diff line
#!/bin/sh
echo "Calling hello:"
hello
+8 −0
Original line number Original line Diff line number Diff line
# Unique project name
name: junctions

# Required BuildStream format version
format-version: 9

# Subdirectory where elements are stored
element-path: elements
Loading