projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4391acd
)
cleaning up some noise in this file.
author
Chris Koeritz
<fred@gruntose.com>
Wed, 22 Feb 2012 02:41:10 +0000
(21:41 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Wed, 22 Feb 2012 02:41:10 +0000
(21:41 -0500)
scripts/generator/build_variables.sh
patch
|
blob
|
history
diff --git
a/scripts/generator/build_variables.sh
b/scripts/generator/build_variables.sh
index c975fd5b61c4b33717a6578ced8385935dcddcb1..a4a2f4e64bebd2a2e897143baecda1c1d4fc97e0 100644
(file)
--- a/
scripts/generator/build_variables.sh
+++ b/
scripts/generator/build_variables.sh
@@
-55,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")"
# 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")"
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)"
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)"
# 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"
# synonym to make other builds happy.
export BUILDER_DIR="$BUILDING_HIERARCHY"
@@
-99,7
+95,6
@@
fi
# new BUILD_TOP variable points at the utter top-most level of any files
# in the building hierarchy.
export BUILD_TOP="$FEISTY_MEOW_DIR"
# new BUILD_TOP variable points at the utter top-most level of any files
# in the building hierarchy.
export BUILD_TOP="$FEISTY_MEOW_DIR"
-echo build top is $BUILD_TOP
# this variable points at a folder where we store most of the generated products
# of the build. these tend to be the things that will be used for packaging into
# this variable points at a folder where we store most of the generated products
# of the build. these tend to be the things that will be used for packaging into
@@
-157,7
+152,6
@@
fi
# now compute some more paths with a bit of "heuristics" for where we can
# find the source code.
export TOOL_SOURCES="$FEISTY_MEOW_DIR/nucleus/tools"
# now compute some more paths with a bit of "heuristics" for where we can
# find the source code.
export TOOL_SOURCES="$FEISTY_MEOW_DIR/nucleus/tools"
-echo "==tool source is $TOOL_SOURCES"
if [ -z "$got_bad" -a ! -d "$TOOL_SOURCES/dependency_tool" -o ! -d "$TOOL_SOURCES/clam_tools" ]; then
echo "This script cannot locate the tool source code folder. This is where the"
echo "dependency_tool and clam_tools folders are expected to be."
if [ -z "$got_bad" -a ! -d "$TOOL_SOURCES/dependency_tool" -o ! -d "$TOOL_SOURCES/clam_tools" ]; then
echo "This script cannot locate the tool source code folder. This is where the"
echo "dependency_tool and clam_tools folders are expected to be."