attempting to make the code build not require previous setup of scripts.

[feisty_meow.git] / scripts / generator / build_variables.sh

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index 82a74a3998dbcb3726361a4533ec235241fc61bf..a4a2f4e64bebd2a2e897143baecda1c1d4fc97e0 100644 (file)
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -32,13 +32,6 @@
 # Please send any updates to: fred@gruntose.com
 ##############
 
-# prerequisites for this script:
-#
-# (1) the script should be run with a full path, so that it can decide where
-#     it lives with minimal fuss.
-# (2) on windows, the msys bin directory should already be in the path so that
-#     tools like dirname are already available.
-
 # here is where we compute the locations for the build's pieces, based on
 # where this script is located.  we currently assume that the build scripts
 # like this one are at the same height in the hierarchy as the clam scripts
@@ -54,19 +47,6 @@ PARM_1="$1"
 # helpful build function zone.
 
 source $FEISTY_MEOW_SCRIPTS/core/functions.sh
-  # load msys_to_dos_path and dos_to_msys_path.
-
-#### switches from a /X/path form to an X:/ form.
-###function msys_to_dos_path() {
-###  # we always remove dos slashes in favor of forward slashes.
-###  echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\/\([a-zA-Z]\)\/\(.*\)/\1:\/\2/'
-###}
-
-#### switches from an X:/ form to an /X/path form.
-###function dos_to_msys_path() {
-###  # we always remove dos slashes in favor of forward slashes.
-###  echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/'
-###}
 
 ##############
 
@@ -75,20 +55,16 @@ if [ ! -z "$PARM_1" ]; then
   # use the first real parameter since this is probably the 'source' version.
   export BUILD_SCRIPTS_DIR="$(dirname "$PARM_1")"
   THIS_TOOL_NAME="$(basename "$PARM_1")"
-#echo sourced version buildscriptsdir is $BUILD_SCRIPTS_DIR
 else
   # use the zeroth parameter, since we know nothing more about our name.
   export BUILD_SCRIPTS_DIR="$(dirname "$PARM_0")"
   THIS_TOOL_NAME="$(basename "$PARM_0")"
-#echo bashed version buildscriptsdir is $BUILD_SCRIPTS_DIR
 fi
 BUILD_SCRIPTS_DIR="$(cd $(echo $BUILD_SCRIPTS_DIR | tr '\\\\' '/' ); \pwd)"
-echo ">> buildvars buildscriptsdir is $BUILD_SCRIPTS_DIR"
 
 # figure out the other paths based on where we found this script.
 export BUILDING_HIERARCHY="$(echo "$BUILD_SCRIPTS_DIR" | sed -e 's/\(.*\)\/[^\/]*/\1/')"
 export CLAM_DIR="$(cd $BUILD_SCRIPTS_DIR/../clam ; \pwd)"
-echo ">> buildvars clamdir is $CLAM_DIR"
 # synonym to make other builds happy.
 export BUILDER_DIR="$BUILDING_HIERARCHY"
 
@@ -112,23 +88,6 @@ if [ ! -z "$SHELL_DEBUG" ]; then
   echo "[OS is \"$OPERATING_SYSTEM\"]"
 fi
 
-#hmmm: all this stuff is highly questionable value now.
-# we create the variable FEISTY_MEOW_DIR, but we keep the dos form of
-# the path, because otherwise lots of bad things happens when passing the
-# folders around to visual studio commands that don't allow a space after them.
-if [ -d "$BUILDING_HIERARCHY/source" ]; then
-  # old style repository is same height as building hierarchy.
-  export FEISTY_MEOW_DIR="$BUILDING_HIERARCHY"
-else
-  # new style repository is a level above the build hierarchy.
-  export FEISTY_MEOW_DIR="$(echo "$BUILDING_HIERARCHY" | sed -e 's/\(.*\)\/[^\/]*/\1/')"
-fi
-
-if [ "$OPERATING_SYSTEM" = "WIN32" ]; then
-  # make sure repository dir looks right on windoze.
-  export FEISTY_MEOW_DIR="$(msys_to_dos_path "$FEISTY_MEOW_DIR")"
-fi
-
 if [ ! -z "$SHELL_DEBUG" ]; then
   echo "[FEISTY_MEOW_DIR is $FEISTY_MEOW_DIR]"
 fi