setup.sh: add distdir setting

apollo_build: remove apollo.bashrc

cyber/setup.bash

@@ -2,6 +2,7 @@
 TOP_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd -P)"
 source ${TOP_DIR}/scripts/apollo.bashrc
 
+export APOLLO_BAZEL_DISTDIR="${APOLLO_CACHE_DIR}/distdir"
 export CYBER_PATH="${APOLLO_ROOT_DIR}/cyber"
 
 bazel_bin_path="${APOLLO_ROOT_DIR}/bazel-bin"

scripts/apollo_build.sh

@@ -19,7 +19,6 @@
 set -e
 
 TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
-source "${TOP_DIR}/scripts/apollo.bashrc"
 source "${TOP_DIR}/scripts/apollo_base.sh"
 
 ARCH="$(uname -m)"

scripts/apollo_config.sh

@@ -17,14 +17,13 @@
 ###############################################################################
 
 TOP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
-source "${TOP_DIR}/scripts/apollo.bashrc"
-
+source "${TOP_DIR}/cyber/setup.sh"
 # STAGE="${STAGE:-dev}"
 : ${STAGE:=dev}
 
 IFS='' read -r -d '' STARTUP_TXT << EOF
 startup --output_user_root="${APOLLO_CACHE_DIR}/bazel"
-common --distdir="${APOLLO_CACHE_DIR}/distdir"
+common --distdir="${APOLLO_BAZEL_DISTDIR}"
 EOF
 
 set -e