projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
variety of fixes and a new script
[feisty_meow.git]
/
scripts
/
core
/
variables.sh
diff --git
a/scripts/core/variables.sh
b/scripts/core/variables.sh
index 21f874122e454b71b7ba8c5185fbf9b226dd2207..bd11c4654303377fef87642661c470262b2d0b98 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.
##############
# 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
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)
# 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
##############
fi
##############
@@
-101,18
+106,18
@@
if [ -z "$NECHUNG" ]; then
fi
# set up the top-level for all build creations and logs and such.
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
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.
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
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
fi
# similarly, make sure we have someplace to look for our generated files, if
@@
-152,6
+157,7
@@
if [ -z "$NECHUNG" ]; then
# variables for perl.
define_yeti_variable PERLLIB+="/usr/lib/perl5"
# 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
if [ "$OS" == "Windows_NT" ]; then
define_yeti_variable PERLIO=:perlio
# choose perl's IO over the ms-windows version so we can handle file
@@
-166,6
+172,7
@@
if [ -z "$NECHUNG" ]; then
ls $i/*.pl &>/dev/null
if [ $? -eq 0 ]; then
PERLLIB+=":$(dos_to_unix_path $i)"
ls $i/*.pl &>/dev/null
if [ $? -eq 0 ]; then
PERLLIB+=":$(dos_to_unix_path $i)"
+ PERL5LIB+=":$(dos_to_unix_path $i)"
fi
fi
done
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
# 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
# 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.
# 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.
# 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.
# 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
}
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
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
fi
source "$i"
done
-
+