Introduce and use import function for configuraiton loading (#4206)

This commit revises nncc & command scripts not to depend on
"NNCC_SCRIPT_PATH" variable.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/nncc b/nncc
index e0b546e..bb055cc 100755 (executable)
--- a/nncc
+++ b/nncc
@@ -35,4 +35,9 @@ fi
 export NNCC_PROJECT_PATH
 export NNCC_SCRIPT_PATH
 
+function import()
+{
+  source "${NNCC_SCRIPT_PATH}/$1"
+}
+
 source "${COMMAND_FILE}" "$@"

diff --git a/scripts/command/build b/scripts/command/build
index 652212f..86082c1 100644 (file)
--- a/scripts/command/build
+++ b/scripts/command/build
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/build.configuration"
+import "build.configuration"
 
 BUILD_WORKSPACE_PATH="${NNCC_PROJECT_PATH}/${BUILD_WORKSPACE_RPATH}"
 

diff --git a/scripts/command/configure b/scripts/command/configure
index 3af9758..5b4719f 100644 (file)
--- a/scripts/command/configure
+++ b/scripts/command/configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/build.configuration"
+import "build.configuration"
 
 BUILD_WORKSPACE_PATH="${NNCC_PROJECT_PATH}/${BUILD_WORKSPACE_RPATH}"
 

diff --git a/scripts/command/docker-nncc b/scripts/command/docker-nncc
index 143a280..0eea016 100644 (file)
--- a/scripts/command/docker-nncc
+++ b/scripts/command/docker-nncc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/docker.configuration"
+import "docker.configuration"
 
 docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME ./nncc "$@"
 EXITCODE=$?

diff --git a/scripts/command/docker-run b/scripts/command/docker-run
index 24b7ba6..863b2b8 100644 (file)
--- a/scripts/command/docker-run
+++ b/scripts/command/docker-run
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/docker.configuration"
+import "docker.configuration"
 
 docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME "$@"
 EXITCODE=$?

diff --git a/scripts/command/docker-shell b/scripts/command/docker-shell
index 1c3918e..7f84498 100644 (file)
--- a/scripts/command/docker-shell
+++ b/scripts/command/docker-shell
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/docker.configuration"
+import "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/gen-coverage-report b/scripts/command/gen-coverage-report
index 1933889..67a9418 100644 (file)
--- a/scripts/command/gen-coverage-report
+++ b/scripts/command/gen-coverage-report
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/build.configuration"
+import "build.configuration"
 
 BUILD_WORKSPACE_PATH="${NNCC_PROJECT_PATH}/${BUILD_WORKSPACE_RPATH}"
 

diff --git a/scripts/command/test b/scripts/command/test
index eef4416..96ddd7a 100644 (file)
--- a/scripts/command/test
+++ b/scripts/command/test
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source "${NNCC_SCRIPT_PATH}/build.configuration"
+import "build.configuration"
 
 BUILD_WORKSPACE_PATH="${NNCC_PROJECT_PATH}/${BUILD_WORKSPACE_RPATH}"