Will Salmon pushed to branch willsalmon/outOfSourecBuild at BuildStream / buildstream
Commits:
-
f3eaeee2
by William Salmon at 2018-09-04T13:09:11Z
3 changed files:
- buildstream/buildelement.py
- doc/examples/out-of-source-builds/elements/hello.bst
- doc/examples/out-of-source-builds2/elements/hello.bst
Changes:
| ... | ... | @@ -171,7 +171,12 @@ class BuildElement(Element): |
| 171 | 171 |
dep.integrate(sandbox)
|
| 172 | 172 |
|
| 173 | 173 |
# Stage sources in the build root
|
| 174 |
- self.stage_sources(sandbox, self.get_variable('build-root'))
|
|
| 174 |
+ # Unless we have set a source-directory in which case we will
|
|
| 175 |
+ # put it in there.
|
|
| 176 |
+ source_dir = self.get_variable('source-directory')
|
|
| 177 |
+ if not source_dir: source_dir = ''
|
|
| 178 |
+ self.stage_sources(sandbox, os.path.join(self.get_variable('build-root'),
|
|
| 179 |
+ source_dir))
|
|
| 175 | 180 |
|
| 176 | 181 |
def assemble(self, sandbox):
|
| 177 | 182 |
|
| ... | ... | @@ -6,8 +6,7 @@ description: |2 |
| 6 | 6 |
kind: autotools
|
| 7 | 7 |
sources:
|
| 8 | 8 |
#- directory: "%{source-directory}"
|
| 9 |
-- directory: SourB
|
|
| 10 |
- kind: tar
|
|
| 9 |
+- kind: tar
|
|
| 11 | 10 |
ref: 80da43bb5665596ee389e6d8b64b4f122ea4b92a685b1dbd813cd1f0e0c2d83f
|
| 12 | 11 |
url: gnu:automake-1.16.tar.gz
|
| 13 | 12 |
variables:
|
| ... | ... | @@ -6,8 +6,8 @@ description: |2 |
| 6 | 6 |
kind: autotools
|
| 7 | 7 |
sources:
|
| 8 | 8 |
#- directory: "%{source-directory}"
|
| 9 |
-- directory: Source
|
|
| 10 |
- kind: local
|
|
| 9 |
+#- directory: Source
|
|
| 10 |
+- kind: local
|
|
| 11 | 11 |
path: files/hello
|
| 12 | 12 |
variables:
|
| 13 | 13 |
source-directory: Source
|