Merge branch 'toolkit-changes' into initial-rework

bin/list_components

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+
+for comp in $*
+do
+    ( ls ${comp}.h ; ls ${comp}.cpp ; ls ${comp}.t.cpp ) | xargs
+done

bin/tcsh.launch

@@ -0,0 +1,16 @@
+#!/bin/sh
+if [ `uname` = "AIX" -a ! -x tcsh ]
+then
+	IBM_CSH=~/cshenv/shells/ibm/bin/tcsh
+	#echo "On an AIX system, so we're using our custom-built TCSH."
+	[ -f ${IBM_CSH} -a -x ${IBM_CSH} ] && exec ${IBM_CSH} $*
+	echo "Failed in trying to start TCSH.  Using a fallback to classic Bourne."
+	exec /bin/sh
+elif [ "" != `which tcsh` -a -f `which tcsh` -a -x `which tcsh` ];
+then
+	#echo "Try using the system TCSH."
+	exec tcsh $*
+else
+	echo "Not going to try starting TCSH.  Using a fallback to classic Bourne."
+	exec /bin/sh
+fi

bin/vic

@@ -0,0 +1 @@
+vim `list_components $*`

git/gitconfig

@@ -0,0 +1,37 @@
+[core]
+    whitespace = blank-at-eol,tab-in-indent,space-before-tab,trailing-space,tabwidth=4
+    preloadindex = true
+
+[color]
+    diff = always
+	ui = auto
+
+[alias]
+    br = branch
+    ci = commit
+    co = checkout
+    st = status
+    dc = diff --check
+    brm = !git br -a | grep -e master -e $USER -e review/ -e releases/
+    branch-name = !git branch | awk '/\\*/{print $2}'
+    sd = diff --name-status
+    last = cat-file commit HEAD
+
+[color "branch"]
+    current = green
+
+[color "status"]
+    updated = green
+
+[color "diff"]
+	new = 12
+
+[merge]
+	conflictstyle = diff3
+	mergetool = vimdiff
+	tool = vimdiff
+
+[push]
+	default = upstream
+
+# vim: ft=gitconfig

tcshrc

@@ -82,21 +82,18 @@ endif
 setenv LSCOLORS 'ExFxcxdxbxegedabagacEB'
 setenv CLICOLOR_FORCE
 
-if( $?CSHENV_DEBUG ) then
-	echo "Trying to source tcshrc.aliases"
-endif
-source ${CSHENV_DIR}/tcshrc.aliases
-
-if( $?CSHENV_DEBUG ) then
-	echo "Trying to source tcshrc.bindkeys"
-endif
-source ${CSHENV_DIR}/tcshrc.bindkeys
-
 if( $?CSHENV_DEBUG ) then
 	echo "Trying to source tcshrc.${CSHENV_SYSTEM}"
 endif
 safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_SYSTEM}
 
+# Having figured out the system, then we can load specific aliases
+
+if( $?CSHENV_DEBUG ) then
+	echo "Trying to source tcshrc.aliases"
+endif
+source ${CSHENV_DIR}/tcshrc.aliases
+
 if( $?CSHENV_DEBUG ) then
 	echo "Trying to source tcshrc.${CSHENV_HOSTNAME}"
 endif
@@ -106,6 +103,11 @@ if( $?CSHENV_ORGANIZATION ) then
     safe_source ${CSHENV_DIR}/tcshrc.${CSHENV_ORGANIZATION}
 endif
 
+if( $?CSHENV_DEBUG ) then
+	echo "Trying to source tcshrc.bindkeys"
+endif
+source ${CSHENV_DIR}/tcshrc.bindkeys
+
 set path=( ${path} /usr/sbin /sbin )
 
 # TCSHRC Prompt is the LAST thing we do, since it's the entry to

tcshrc.aliases

@@ -4,14 +4,98 @@ alias resource source ${CSHENV_DIR}/tcshrc
 alias relog resource
 alias rl relog
 
-#Classic UNIXy aliases
 
 #Dir motion
 alias pd	pushd
 alias pu	pushd
 alias po	popd
 
-alias l ls
+#Figure out where we get our LS from.  TODO: Move this?
+
+#This sets the ls command to the right command to use for that system, to
+#enable colour output, if at all possible
+if( ( $?CSHENV_DEBUG ) || ( $?CSHENV_VERBOSE_STARTUP ) ) then
+	echo "Probing ls(1) options..."
+endif
+
+if( $?CSHENV_USE_GNU_LS ) then
+	if( $?CSHENV_DEBUG ) then
+		echo "Finding gls..."
+	endif
+	if( { which gls } ) > /dev/null then
+		setenv CSHENV_SYSTEM_LS USE_GNU_LS
+	else if( "$CSHENV_SYSTEM" == "Linux" || "$CSHENV_SYSTEM" == "Cygwin" ) then
+		setenv CSHENV_SYSTEM_LS Linux
+
+	else
+		setenv CSHENV_SYSTEM_LS $SYSTEM
+	endif
+	if( $?CSHENV_DEBUG ) then
+		echo "Done with gls probe..."
+	endif
+else
+	if( $?CSHENV_DEBUG ) then
+		echo "Trying for other ls options..."
+	endif
+	if( $?CSHENV_USE_BUILTIN_LS ) then
+		setenv CSHENV_SYSTEM_LS USE_BUILTIN_LS
+	else
+		if( $?CSHENV_DEBUG ) then
+			echo "Defaulting on ls..."
+		endif
+		setenv CSHENV_SYSTEM_LS ${CSHENV_SYSTEM}
+	endif
+endif
+
+switch( $CSHENV_SYSTEM_LS )
+
+	#FreeBSD, Darwin, and possibly others have the "G" option
+	#which uses the LSCOLORS env variable
+	case Darwin:
+		#FALLTHROUGH
+
+	case FreeBSD:
+		alias l ls -FG
+	breaksw
+
+	#DEPRECATED
+	#SunOS has no default ls for color; however, we'll gamble that
+	#/usr/shareware or such has GNU ls(1) installed...
+	case SunOS___DEPRECATED:
+		alias ls gls
+		#FALLTHROUGH
+
+
+	#This is for systems which have GNU ls(1) installed, as gls(1) (when
+	#their native system ls(1) is not gnu, but the USE_GNU_LS variable
+	#is set.  Systems with native ls as GNU ls(1) won't be affected.
+	case USE_GNU_LS:
+		alias ls gls
+		#FALLTHROUGH
+
+	#Linux and other GNU derived systems (or systems using GNU ls(1)
+	#need the --color option to make their ls work with color.
+	#I'll squelch the "--long-names-suck" debate.
+	case Linux:
+		alias l ls -F --color
+	breaksw
+
+	#Anybody else (on other systems) will just have to deal with
+	#boring old ls -F, and hope that's enough distinction to
+	#differentiate file types.  {We'll look into using ls-F(1) builtin,
+	#but if your system's ls doesn't support colour, we won't hold out
+	#much hope.  Just remove the space after ls, before -F, to try that.}
+
+	case USE_BUILTIN_LS:
+			alias l ls-F
+	breaksw
+
+	default:
+		alias l ls -F
+	breaksw
+endsw
+
+#Classic UNIXy aliases
 
 #Standard ls aliases that I use:
 alias ll l -l