From 87cf71abfdf00338a263f49622674c65479d5e18 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Oct 2014 11:42:58 +0200 Subject: [Cavium] fucked up. Got back funcs. --- net:foret/Colors.zsh | 6 ++++++ net:foret/Functions.zsh | 34 ++++++++++++++++++++++++++++++++++ net:foret/Prompts.zsh | 16 +++++++++++++--- 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 net:foret/Functions.zsh diff --git a/net:foret/Colors.zsh b/net:foret/Colors.zsh index d56bcbd..d7bd7c0 100644 --- a/net:foret/Colors.zsh +++ b/net:foret/Colors.zsh @@ -2,8 +2,14 @@ typeset -A _make_colors _make_colors[target]=$color[red] + _make_colors[verbose]=$color[yellow] + _make_colors[nproc]=$color[yellow] + _make_colors[static]=$color[green] _make_colors[dynamic]=$color[yellow] +_make_colors[sdk]=$color[cyan]";"$color[bold] + +_make_colors[gcc]=$color[blue]";"$color[bold] diff --git a/net:foret/Functions.zsh b/net:foret/Functions.zsh new file mode 100644 index 0000000..0a77351 --- /dev/null +++ b/net:foret/Functions.zsh @@ -0,0 +1,34 @@ + +_cn () { + local _CN=/usr/local/Cavium_Networks/ + local SDK MODEL GCC + case $1 in + ([Oo]+*) MODEL=OCTEON_CN58XX + SDK=${2:-OCTEON-SDK-1.7.2} + case $1 in + (*-) GCC=tools ;; + (*) GCC=tools-gcc-4.7.2 ;; + esac + TARGET=OCTEONPLUS_64-CAVIUMSE-SMP-PERF-EXTFLOW ;; + ([Oo]2*) case $1 in + (O*) MODEL=OCTEON_CN68XX ;; + (o*) MODEL=OCTEON_CN66XX ;; + esac + SDK=${2:-cnUSERS-SDK-2.3} + case $1 in + (*-) GCC=tools ;; + (*) GCC=tools-gcc-4.7.2 ;; + esac + TARGET=OCTEON2_64-CAVIUMSE-SMP-PERF-EXTFLOW ;; + (*) TARGET=x86_64-LSB-SMP-PERF-EXTFLOW + unset OCTEON_ROOT ;; + esac + PATH=${(j/:/)$(echo ${${(s/:/)PATH}##/usr/local/Cavium_Networks/*})} + if [ -n "$SDK" ] + then + pushd $_CN/$SDK > /dev/null 2>&1 + source ./env-setup $MODEL --runtime-model --tools=$GCC + popd > /dev/null 2>&1 + fi +} + diff --git a/net:foret/Prompts.zsh b/net:foret/Prompts.zsh index 85c30f4..317f8cc 100644 --- a/net:foret/Prompts.zsh +++ b/net:foret/Prompts.zsh @@ -8,8 +8,6 @@ ## NO WARRANTY PROVIDED, USE AT YOUR OWN RISKS ## -_prompt_colors[target]="1;31" - __static_dynamic () { [ $(( ${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))} + ${DYNAMIC:-$(( 1 ^ ${STATIC:-0} ))} )) -lt 2 ] && \ @@ -75,5 +73,17 @@ __makeflags () echo -n $_prompt_colors[soft_generic]";3"$_C${MAKEFLAGS// -/} } -PS1_TASKBAR+=(__makeflags __verbose_compilation __nproc_compilation __static_dynamic __compilation_os __compilation_arch __compilation_target) +__octeon_sdk() { + [ -z "$OCTEON_ROOT" ] && return + echo -n $C_$_make_colors[sdk]$_C + echo -n ${OCTEON_ROOT##/usr/local/Cavium_Networks/} +} + +__cavium_gcc_version() { + GCC_VERSION=$(echo $PATH | tr ':' '\n' | sed -n "s:$OCTEON_ROOT/tools-gcc-\(.*\)/bin:\1:p;Tend;q;:end" ) + [ -z "$GCC_VERSION" ] && return + echo -n $C_$_make_colors[gcc]$_C$GCC_VERSION +} + +PS1_TASKBAR+=(__makeflags __verbose_compilation __nproc_compilation __static_dynamic __compilation_os __compilation_arch __compilation_target __octeon_sdk __cavium_gcc_version) PS1_EXTRA_INFO+=() -- cgit v1.2.3