diff options
author | 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com> | 2019-03-07 10:10:19 +0900 |
---|---|---|
committer | GitHub Enterprise <noreply-CODE@samsung.com> | 2019-03-07 10:10:19 +0900 |
commit | f526233091b1e4135c2eea0c0c01f3f4a9a50ad5 (patch) | |
tree | 32cf86b2120332cd0e241d645d4c257c4abcf0fe /scripts | |
parent | 4ee69c6b70b48f03929cd3691fb0b64742f2af11 (diff) | |
download | nnfw-f526233091b1e4135c2eea0c0c01f3f4a9a50ad5.tar.gz nnfw-f526233091b1e4135c2eea0c0c01f3f4a9a50ad5.tar.bz2 nnfw-f526233091b1e4135c2eea0c0c01f3f4a9a50ad5.zip |
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/standalone/docker_build_cross_arm.sh | 12 | ||||
-rwxr-xr-x | scripts/standalone/docker_build_cross_arm_release.sh | 11 | ||||
-rwxr-xr-x | scripts/standalone/docker_build_test_x64.sh | 5 | ||||
-rwxr-xr-x | scripts/standalone/docker_build_tizen_cross.sh | 7 | ||||
-rwxr-xr-x | scripts/standalone/docker_build_tizen_gbs.sh | 6 | ||||
-rwxr-xr-x | scripts/standalone/test_arm.sh | 1 |
6 files changed, 7 insertions, 35 deletions
diff --git a/scripts/standalone/docker_build_cross_arm.sh b/scripts/standalone/docker_build_cross_arm.sh index dfa2ed93d..9f0b5056e 100755 --- 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 94d1272f9..0bb526029 100755 --- 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 0848452dd..e76c35897 100755 --- 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 8f79ecf1c..6c5585a52 100755 --- 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 028c3236d..36ef1a688 100755 --- 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 34dc93524..7206e6a3f 100755 --- 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 |