Update variable setting in scripts (#4603)

- Remove export in scripts/standalone

We can remove them because we call other script using source

- Remove setting BENCHMARK_ACL_BUILD

- Use make command more lines

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/scripts/standalone/docker_build_cross_arm.sh b/scripts/standalone/docker_build_cross_arm.sh
index dfa2ed9..9f0b505 100755 (executable)
--- a/scripts/standalone/docker_build_cross_arm.sh
+++ b/scripts/standalone/docker_build_cross_arm.sh
@@ -17,33 +17,27 @@ fi
 
 DOCKER_VOLUMES=" -v $ROOTFS_DIR:/opt/rootfs"
 DOCKER_VOLUMES+=" -v $EXT_ACL_FOLDER:/opt/acl"
-export DOCKER_VOLUMES
 
 # docker image name
 if [[ -z $DOCKER_IMAGE_NAME ]]; then
   echo "It will use default docker image name"
-else
-  export DOCKER_IMAGE_NAME
 fi
 
 DOCKER_ENV_VARS=" -e TARGET_ARCH=armv7l"
 DOCKER_ENV_VARS+=" -e CROSS_BUILD=1"
 DOCKER_ENV_VARS+=" -e ROOTFS_DIR=/opt/rootfs"
 DOCKER_ENV_VARS+=" -e EXT_ACL_FOLDER=/opt/acl"
-DOCKER_ENV_VARS+=" -e BENCHMARK_ACL_BUILD=1"
-
 # Mirror server setting
 if [[ -z $EXTERNAL_DOWNLOAD_SERVER ]]; then
   echo "It will not use mirror server"
-else
-  DOCKER_ENV_VARS+=" -e EXTERNAL_DOWNLOAD_SERVER=$EXTERNAL_DOWNLOAD_SERVER"
 fi
-export DOCKER_ENV_VARS
 
 pushd $ROOT_PATH > /dev/null
 
 # TODO use command instead of makefile
-CMD="make && make install && make build_test_suite"
+CMD="make && \
+     make install && \
+     make build_test_suite"
 source nnfw docker-run-user bash -c "${CMD}"
 
 popd > /dev/null

diff --git a/scripts/standalone/docker_build_cross_arm_release.sh b/scripts/standalone/docker_build_cross_arm_release.sh
index 94d1272..0bb5260 100755 (executable)
--- a/scripts/standalone/docker_build_cross_arm_release.sh
+++ b/scripts/standalone/docker_build_cross_arm_release.sh
@@ -17,34 +17,29 @@ fi
 
 DOCKER_VOLUMES=" -v $ROOTFS_DIR:/opt/rootfs"
 DOCKER_VOLUMES+=" -v $EXT_ACL_FOLDER:/opt/acl"
-export DOCKER_VOLUMES
 
 # docker image name
 if [[ -z $DOCKER_IMAGE_NAME ]]; then
   echo "It will use default docker image name"
-else
-  export DOCKER_IMAGE_NAME
 fi
 
 DOCKER_ENV_VARS=" -e TARGET_ARCH=armv7l"
 DOCKER_ENV_VARS+=" -e CROSS_BUILD=1"
 DOCKER_ENV_VARS+=" -e ROOTFS_DIR=/opt/rootfs"
 DOCKER_ENV_VARS+=" -e EXT_ACL_FOLDER=/opt/acl"
-DOCKER_ENV_VARS+=" -e BENCHMARK_ACL_BUILD=1"
 DOCKER_ENV_VARS+=" -e BUILD_TYPE=release"
 
 # Mirror server setting
 if [[ -z $EXTERNAL_DOWNLOAD_SERVER ]]; then
   echo "It will not use mirror server"
-else
-  DOCKER_ENV_VARS+=" -e EXTERNAL_DOWNLOAD_SERVER=$EXTERNAL_DOWNLOAD_SERVER"
 fi
-export DOCKER_ENV_VARS
 
 pushd $ROOT_PATH > /dev/null
 
 # TODO use command instead of makefile
-CMD="make && make install && make build_test_suite"
+CMD="make && \
+     make install && \
+     make build_test_suite"
 source nnfw docker-run-user bash -c "${CMD}"
 
 popd > /dev/null

diff --git a/scripts/standalone/docker_build_test_x64.sh b/scripts/standalone/docker_build_test_x64.sh
index 0848452..e76c358 100755 (executable)
--- a/scripts/standalone/docker_build_test_x64.sh
+++ b/scripts/standalone/docker_build_test_x64.sh
@@ -6,17 +6,12 @@ ROOT_PATH="$CURRENT_PATH/../../"
 # docker image name
 if [[ -z $DOCKER_IMAGE_NAME ]]; then
   echo "It will use default docker image name"
-else
-  export DOCKER_IMAGE_NAME
 fi
 
 # Mirror server setting
 if [[ -z $EXTERNAL_DOWNLOAD_SERVER ]]; then
   echo "It will not use mirror server"
-else
-  DOCKER_ENV_VARS=" -e EXTERNAL_DOWNLOAD_SERVER=$EXTERNAL_DOWNLOAD_SERVER"
 fi
-export DOCKER_ENV_VARS
 
 pushd $ROOT_PATH > /dev/null
 

diff --git a/scripts/standalone/docker_build_tizen_cross.sh b/scripts/standalone/docker_build_tizen_cross.sh
index 8f79ecf..6c5585a 100755 (executable)
--- a/scripts/standalone/docker_build_tizen_cross.sh
+++ b/scripts/standalone/docker_build_tizen_cross.sh
@@ -10,13 +10,10 @@ if [[ ! -d $ROOTFS_DIR ]]; then
 fi
 
 DOCKER_VOLUMES=" -v $ROOTFS_DIR/:/opt/rootfs"
-export DOCKER_VOLUMES
 
 # docker image name
 if [[ -z $DOCKER_IMAGE_NAME ]]; then
   echo "It will use default docker image name"
-else
-  export DOCKER_IMAGE_NAME
 fi
 
 DOCKER_ENV_VARS=" -e TARGET_ARCH=armv7l"
@@ -30,11 +27,7 @@ DOCKER_ENV_VARS+=" -e OPTIONS=-DBUILD_ARMCOMPUTE=OFF"
 # Mirror server setting
 if [[ -z $EXTERNAL_DOWNLOAD_SERVER ]]; then
   echo "It will not use mirror server"
-else
-  DOCKER_ENV_VARS+=" -e EXTERNAL_DOWNLOAD_SERVER=$EXTERNAL_DOWNLOAD_SERVER"
 fi
-export DOCKER_ENV_VARS
-
 pushd $ROOT_PATH > /dev/null
 
 CMD="make && \

diff --git a/scripts/standalone/docker_build_tizen_gbs.sh b/scripts/standalone/docker_build_tizen_gbs.sh
index 028c323..36ef1a6 100755 (executable)
--- a/scripts/standalone/docker_build_tizen_gbs.sh
+++ b/scripts/standalone/docker_build_tizen_gbs.sh
@@ -6,17 +6,13 @@ ROOT_PATH="$CURRENT_PATH/../../"
 GBS_RPM_DIR=$ROOT_PATH/Product/out/rpm
 mkdir -p $GBS_RPM_DIR
 DOCKER_VOLUMES=" -v $GBS_RPM_DIR:/opt/rpm"
-export DOCKER_VOLUMES
 
 if [[ -z $DOCKER_IMAGE_NAME ]]; then
   echo "It will use default docker image name for tizen gbs build"
-  export DOCKER_IMAGE_NAME="nnfw_docker_tizen"
-else
-  export DOCKER_IMAGE_NAME
+  DOCKER_IMAGE_NAME="nnfw_docker_tizen"
 fi
 
 DOCKER_ENV_VARS=" --privileged"
-export DOCKER_ENV_VARS
 
 pushd $ROOT_PATH > /dev/null
 

diff --git a/scripts/standalone/test_arm.sh b/scripts/standalone/test_arm.sh
index 34dc935..7206e6a 100755 (executable)
--- a/scripts/standalone/test_arm.sh
+++ b/scripts/standalone/test_arm.sh
@@ -8,7 +8,6 @@ if [[ -z $MODELFILE_SERVER ]]; then
   echo "Need model file server setting"
   exit 1
 fi
-export $MODELFILE_SERVER
 
 pushd $ROOT_PATH > /dev/null