tasty revision to load feisty for full use

[feisty_meow.git] / scripts / core / variables.sh

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 21f874122e454b71b7ba8c5185fbf9b226dd2207..9cecadf848a57d8bfb24090c9fdcb58e155f3138 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -49,7 +49,7 @@ define_yeti_variable TERM
 ##############
   
 # we'll run this again only if we think it's needed.
-if [ -z "$NECHUNG" ]; then
+if [ -z "$CORE_VARIABLES_LOADED" ]; then
 
   if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization begins...; fi
   
@@ -79,6 +79,11 @@ if [ -z "$NECHUNG" ]; then
     # IS_MSYS will be non-empty if this is the msys toolset.  otherwise
     # we assume that it's cygwin.
     IS_MSYS=$(uname | grep -i ming)
+
+    # if not MSYS, then we'll assume cygwin and set the cygwin root var.
+    if [ -z "$IS_MSYS" ]; then
+      define_yeti_variable CYGROOT=$(cygpath -w -m /)
+    fi
   fi
 
   ##############
@@ -101,18 +106,18 @@ if [ -z "$NECHUNG" ]; then
   fi
 
   # set up the top-level for all build creations and logs and such.
-  if [ -z "$GENERATED_DIR" ]; then
-    define_yeti_variable GENERATED_DIR="$TMP/generated-feisty_meow"
+  if [ -z "$GENERATED_STORE" ]; then
+    define_yeti_variable GENERATED_STORE="$TMP/generated-feisty_meow"
   fi
-  if [ ! -d "$GENERATED_DIR" ]; then
-    mkdir -p "$GENERATED_DIR"
+  if [ ! -d "$GENERATED_STORE" ]; then
+    mkdir -p "$GENERATED_STORE"
   fi
   # set up our effluent outsourcing valves.
-  if [ -z "$TEMPORARIES_DIR" ]; then
-    define_yeti_variable TEMPORARIES_DIR="$GENERATED_DIR/temporaries"
+  if [ -z "$TEMPORARIES_PILE" ]; then
+    define_yeti_variable TEMPORARIES_PILE="$GENERATED_STORE/temporaries"
   fi
-  if [ ! -d "$TEMPORARIES_DIR" ]; then
-    mkdir -p "$TEMPORARIES_DIR"
+  if [ ! -d "$TEMPORARIES_PILE" ]; then
+    mkdir -p "$TEMPORARIES_PILE"
   fi
 
   # similarly, make sure we have someplace to look for our generated files, if
@@ -152,12 +157,13 @@ if [ -z "$NECHUNG" ]; then
   # variables for perl.
   
   define_yeti_variable PERLLIB+="/usr/lib/perl5"
+  define_yeti_variable PERL5LIB+="/usr/lib/perl5"
   if [ "$OS" == "Windows_NT" ]; then
     define_yeti_variable PERLIO=:perlio
       # choose perl's IO over the ms-windows version so we can handle file
       # bytes properly.
   fi
-  
+
   # iterate across our sub-directories and find the perl scripts.
   # this currently only looks one level down.
   for i in $FEISTY_MEOW_SCRIPTS/*; do
@@ -166,6 +172,7 @@ if [ -z "$NECHUNG" ]; then
       ls $i/*.pl &>/dev/null
       if [ $? -eq 0 ]; then
         PERLLIB+=":$(dos_to_unix_path $i)"
+        PERL5LIB+=":$(dos_to_unix_path $i)"
       fi
     fi
   done
@@ -176,6 +183,9 @@ if [ -z "$NECHUNG" ]; then
   # set this so nechung can find its data.
   define_yeti_variable NECHUNG=$FEISTY_MEOW_APEX/infobase/fortunes.dat
   
+##  # establish a pipe for less to see our beloved syntax highlighting.
+##  define_yeti_variable LESSOPEN="| source-highlight -f esc -o STDOUT -i %s"
+
   # ensure we use the right kind of secure shell.
 #  define_yeti_variable CVS_RSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
 #  define_yeti_variable GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
@@ -202,11 +212,11 @@ if [ -z "$NECHUNG" ]; then
     # now augment the environment if we found our build variables.
     if [ $found_build_vars == 1 ]; then
       # the binary directory contains our collection of handy programs.
-      define_yeti_variable BINDIR=$TARGETS_DIR
+      define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_STORE
       # add binaries created within build to the path.
-      define_yeti_variable PATH="$(dos_to_unix_path $BINDIR):$PATH"
+      define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_BINARIES):$PATH"
       # Shared libraries are located via this variable.
-      define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $BINDIR)"
+      define_yeti_variable LD_LIBRARY_PATH="$(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $FEISTY_MEOW_BINARIES)"
     fi
   }
   
@@ -231,10 +241,12 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
 
-  # set the SHUNIT_DIR so our shunit tests can find the codebase.
-  define_yeti_variable SHUNIT_DIR="$FEISTY_MEOW_SCRIPTS/shunit"
+  # set the SHUNIT_PATH so our shunit tests can find the codebase.
+  define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/shunit"
   
   ##############
+
+  define_yeti_variable CORE_VARIABLES_LOADED=true
   
   if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi
 fi
@@ -256,4 +268,4 @@ for i in $FEISTY_MEOW_LOADING_DOCK/custom/*.sh; do
   fi
   source "$i"
 done
-  
+