Make script/config directory (#3692)

Make script/config directory and move configuration files for script into script/config

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

diff --git a/scripts/command/build b/scripts/command/build
index e2fcb87..1e8b9b7 100644 (file)
--- a/scripts/command/build
+++ b/scripts/command/build
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # NOTE 'run' sets NNFW_SCRIPT_PATH and invokes this script
-source "${NNFW_SCRIPT_PATH}/build.configuration"
+source "${NNFW_SCRIPT_PATH}/config/build.configuration"
 
 if [[ ! -d "${BUILD_ALIAS}" ]]; then
   echo "'${BUILD_ALIAS}' does not exist. Please run 'configure' first"

diff --git a/scripts/command/build-acl b/scripts/command/build-acl
index 2e99cac..a995755 100644 (file)
--- a/scripts/command/build-acl
+++ b/scripts/command/build-acl
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # NOTE 'run' sets NNFW_SCRIPT_PATH and invokes this script
-source "${NNFW_SCRIPT_PATH}/build.configuration"
+source "${NNFW_SCRIPT_PATH}/config/build.configuration"
 
 # Set parallel build
 # TODO: use argument instead of environment variable and merge with build command

diff --git a/scripts/command/build_docker b/scripts/command/build_docker
index 63f1168..23bea41 100755 (executable)
--- a/scripts/command/build_docker
+++ b/scripts/command/build_docker
@@ -29,7 +29,7 @@ do
   shift
 done
 
-source "$NNFW_SCRIPT_PATH/image_name.configuration"
+source "$NNFW_SCRIPT_PATH/config/image_name.configuration"
 
 docker build --build-arg http_proxy="$http_proxy" \
   --build-arg https_proxy="$https_proxy" \

diff --git a/scripts/command/configure b/scripts/command/configure
index 2ff3c38..3b654d6 100644 (file)
--- a/scripts/command/configure
+++ b/scripts/command/configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNFW_SCRIPT_PATH}/build.configuration"
+source "${NNFW_SCRIPT_PATH}/config/build.configuration"
 
 # Set target platform using environment variable
 # TODO: use argument instead of environment variable

diff --git a/scripts/command/docker-run b/scripts/command/docker-run
index c991c96..ff08819 100644 (file)
--- a/scripts/command/docker-run
+++ b/scripts/command/docker-run
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNFW_SCRIPT_PATH}/docker.configuration"
+source "${NNFW_SCRIPT_PATH}/config/docker.configuration"
 
 docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME "$@"
 EXITCODE=$?

diff --git a/scripts/command/docker-run-user b/scripts/command/docker-run-user
index 448fd31..d5b74db 100644 (file)
--- a/scripts/command/docker-run-user
+++ b/scripts/command/docker-run-user
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNFW_SCRIPT_PATH}/docker.configuration"
+source "${NNFW_SCRIPT_PATH}/config/docker.configuration"
 
 DOCKER_RUN_OPTS+=" -u $(id -u):$(id -g)"
 

diff --git a/scripts/command/docker-shell b/scripts/command/docker-shell
index 9f24c36..1f942ce 100755 (executable)
--- a/scripts/command/docker-shell
+++ b/scripts/command/docker-shell
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNFW_SCRIPT_PATH}/docker.configuration"
+source "${NNFW_SCRIPT_PATH}/config/docker.configuration"
 
 DOCKER_RUN_OPTS+=" -it"
 docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME "/bin/bash"

diff --git a/scripts/command/docker_gbs_build.sh b/scripts/command/docker_gbs_build.sh
index c04ffe0..047d9ef 100755 (executable)
--- a/scripts/command/docker_gbs_build.sh
+++ b/scripts/command/docker_gbs_build.sh
@@ -16,7 +16,7 @@ export NNFW_SCRIPT_PATH
 
 pushd $NNFW_PROJECT_PATH
 
-CMD="gbs -c ${NNFW_PROJECT_PATH}/scripts/command/gbs.conf build -A armv7l --profile=profile.tizen --clean --include-all --define '${GBS_DEFINE}' &&
+CMD="gbs -c ${NNFW_PROJECT_PATH}/scripts/config/gbs.conf build -A armv7l --profile=profile.tizen --clean --include-all --define '${GBS_DEFINE}' &&
          cp -rf /home/GBS-ROOT/local/repos/tizen/armv7l/RPMS/*.rpm ${DOCKER_RPM_HOME}/."
 source run docker-run bash -c "${CMD}"
 EXITCODE=$?

diff --git a/scripts/command/install b/scripts/command/install
index c6631ce..a40268a 100644 (file)
--- a/scripts/command/install
+++ b/scripts/command/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNFW_SCRIPT_PATH}/build.configuration"
+source "${NNFW_SCRIPT_PATH}/config/build.configuration"
 
 if [[ ! -d "${BUILD_ALIAS}" ]]; then
   echo "'${BUILD_ALIAS}' does not exist. Please run 'configure' first"

diff --git a/scripts/build.configuration b/scripts/config/build.configuration
similarity index 100%
rename from scripts/build.configuration
rename to scripts/config/build.configuration

diff --git a/scripts/docker.configuration b/scripts/config/docker.configuration
similarity index 95%
rename from scripts/docker.configuration
rename to scripts/config/docker.configuration
index 5003b8c..806ffb3 100644 (file)
--- a/scripts/docker.configuration
+++ b/scripts/config/docker.configuration
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "$NNFW_SCRIPT_PATH/image_name.configuration"
+source "$NNFW_SCRIPT_PATH/config/image_name.configuration"
 
 echo "Using docker image $DOCKER_IMAGE_NAME"
 

diff --git a/scripts/command/gbs.conf b/scripts/config/gbs.conf
similarity index 100%
rename from scripts/command/gbs.conf
rename to scripts/config/gbs.conf

diff --git a/scripts/image_name.configuration b/scripts/config/image_name.configuration
similarity index 100%
rename from scripts/image_name.configuration
rename to scripts/config/image_name.configuration