Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
e3031a7d
Unverified
Commit
e3031a7d
authored
Dec 19, 2017
by
xoviat
Committed by
GitHub
Dec 19, 2017
Browse files
Merge pull request #101 from matthew-brett/fix-output
Fix output
parents
07ad65f7
46d7dfb4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
common_utils.sh
common_utils.sh
+5
-5
No files found.
common_utils.sh
View file @
e3031a7d
...
@@ -184,11 +184,9 @@ function build_wheel_cmd {
...
@@ -184,11 +184,9 @@ function build_wheel_cmd {
local
repo_dir
=
${
2
:-
$REPO_DIR
}
local
repo_dir
=
${
2
:-
$REPO_DIR
}
[
-
z
"
$repo_dir
"
]
&&
echo
"repo_dir not defined"
&&
exit
1
[
-
z
"
$repo_dir
"
]
&&
echo
"repo_dir not defined"
&&
exit
1
local
wheelhouse
=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
local
wheelhouse
=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
if
[
-
n
"
$(
is_function
"pre_build"
)
"
]
;
then
start_spinner
start_spinner
if
[
-
n
"
$(
is_function
"pre_build"
)
"
]
;
then
pre_build
;
fi
pre_build
stop_spinner
stop_spinner
fi
if
[
-
n
"
$BUILD_DEPENDS
"
]
;
then
if
[
-
n
"
$BUILD_DEPENDS
"
]
;
then
pip
install
$(
pip_opts
)
$BUILD_DEPENDS
pip
install
$(
pip_opts
)
$BUILD_DEPENDS
fi
fi
...
@@ -249,7 +247,9 @@ function build_index_wheel {
...
@@ -249,7 +247,9 @@ function build_index_wheel {
# Discard first argument to pass remainder to pip
# Discard first argument to pass remainder to pip
shift
shift
local
wheelhouse
=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
local
wheelhouse
=
$(
abspath
${
WHEEL_SDIR
:-
wheelhouse
}
)
start_spinner
if
[
-
n
"
$(
is_function
"pre_build"
)
"
]
;
then
pre_build
;
fi
if
[
-
n
"
$(
is_function
"pre_build"
)
"
]
;
then
pre_build
;
fi
stop_spinner
if
[
-
n
"
$BUILD_DEPENDS
"
]
;
then
if
[
-
n
"
$BUILD_DEPENDS
"
]
;
then
pip
install
$(
pip_opts
)
$@
$BUILD_DEPENDS
pip
install
$(
pip_opts
)
$@
$BUILD_DEPENDS
fi
fi
...
...
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