Browse code
install LIBS_FROM_GIT using python 2 and 3 where appropriate
When installing a library from source and python 3 is enabled, first run
the installation process with python 2 enabled to ensure the library is
also installed under python 2 for any services not yet running under
3. The python 3 version is installed second so that command line tools
installed with libraries are installed under python 3 when python 3 is
enabled.
Change-Id: Ibb0f7a68d21081bf7652a0c1515080c0c54888ca
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
Doug Hellmann authored on 2017/01/10 07:11:49Showing 1 changed files
| ... | ... |
@@ -399,6 +399,16 @@ function setup_lib {
|
| 399 | 399 |
function setup_dev_lib {
|
| 400 | 400 |
local name=$1 |
| 401 | 401 |
local dir=${GITDIR[$name]}
|
| 402 |
+ if python3_enabled; then |
|
| 403 |
+ # Turn off Python 3 mode and install the package again, |
|
| 404 |
+ # forcing a Python 2 installation. This ensures that all libs |
|
| 405 |
+ # being used for development are installed under both versions |
|
| 406 |
+ # of Python. |
|
| 407 |
+ echo "Installing $name again without Python 3 enabled" |
|
| 408 |
+ USE_PYTHON3=False |
|
| 409 |
+ setup_develop $dir |
|
| 410 |
+ USE_PYTHON3=True |
|
| 411 |
+ fi |
|
| 402 | 412 |
setup_develop $dir |
| 403 | 413 |
} |
| 404 | 414 |
|