Locate setenv.sh in os/tools

Add usage for setenv.sh. Remove default toolchain path

diff --git a/os/tools/configure.sh b/os/tools/configure.sh
index e8dd9b3..ebe6330 100755 (executable)
--- a/os/tools/configure.sh
+++ b/os/tools/configure.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ###########################################################################
 #
-# Copyright 2016 Samsung Electronics All Rights Reserved.
+# Copyright 2016-2017 Samsung Electronics All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -126,14 +126,14 @@ if [ ! -r "${src_makedefs}" ]; then
   exit 4
 fi
 
-src_setenv="${boardconfigpath}/../scripts/setenv.sh"
+src_setenv="${WD}/setenv.sh"
 unset have_setenv
 
 if [ -r "${src_setenv}" ]; then
   dest_setenv=${TOPDIR}/setenv.sh
   have_setenv=y
 else
-  src_setenv="${boardconfigpath}/setenv.bat"
+  src_setenv="${WD}/setenv.bat"
   if [ -r "${src_setenv}" ]; then
     dest_setenv=${TOPDIR}/setenv.bat
     have_setenv=y

diff --git a/os/tools/setenv.sh b/os/tools/setenv.sh
new file mode 100755 (executable)
index 0000000..f576190
--- /dev/null
+++ b/os/tools/setenv.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+###########################################################################
+#
+# Copyright 2016-2017 Samsung Electronics All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+#
+###########################################################################
+# setenv.sh
+#
+#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <gnutt@nuttx.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+TOOLCHAIN_PATH=$1
+WD=`pwd`
+
+if [ "${BASH_SOURCE[0]}" == "${0}" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  echo "USAGE: . $0 [TOOLCHAIN_PATH]"
+  exit 1
+fi
+
+if [ -z ${TOOLCHAIN_PATH} ]; then
+  echo "USAGE: . ./setenv.sh [TOOLCHAIN_PATH]"
+  return 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_PATH}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"
+