Author: reid
Date: Mon Aug 13 01:37:41 2007
New Revision: 41042
URL: http://llvm.org/viewvc/llvm-project?rev=41042&view=rev
Log:
Fix problems with the install script checking out dependencies into a
subdirectory, caused by not returning to $LLVM_TOP on each iteration.
Also, add more debugging output.
Modified:
llvm-top/trunk/install
llvm-top/trunk/library.sh
Modified: llvm-top/trunk/install
URL:
http://llvm.org/viewvc/llvm-project/llvm-top/trunk/install?rev=41042&r1=41041&r2=41042&view=diff
==============================================================================
--- llvm-top/trunk/install (original)
+++ llvm-top/trunk/install Mon Aug 13 01:37:41 2007
@@ -38,13 +38,16 @@
# sorted in dependence order by get_module_dependencies
for mod in $MODULE_DEPENDENCIES ; do
get_module_info $mod InstallCmd
- if test ! -z "$MODULE_INFO_VALUE" ; then
+ TheCommand="$MODULE_INFO_VALUE"
+ if test ! -z "$TheCommand" ; then
msg 1 Installing module $mod
cd $LLVM_TOP/$mod
- $MODULE_INFO_VALUE || die $? "Install of module $mod failed."
+ msg 2 Install command for "$mod" is "$TheCommand"
+ $TheCommand || die $? "Install of module $mod failed."
else
msg 2 Module $mod has no InstallCmd in the ModuleInfo.txt
fi
+ cd $LLVM_TOP
done
# Report what happened.
Modified: llvm-top/trunk/library.sh
URL:
http://llvm.org/viewvc/llvm-project/llvm-top/trunk/library.sh?rev=41042&r1=41041&r2=41042&view=diff
==============================================================================
--- llvm-top/trunk/library.sh (original)
+++ llvm-top/trunk/library.sh Mon Aug 13 01:37:41 2007
@@ -127,13 +127,15 @@
get_module_info() {
local module="$1"
local item_name="$2"
+ local item_value=""
msg 2 "Getting '$item_name' module info for '$module'"
if test ! -d "$module" ; then
checkout_a_module "$module" || die $? "Checkout failed."
fi
+ msg 2 "Getting module info from $module/ModuleInfo.txt"
local module_info="$module/ModuleInfo.txt"
if test -f "$module_info" ; then
- local item_value=`grep -i "$item_name:" $module_info | \
+ item_value=`grep -i "$item_name:" $module_info | \
sed -e "s/$item_name: *//g"`
if test "$?" -ne 0 ; then
die $? "Searching file '$module_info for $item_name' failed."
@@ -213,12 +215,13 @@
msg 1 "Building module '$module'"
get_module_info $module BuildCmd
if test -z "$MODULE_INFO_VALUE" ; then
- msg 2 "Module $module has no BuildCmd entry so it will not be built."
+ msg 1 "Module $module has no BuildCmd entry so it will not be built."
return 0
fi
local build_cmd="$MODULE_INFO_VALUE MODULE=$module $build_args"
msg 2 "Build Command: $build_cmd"
- cd $LLVM_TOP/$module
+ cd "$LLVM_TOP/$module"
$build_cmd || die $? "Build of module '$module' failed."
+ cd "$LLVM_TOP"
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
