harmonize build_oai -c/-C
Both do practically the same. Harmonize them into one while guaranteeing backwards compatibility. Signed-off-by: Robert Schmidt <robert.schmidt@openairinterface.org>
This commit is contained in:
+3
-12
@@ -130,12 +130,9 @@ function main() {
|
|||||||
--build-tool-opt)
|
--build-tool-opt)
|
||||||
BUILD_TOOL_OPT+=" $2"
|
BUILD_TOOL_OPT+=" $2"
|
||||||
shift 2;;
|
shift 2;;
|
||||||
-c | --clean)
|
-c | --clean | -C | --clean-all)
|
||||||
CLEAN=1
|
CLEAN=1
|
||||||
shift;;
|
shift;;
|
||||||
-C | --clean-all)
|
|
||||||
CLEAN_ALL=1
|
|
||||||
shift;;
|
|
||||||
--clean-kernel)
|
--clean-kernel)
|
||||||
clean_kernel
|
clean_kernel
|
||||||
echo_info "Erased iptables config and removed modules from kernel"
|
echo_info "Erased iptables config and removed modules from kernel"
|
||||||
@@ -382,10 +379,8 @@ function main() {
|
|||||||
|
|
||||||
echo "OPENAIR_DIR = $OPENAIR_DIR"
|
echo "OPENAIR_DIR = $OPENAIR_DIR"
|
||||||
|
|
||||||
if [ "$CLEAN_ALL" = "1" ] ; then
|
DIR=$OPENAIR_DIR/cmake_targets
|
||||||
clean_all_files
|
[ "$CLEAN" = "1" ] && rm -rf "$DIR/$BUILD_DIR"
|
||||||
echo "Erased all previously producted files"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$INSTALL_EXTERNAL" = "1" ] ; then
|
if [ "$INSTALL_EXTERNAL" = "1" ] ; then
|
||||||
echo_info "Installing packages"
|
echo_info "Installing packages"
|
||||||
@@ -418,10 +413,6 @@ function main() {
|
|||||||
check_install_additional_tools
|
check_install_additional_tools
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DIR=$OPENAIR_DIR/cmake_targets
|
|
||||||
|
|
||||||
[ "$CLEAN" = "1" ] && rm -rf $DIR/$BUILD_DIR/build
|
|
||||||
|
|
||||||
if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
|
if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then
|
||||||
# add some default libraries that should always be built
|
# add some default libraries that should always be built
|
||||||
# for eNB, gNB, UEs, simulators
|
# for eNB, gNB, UEs, simulators
|
||||||
|
|||||||
@@ -140,12 +140,6 @@ clean_kernel() {
|
|||||||
echo_info "Flushed iptables"
|
echo_info "Flushed iptables"
|
||||||
}
|
}
|
||||||
|
|
||||||
clean_all_files() {
|
|
||||||
set_openair_env
|
|
||||||
dir=$OPENAIR_DIR/cmake_targets
|
|
||||||
rm -rf $dir/ran_build $dir/ran_build_noLOG
|
|
||||||
}
|
|
||||||
|
|
||||||
############################################
|
############################################
|
||||||
# External packages installers
|
# External packages installers
|
||||||
############################################
|
############################################
|
||||||
|
|||||||
Reference in New Issue
Block a user