Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
b5423f3c
Commit
b5423f3c
authored
May 11, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11443 from cclauss:fix-Python-string-format
parents
8356a6b6
d4a966c7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
build_sdk.py
platforms/android/build_sdk.py
+1
-1
build_js.py
platforms/js/build_js.py
+3
-3
No files found.
platforms/android/build_sdk.py
View file @
b5423f3c
...
...
@@ -18,7 +18,7 @@ def execute(cmd, shell=False):
log
.
info
(
'Executing: '
+
' '
.
join
(
cmd
))
retcode
=
subprocess
.
call
(
cmd
,
shell
=
shell
)
if
retcode
<
0
:
raise
Fail
(
"Child was terminated by signal:
"
%
s
-
retcode
)
raise
Fail
(
"Child was terminated by signal:
%
s"
%
-
retcode
)
elif
retcode
>
0
:
raise
Fail
(
"Child returned:
%
s"
%
retcode
)
except
OSError
as
e
:
...
...
platforms/js/build_js.py
View file @
b5423f3c
...
...
@@ -14,7 +14,7 @@ def execute(cmd, shell=False):
log
.
info
(
"Executing:
%
s"
%
cmd
)
retcode
=
subprocess
.
call
(
cmd
,
shell
=
shell
)
if
retcode
<
0
:
raise
Fail
(
"Child was terminated by signal:
"
%
s
-
retcode
)
raise
Fail
(
"Child was terminated by signal:
%
s"
%
-
retcode
)
elif
retcode
>
0
:
raise
Fail
(
"Child returned:
%
s"
%
retcode
)
except
OSError
as
e
:
...
...
@@ -159,7 +159,7 @@ class Builder:
if
flags
:
cmd
+=
[
"-DCMAKE_C_FLAGS='
%
s'"
%
flags
,
"-DCMAKE_CXX_FLAGS='
%
s'"
%
flags
]
return
cmd
;
return
cmd
def
get_build_flags
(
self
):
flags
=
""
...
...
@@ -235,7 +235,7 @@ if __name__ == "__main__":
builder
.
config
()
if
args
.
config_only
:
sys
.
exit
(
0
)
;
sys
.
exit
(
0
)
log
.
info
(
"====="
)
log
.
info
(
"===== Building OpenCV.js in
%
s"
,
"asm.js"
if
not
args
.
build_wasm
else
"wasm"
)
...
...
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