make_it scripts refactoring

This commit is contained in:
alemuntoni 2022-11-24 15:38:42 +01:00
parent 083898bdb0
commit 61f8162ac3
5 changed files with 64 additions and 19 deletions

View File

@ -20,9 +20,12 @@ SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
SOURCE_PATH=$SCRIPTS_PATH/../../src
BUILD_PATH=$SOURCE_PATH/../build
INSTALL_PATH=$SOURCE_PATH/../install
CORES="-j4"
PACKAGE_PATH=$SOURCE_PATH/../packages
DOUBLE_PRECISION_OPTION=""
NIGHTLY_OPTION=""
QT_DIR_OPTION=""
CCACHE_OPTION=""
#check parameters
for i in "$@"
@ -36,24 +39,32 @@ case $i in
INSTALL_PATH="${i#*=}"/usr/
shift # past argument=value
;;
-j*)
CORES=$i
-p=*|--package_path=*)
PACKAGE_PATH="${i#*=}"
shift # past argument=value
;;
--double_precision)
DOUBLE_PRECISION_OPTION="--double_precision"
shift # past argument=value
;;
-n|--nightly)
NIGHTLY_OPTION="--nightly"
shift # past argument=value
;;
-qt=*|--qt_dir=*)
QT_DIR_OPTION=-qt=${i#*=}
shift # past argument=value
;;
--ccache)
CCACHE_OPTION="--ccache"
shift # past argument=value
;;
*)
# unknown option
;;
esac
done
bash $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $QT_DIR_OPTION $DOUBLE_PRECISION_OPTION $CORES
bash $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $NIGHTLY_OPTION $DOUBLE_PRECISION_OPTION $QT_DIR_OPTION $CCACHE_OPTION
bash $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH $QT_DIR_OPTION
bash $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH
bash $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH -p=$PACKAGE_PATH

View File

@ -89,5 +89,5 @@ bash 3_pack.sh --install_path=path/to/install --package_path=path/to/packages
## `make_it.sh`
This script computes all the three previous scripts: starting from the source code, it will produce a self-contained package/installer of MeshLab.
This script computes all the three previous scripts: starting from the source code, it will produce a self-contained package/installer of MeshLab. Input arguments are a union of all the arguments of the previous scripts.

View File

@ -19,8 +19,12 @@ SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
SOURCE_PATH=$SCRIPTS_PATH/../../src
BUILD_PATH=$SOURCE_PATH/../build
INSTALL_PATH=$SOURCE_PATH/../install
CORES="-j4"
PACKAGE_PATH=$SOURCE_PATH/../packages
DOUBLE_PRECISION_OPTION=""
NIGHTLY_OPTION=""
QT_DIR_OPTION=""
CCACHE_OPTION=""
#check parameters
for i in "$@"
@ -34,20 +38,33 @@ case $i in
INSTALL_PATH="${i#*=}"/usr/
shift # past argument=value
;;
-j*)
CORES=$i
-p=*|--package_path=*)
PACKAGE_PATH="${i#*=}"
shift # past argument=value
;;
--double_precision)
DOUBLE_PRECISION_OPTION="--double_precision"
shift # past argument=value
;;
-n|--nightly)
NIGHTLY_OPTION="--nightly"
shift # past argument=value
;;
-qt=*|--qt_dir=*)
QT_DIR_OPTION=-qt=${i#*=}
shift # past argument=value
;;
--ccache)
CCACHE_OPTION="--ccache"
shift # past argument=value
;;
*)
# unknown option
;;
esac
done
sh $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $DOUBLE_PRECISION_OPTION $CORES
sh $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH
sh $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH
bash $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $NIGHTLY_OPTION $DOUBLE_PRECISION_OPTION $QT_DIR_OPTION $CCACHE_OPTION
bash $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH $QT_DIR_OPTION
bash $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH -p=$PACKAGE_PATH

View File

@ -22,7 +22,7 @@ case $i in
esac
done
brew install cmake ninja libomp cgal xerces-c
brew install node cmake ninja libomp cgal xerces-c
npm install -g appdmg
if [ "$DONT_INSTALL_QT" = false ] ; then

View File

@ -20,8 +20,12 @@ SCRIPTS_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
SOURCE_PATH=$SCRIPTS_PATH/../../src
BUILD_PATH=$SOURCE_PATH/../build
INSTALL_PATH=$SOURCE_PATH/../install
CORES="-j4"
PACKAGE_PATH=$SOURCE_PATH/../packages
DOUBLE_PRECISION_OPTION=""
NIGHTLY_OPTION=""
QT_DIR_OPTION=""
CCACHE_OPTION=""
#check parameters
for i in "$@"
@ -35,20 +39,33 @@ case $i in
INSTALL_PATH="${i#*=}"/usr/
shift # past argument=value
;;
-j*)
CORES=$i
-p=*|--package_path=*)
PACKAGE_PATH="${i#*=}"
shift # past argument=value
;;
--double_precision)
DOUBLE_PRECISION_OPTION="--double_precision"
shift # past argument=value
;;
-n|--nightly)
NIGHTLY_OPTION="--nightly"
shift # past argument=value
;;
-qt=*|--qt_dir=*)
QT_DIR_OPTION=-qt=${i#*=}
shift # past argument=value
;;
--ccache)
CCACHE_OPTION="--ccache"
shift # past argument=value
;;
*)
# unknown option
;;
esac
done
sh $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $DOUBLE_PRECISION_OPTION $CORES
sh $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH
sh $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH
bash $SCRIPTS_PATH/1_build.sh -b=$BUILD_PATH -i=$INSTALL_PATH $NIGHTLY_OPTION $DOUBLE_PRECISION_OPTION $QT_DIR_OPTION $CCACHE_OPTION
bash $SCRIPTS_PATH/2_deploy.sh -i=$INSTALL_PATH $QT_DIR_OPTION
bash $SCRIPTS_PATH/3_pack.sh -i=$INSTALL_PATH -p=$PACKAGE_PATH