From eb498abc47e8f01c77d27506fa430ac1fdbf6f44 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 7 Oct 2014 13:51:03 +0300
Subject: Improvements to setup scripts

- use the already fetched .repo/repo as a workaround for repo tool's
mandatory -u argument
- rename environment-setup.sh script
- Add notice about correctly sourcing the environment-setup.sh script

Change-Id: I4ac3cf26ca30ae1c14474cf9fb15e65ebc0be3ac
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
---
 scripts/setup-environment.sh | 85 ++++++++++++++++++++++++++++++++++++++++
 scripts/setup_environment.sh | 93 --------------------------------------------
 2 files changed, 85 insertions(+), 93 deletions(-)
 create mode 100755 scripts/setup-environment.sh
 delete mode 100755 scripts/setup_environment.sh

(limited to 'scripts')

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
new file mode 100755
index 0000000..2ff9e29
--- /dev/null
+++ b/scripts/setup-environment.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+while test -n "$1"; do
+  case "$1" in
+    "--help" | "-h")
+      echo "Usage: . $0 [build directory]"
+      return 0
+      ;;
+    *)
+      BUILDDIR=$1
+    ;;
+  esac
+  shift
+done
+
+THIS_SCRIPT="setup-environment.sh"
+if [ "$(basename $0)" = "${THIS_SCRIPT}" ]; then
+    echo "Error: This script needs to be sourced. Please run as '. $0'"
+    exit 1
+fi
+
+BUILDDIR=${BUILDDIR:-build-${MACHINE}}
+
+if [ -z "$MACHINE" ]; then
+  echo "Error: MACHINE environment variable not defined"
+  return 1
+fi
+
+if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
+  case ${MACHINE} in
+    apalis-imx6)
+      LAYERSCONF="bblayers.conf.toradex.sample"
+    ;;
+    imx53qsb|imx6qsabresd|nitrogen6x)
+      LAYERSCONF="bblayers.conf.fsl.sample"
+    ;;
+    beagleboard|am335x-evm)
+      LAYERSCONF="bblayers.conf.ti.sample"
+    ;;
+    beaglebone)
+      LAYERSCONF="bblayers.conf.bbb.sample"
+    ;;
+    raspberrypi)
+      LAYERSCONF="bblayers.conf.rpi.sample"
+    ;;
+    emulator)
+      LAYERSCONF="bblayers.conf.emulator.sample"
+    ;;
+    *)
+      LAYERSCONF="bblayers.conf.sample"
+      echo "Unknown MACHINE, bblayers.conf might need manual editing"
+    ;;
+  esac
+
+  mkdir -p ${PWD}/${BUILDDIR}/conf
+  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIR}/conf/bblayers.conf
+fi
+
+export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
+. sources/poky/oe-init-build-env ${BUILDDIR}
+
+unset BUILDDIR
+unset TEMPLATECONF
+unset LAYERSCONF
diff --git a/scripts/setup_environment.sh b/scripts/setup_environment.sh
deleted file mode 100755
index aaba070..0000000
--- a/scripts/setup_environment.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-usage() {
-  echo "source setup-environment <build-dir>"
-}
-
-clean() {
-  unset BUILDDIR
-  unset TEMPLATECONF
-  unset LAYERSCONF
-}
-
-CWD=`pwd`
-
-while test -n "$1"; do
-  case "$1" in
-    "--help" | "-h")
-      usage
-      return 0
-      ;;
-    *)
-      BUILDDIR=$1
-    ;;
-  esac
-  shift
-done
-
-if [ -z "${BUILDDIR}" ]; then
-  usage
-  return 1
-fi
-
-if [ -z "$MACHINE" ]; then
-  echo "MACHINE environment variable not defined"
-  clean
-  return 1
-fi
-
-if [ ! -f ${CWD}/${BUILDDIR}/conf/bblayers.conf ]; then
-  case ${MACHINE} in
-    apalis-imx6)
-      LAYERSCONF="bblayers.conf.toradex.sample"
-    ;;
-    imx53qsb|imx6qsabresd|nitrogen6x)
-      LAYERSCONF="bblayers.conf.fsl.sample"
-    ;;
-    beagleboard|am335x-evm)
-      LAYERSCONF="bblayers.conf.ti.sample"
-    ;;
-    beaglebone)
-      LAYERSCONF="bblayers.conf.bbb.sample"
-    ;;
-    raspberrypi)
-      LAYERSCONF="bblayers.conf.rpi.sample"
-    ;;
-    emulator)
-      LAYERSCONF="bblayers.conf.emulator.sample"
-    ;;
-    *)
-      LAYERSCONF="bblayers.conf.sample"
-      echo "Unknown MACHINE, bblayers.conf might need manual editing"
-    ;;
-  esac
-
-  mkdir -p ${CWD}/${BUILDDIR}/conf
-  cp ${CWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${CWD}/${BUILDDIR}/conf/bblayers.conf
-fi
-
-export TEMPLATECONF=${CWD}/sources/meta-b2qt/conf
-cd sources/poky
-. ./oe-init-build-env ${CWD}/${BUILDDIR}
-clean
-- 
cgit v1.2.3-54-g00ecf