Remove unused scripts and change script name (#2083)
author오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Wed, 25 Jul 2018 10:54:20 +0000 (19:54 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Wed, 25 Jul 2018 10:54:20 +0000 (19:54 +0900)
Remove unused script: pureacl
Change name: neurun
Remain docker_env_newruntime: CI issue

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
scripts/command/docker_build_cross_arm_neurun.sh [moved from scripts/command/docker_build_cross_arm_newruntime.sh with 100% similarity]
scripts/command/docker_build_cross_arm_pureacl.sh [deleted file]
scripts/command/docker_build_tizen_cross_pureacl.sh [deleted file]
scripts/command/docker_env_neurun [new file with mode: 0644]
scripts/command/docker_env_pureacl [deleted file]

diff --git a/scripts/command/docker_build_cross_arm_pureacl.sh b/scripts/command/docker_build_cross_arm_pureacl.sh
deleted file mode 100755 (executable)
index 5d44f5a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# DOCKER_HOME and DOCKER_ENV_VARS
-source $SCRIPT_ROOT/nnfw_docker
-
-HOST_HOME=$SCRIPT_ROOT/../..
-
-DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
-
-DOCKER_ENV_VARS+=" -e TARGET_ARCH=armv7l"
-DOCKER_ENV_VARS+=" -e CROSS_BUILD=1"
-DOCKER_ENV_VARS+=" -e ROOTFS_DIR=/opt/rootfs"
-
-DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
-
-# prepare rootfs
-if [[ ! -d $ROOTFS_DIR ]]; then
-  echo "cannot find rootfs"
-  exit 1
-fi
-
-DOCKER_VOLUMES+=" -v $ROOTFS_DIR:/opt/rootfs"
-
-# Change .gitmodules to work around the permission issue
-CMD_SUBMODULE="./scripts/command/change_gitmodule.sh"
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD_SUBMODULE"
-
-if [ -n "$DOCKER_INTERACTIVE" ]; then
-  DOCKER_RUN_OPTS+=" -it"
-  CMD="/bin/bash"
-else
-  CMD="export OPTIONS=\" -DBUILD_PURE_ARM_COMPUTE=ON \" && make acl && make && make install && make build_test_suite"
-fi
-
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD"
-BUILD_RESULT=$?
-
-source $SCRIPT_ROOT/../docker_helper
-restore_ownership $HOST_HOME $DOCKER_HOME
-
-exit $BUILD_RESULT
diff --git a/scripts/command/docker_build_tizen_cross_pureacl.sh b/scripts/command/docker_build_tizen_cross_pureacl.sh
deleted file mode 100755 (executable)
index 1fe31b5..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# DOCKER_HOME and DOCKER_ENV_VARS
-source $SCRIPT_ROOT/nnfw_docker
-
-HOST_HOME=$SCRIPT_ROOT/../..
-
-DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
-
-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 TARGET_OS=tizen"
-
-DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
-
-# prepare rootfs
-if [[ ! -d $ROOTFS_DIR ]]; then
-  echo "cannot find rootfs"
-  exit 1
-fi
-
-DOCKER_VOLUMES+=" -v $ROOTFS_DIR/:/opt/rootfs"
-
-CMD="export OPTIONS=\"-DBUILD_ACL=ON -DBUILD_PURE_ARM_COMPUTE=ON\" && make && make install && make build_test_suite"
-
-# Change .gitmodules to work around the permission issue
-CMD_SUBMODULE="./scripts/command/change_gitmodule.sh"
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD_SUBMODULE"
-
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD"
-BUILD_RESULT=$?
-
-source $SCRIPT_ROOT/../docker_helper
-restore_ownership $HOST_HOME $DOCKER_HOME
-
-exit $BUILD_RESULT
diff --git a/scripts/command/docker_env_neurun b/scripts/command/docker_env_neurun
new file mode 100644 (file)
index 0000000..53b3bbc
--- /dev/null
@@ -0,0 +1 @@
+OPTIONS=-DBUILD_NEURUN=ON
diff --git a/scripts/command/docker_env_pureacl b/scripts/command/docker_env_pureacl
deleted file mode 100644 (file)
index 35c3b5d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-OPTIONS=-DBUILD_PURE_ARM_COMPUTE=ON