kopia lustrzana https://github.com/OpenDroneMap/ODM
Add installreqs command in configure.sh
rodzic
3c6b978d26
commit
74a35035c7
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
2.5.6
|
2.5.7
|
||||||
|
|
14
configure.sh
14
configure.sh
|
@ -97,8 +97,8 @@ installruntimedepsonly() {
|
||||||
installdepsfromsnapcraft runtime openmvs
|
installdepsfromsnapcraft runtime openmvs
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
install() {
|
installreqs() {
|
||||||
cd /code
|
cd /code
|
||||||
|
|
||||||
## Set up library paths
|
## Set up library paths
|
||||||
|
@ -123,6 +123,10 @@ install() {
|
||||||
if [ ! -z "$GPU_INSTALL" ]; then
|
if [ ! -z "$GPU_INSTALL" ]; then
|
||||||
pip install --ignore-installed -r requirements.gpu.txt
|
pip install --ignore-installed -r requirements.gpu.txt
|
||||||
fi
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
install() {
|
||||||
|
installreqs
|
||||||
|
|
||||||
if [ ! -z "$PORTABLE_INSTALL" ]; then
|
if [ ! -z "$PORTABLE_INSTALL" ]; then
|
||||||
echo "Replacing g++ and gcc with our scripts for portability..."
|
echo "Replacing g++ and gcc with our scripts for portability..."
|
||||||
|
@ -176,7 +180,7 @@ clean() {
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage:"
|
echo "Usage:"
|
||||||
echo "bash configure.sh <install|update|uninstall|help> [nproc]"
|
echo "bash configure.sh <install|update|uninstall|installreqs|help> [nproc]"
|
||||||
echo "Subcommands:"
|
echo "Subcommands:"
|
||||||
echo " install"
|
echo " install"
|
||||||
echo " Installs all dependencies and modules for running OpenDroneMap"
|
echo " Installs all dependencies and modules for running OpenDroneMap"
|
||||||
|
@ -186,6 +190,8 @@ usage() {
|
||||||
echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update OpenDroneMap to the latest version. "
|
echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update OpenDroneMap to the latest version. "
|
||||||
echo " uninstall"
|
echo " uninstall"
|
||||||
echo " Removes SuperBuild and build modules. Does not uninstall dependencies"
|
echo " Removes SuperBuild and build modules. Does not uninstall dependencies"
|
||||||
|
echo " installreqs"
|
||||||
|
echo " Only installs the requirements (does not build SuperBuild)"
|
||||||
echo " clean"
|
echo " clean"
|
||||||
echo " Cleans the SuperBuild directory by removing temporary files. "
|
echo " Cleans the SuperBuild directory by removing temporary files. "
|
||||||
echo " help"
|
echo " help"
|
||||||
|
@ -193,7 +199,7 @@ usage() {
|
||||||
echo "[nproc] is an optional argument that can set the number of processes for the make -j tag. By default it uses $(nproc)"
|
echo "[nproc] is an optional argument that can set the number of processes for the make -j tag. By default it uses $(nproc)"
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ $1 =~ ^(install|installruntimedepsonly|reinstall|uninstall|clean)$ ]]; then
|
if [[ $1 =~ ^(install|installruntimedepsonly|reinstall|uninstall|installreqs|clean)$ ]]; then
|
||||||
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
"$1"
|
"$1"
|
||||||
else
|
else
|
||||||
|
|
Ładowanie…
Reference in New Issue