[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1434-g738b3274

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  738b3274a85bab21a3ea81489ec2fe5ebb75158a (commit)
      from  9b1cc962e8188704c7724ab62004fc5a45d85915 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 738b3274a85bab21a3ea81489ec2fe5ebb75158a
Author: darcagn <da...@pr...>
Date:   Wed Jun 12 21:09:45 2024 -0600

    Add DC_TOOLS_BASE env variable for external tools (#613)
    
    * Add DC_TOOLS_BASE env variable for external tools
    * Update environ_dreamcast.sh

-----------------------------------------------------------------------

Summary of changes:
 doc/environ.sh.sample | 19 +++++++++----------
 environ_base.sh       |  7 ++++++-
 environ_dreamcast.sh  | 10 ++++++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/doc/environ.sh.sample b/doc/environ.sh.sample
index 58fc084e..f1a0989d 100644
--- a/doc/environ.sh.sample
+++ b/doc/environ.sh.sample
@@ -61,6 +61,15 @@ export KOS_CC_PREFIX="sh-elf"
 export DC_ARM_BASE="/opt/toolchains/dc/arm-eabi"
 export DC_ARM_PREFIX="arm-eabi"
 
+# External Dreamcast Tools Path
+#
+# Specifies the path where Dreamcast tools that are not part of KOS are to be
+# installed. This includes, for example, dc-tool-ip, dc-tool-serial, and the
+# mrbc bytecode compiler. This directory, along with SH and ARM compiler
+# toolchains, will be added to your PATH environment variable.
+#
+export DC_TOOLS_BASE="/opt/toolchains/dc/bin"
+
 # CMake Toolchain Path
 #
 # Specifies the path to the toolchain file used to target
@@ -198,16 +207,6 @@ export KOS_SH4_PRECISION="-m4-single-only"
 #
 #export KOS_CFLAGS="${KOS_CFLAGS} -mlra"
 
-# Additional Tools Path
-#
-# If not already set, add "bin" directory to PATH variable, which is where
-# additional tools such as dc-tool-ip and dc-tool-serial are typically
-# installed. Comment this out if you don't want this included within your PATH.
-#
-if [[ ":$PATH:" != *":${KOS_CC_BASE}/bin:/opt/toolchains/dc/bin"* ]]; then
-  export PATH="${PATH}:${KOS_CC_BASE}/bin:/opt/toolchains/dc/bin"
-fi
-
 # Shared Compiler Configuration
 #
 # Include sub architecture-independent configuration file for shared
diff --git a/environ_base.sh b/environ_base.sh
index 446e3b3a..017446da 100644
--- a/environ_base.sh
+++ b/environ_base.sh
@@ -12,7 +12,12 @@ export KOS_ARCH_DIR="${KOS_BASE}/kernel/arch/${KOS_ARCH}"
 # Pull in the arch environ file
 . ${KOS_BASE}/environ_${KOS_ARCH}.sh
 
-# Add the gnu wrappers dir to the path if it is not already
+# Add the compiler bins dir to the path if it is not already
+if [[ ":$PATH:" != *":${KOS_CC_BASE}/bin:"* ]]; then
+  export PATH="${PATH}:${KOS_CC_BASE}/bin"
+fi
+
+# Add the build wrappers dir to the path if it is not already
 if [[ ":$PATH:" != *":${KOS_BASE}/utils/build_wrappers:"* ]]; then
   export PATH="${PATH}:${KOS_BASE}/utils/build_wrappers"
 fi
diff --git a/environ_dreamcast.sh b/environ_dreamcast.sh
index 50551209..cc5d3700 100644
--- a/environ_dreamcast.sh
+++ b/environ_dreamcast.sh
@@ -1,6 +1,16 @@
 # KallistiOS environment variable settings. These are the shared pieces
 # for the Dreamcast(tm) platform.
 
+# Add the default external DC tools path if it isn't already set.
+if [ -z "${DC_TOOLS_BASE}" ] ; then
+    export DC_TOOLS_BASE="${KOS_CC_BASE}/../bin"
+fi
+
+# Add the external DC tools dir to the path if it is not already.
+if [[ ":$PATH:" != *":${DC_TOOLS_BASE}:"* ]]; then
+  export PATH="${PATH}:${DC_TOOLS_BASE}"
+fi
+
 # Default the SH4 floating point precision if it isn't already set.
 if [ -z "${KOS_SH4_PRECISION}" ] ; then
     export KOS_SH4_PRECISION="-m4-single-only"


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.