Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flatdeb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Ludovico de Nittis
flatdeb
Commits
1ace888f
Commit
1ace888f
authored
Oct 08, 2019
by
Simon McVittie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runtimes: Optionally fail the build if source code is missing
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
6a0cb3cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
1 deletion
+21
-1
run.py
run.py
+21
-1
No files found.
run.py
View file @
1ace888f
...
...
@@ -242,6 +242,7 @@ class Builder:
self
.
sdk_variant_id
=
None
self
.
debug_symbols
=
True
self
.
automatic_dbgsym
=
True
self
.
strict
=
False
self
.
logger
=
logger
.
getChild
(
'Builder'
)
...
...
@@ -492,6 +493,14 @@ class Builder:
help
=
'Do not include corresponding automatic -dbgsym packages '
'for each package in the Platform'
,
)
parser
.
add_argument
(
'--strict'
,
action
=
'store_true'
,
default
=
False
,
help
=
'Make various warnings into fatal errors'
,
)
parser
.
add_argument
(
'--no-strict'
,
action
=
'store_false'
,
dest
=
'strict'
,
default
=
False
,
help
=
'Do not make various warnings fatal (default)'
,
)
subparser
=
subparsers
.
add_parser
(
'base'
,
...
...
@@ -554,6 +563,7 @@ class Builder:
self
.
ostree_repo
=
args
.
ostree_repo
self
.
export_bundles
=
args
.
export_bundles
self
.
ostree_mode
=
args
.
ostree_mode
self
.
strict
=
args
.
strict
if
self
.
export_bundles
and
not
self
.
ostree_commit
:
parser
.
error
(
...
...
@@ -968,6 +978,7 @@ class Builder:
)
ostree_prefix
=
artifact_prefix
+
'-runtime'
out_tarball
=
ostree_prefix
+
'.tar.gz'
sources_prefix
=
artifact_prefix
+
'-sources'
argv
=
[
'debos'
,
...
...
@@ -1050,7 +1061,6 @@ class Builder:
argv
.
append
(
'post_script:post_script'
)
if
sdk
:
sources_prefix
=
artifact_prefix
+
'-sources'
sources_tarball
=
sources_prefix
+
'.tar.gz'
debug_prefix
=
artifact_prefix
+
'-debug'
...
...
@@ -1197,6 +1207,16 @@ class Builder:
subprocess
.
check_call
(
argv
)
if
sdk
:
output
=
os
.
path
.
join
(
self
.
build_area
,
sources_prefix
+
'.MISSING.txt'
,
)
if
os
.
path
.
exists
(
output
)
and
self
.
strict
:
raise
SystemExit
(
'Some source code was missing: aborting'
)
if
sysroot_prefix
is
not
None
:
assert
sysroot_tarball
is
not
None
output
=
os
.
path
.
join
(
self
.
build_area
,
sysroot_tarball
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment