diff --git a/bin/COMPILE.cmd b/bin/COMPILE.cmd index 1650f5a3..8488a989 100644 --- a/bin/COMPILE.cmd +++ b/bin/COMPILE.cmd @@ -7,12 +7,16 @@ SET PYTHON32=c:\python37-32\python.exe cd C:\GIT\npbackup +git pull || exit 1 :: Make sure we add npbackup in python path so bin and npbackup subfolders become packages SET OLD_PYTHONPATH=%PYTHONPATH% SET PYTHONPATH=c:\GIT\npbackup +"%PYTHON64%" -m pip install --upgrade -r npbackup/requirements.txt || exit 1 "%PYTHON64%" bin\compile.py --audience all + +"%PYTHON32%" -m pip install --upgrade -r npbackup/requirements.txt || exit 1 "%PYTHON32%" bin\compile.py --audience all SET PYTHONPATH=%OLD_PYTHONPATH% diff --git a/bin/COMPILE.sh b/bin/COMPILE.sh index 18b76832..b0d5527d 100755 --- a/bin/COMPILE.sh +++ b/bin/COMPILE.sh @@ -5,10 +5,15 @@ machine="$(uname -m)" cd /opt/npbackup +git pull || exit 1 OLD_PYTHONPATH="$PYTHONPATH" export PYTHONPATH=/opt/npbackup +# For RHEL 7 based builds, we need to define path to locally built tcl8.6 +[ -d /usr/local/lib/tcl8.6 ] && export LD_LIBRARY_PATH=/usr/local/lib + +/opt/npbackup/venv/bin/python -m pip install --upgrade -r npbackup/requirements.txt || exit 1 /opt/npbackup/venv/bin/python bin/compile.py --audience all $opts export PYTHONPATH="$OLD_PYTHONPATH" \ No newline at end of file diff --git a/npbackup/__version__.py b/npbackup/__version__.py index ec1a7a35..1ec3a2f6 100644 --- a/npbackup/__version__.py +++ b/npbackup/__version__.py @@ -9,8 +9,8 @@ __description__ = "NetPerfect Backup Client" __copyright__ = "Copyright (C) 2022-2024 NetInvent" __license__ = "GPL-3.0-only" -__build__ = "2024091601" -__version__ = "3.0.0-rc6" +__build__ = "2024102401" +__version__ = "3.0.0-rc7" import sys