Skip to content

Commit

Permalink
Merge pull request #32 from nexB/install-from-thirdparty-dir
Browse files Browse the repository at this point in the history
Check for deps in local thirdparty directory #31
  • Loading branch information
JonoYang authored Aug 31, 2021
2 parents b735a3f + 77ce5e4 commit fa13562
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
8 changes: 5 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -e
#set -x

################################
# A configuration script to set things up:
# A configuration script to set things up:
# create a virtualenv and install or update thirdparty packages.
# Source this script for initial configuration
# Use configure --help for details
Expand Down Expand Up @@ -50,9 +50,11 @@ VIRTUALENV_PYZ_URL=https://bootstrap.pypa.io/virtualenv.pyz
CFG_ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin

# Find packages from the local thirdparty directory or from pypi
PIP_EXTRA_ARGS="--find-links $CFG_ROOT_DIR/thirdparty"

################################
# Set the quiet flag to empty if not defined
# Set the quiet flag to empty if not defined
if [[ "$CFG_QUIET" == "" ]]; then
CFG_QUIET=" "
fi
Expand All @@ -63,7 +65,7 @@ fi
# Use environment variables or a file if available.
# Otherwise the latest Python by default.
if [[ "$PYTHON_EXECUTABLE" == "" ]]; then
# check for a file named PYTHON_EXECUTABLE
# check for a file named PYTHON_EXECUTABLE
if [ -f "$CFG_ROOT_DIR/PYTHON_EXECUTABLE" ]; then
PYTHON_EXECUTABLE=$(cat "$CFG_ROOT_DIR/PYTHON_EXECUTABLE")
else
Expand Down
6 changes: 6 additions & 0 deletions configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ set CFG_ROOT_DIR=%~dp0
set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"


@rem ################################
@rem # Thirdparty package locations and index handling
set "PIP_EXTRA_ARGS=--find-links %CFG_ROOT_DIR%\thirdparty"
@rem ################################


@rem ################################
@rem # Set the quiet flag to empty if not defined
if not defined CFG_QUIET (
Expand Down
2 changes: 2 additions & 0 deletions thirdparty/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Put your Python dependency wheels to be vendored in this directory.

0 comments on commit fa13562

Please sign in to comment.