SOC1-124: Restructured environment setup and environment variable names

flow/socsim

@@ -15,7 +15,7 @@ DEFAULT_SIMULATOR="ivlog"
 if [[ -z "${SIMULATOR}" ]]; then 
     SIMULATOR=$DEFAULT_SIMULATOR
 fi
-# $SOC_TOP_DIR"/flow/simulators/"$SIMULATOR"_sim.sh" $@
+# $PROJECT_DIR"/flow/simulators/"$SIMULATOR"_sim.sh" $@
 
 # Find a simulation script in the SoCSim environments of all subrepos
 simscript=$(find ${SOCSIM_PATH//:/\ } -name "${1}.sh")

set_env.sh

-#-----------------------------------------------------------------------------
-# SoC Labs Environment Setup Script
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2023, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-#!/bin/bash
-
-# Get Root Location of Design Structure
-if [ -z $DESIGN_ROOT ]; then
-    # If $DESIGN_ROOT hasn't been set yet
-    DESIGN_ROOT=`git rev-parse --show-superproject-working-tree`
-
-    if [ -z $DESIGN_ROOT ]; then
-        # If not in a submodule - at root
-        DESIGN_ROOT=`git rev-parse --show-toplevel`
-    fi
-
-    # Source Top-Level Sourceme
-    source $DESIGN_ROOT/set_env.sh
-else
-    # Set Environment Variable for this Repository
-    export SOCSIM_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")" && pwd)"
-
-    # If this Repo is root of workspace
-    if [ $SOCSIM_DIR = $DESIGN_ROOT ]; then
-        echo "Design Workspace: $DESIGN_ROOT" 
-        export DESIGN_ROOT
-        # Set Default Simulator
-        export SIMULATOR="ivlog"
-    fi
-
-    # Source environment variables for all submodules
-    for d in $SOCSIM_DIR/* ; do
-        if [ -f "$d/.git" ]; then
-            if [ -f "$d/set_env.sh" ]; then
-            # If .git file exists - submodule
-                source $d/set_env.sh
-            fi
-        fi
-    done
-
-    # Add Scripts to Path
-    export PATH="$PATH:/$SOCSIM_DIR/flow"
-
-    # SoCSim Specific
-    # Source environment variables for all submodules
-    SOCSIM_PATH="$DESIGN_ROOT/simulate/socsim"
-    for d in $DESIGN_ROOT/* ; do
-        if [ -f "$d/.git" ]; then
-            if [ -d "$d/simulate/socsim" ]; then
-            # If socsim directory exists
-                SOCSIM_PATH="$d/simulate/socsim:$SOCSIM_PATH"
-            fi
-        fi
-    done
-    export SOCSIM_PATH
-fi
-