From: Mikko Rasa Date: Sun, 3 Sep 2006 19:26:53 +0000 (+0000) Subject: Make Copy generate verbose output and return errors X-Git-Tag: 0.9~63 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=291455f435a4319ce3460e2e47d8f036222a3f92;p=builder.git Make Copy generate verbose output and return errors Make bootstrap.sh search for libs in .. --- diff --git a/Readme.txt b/Readme.txt index c0004ad..9579372 100644 --- a/Readme.txt +++ b/Readme.txt @@ -21,7 +21,7 @@ MSP libraries: misc core parser path regex++ getopt++ Others: sigc++-2.0 Since the MSP libraries are also normally built with Builder, the script will -need to have their sources available. By default, it will look at ../libs. -You can change this by setting the LIBPATH evironment variable for the script. -If everything goes well, you should have a builder-stage1 binary that you can -use to build a normal version of Builder. +need to have their sources available. By default, it will look at the parent +directory of builder. You can change this by setting the LIBPATH evironment +variable for the script. If everything goes well, you should have a +builder-stage1 binary that you can use to build a normal version of Builder. diff --git a/bootstrap.sh b/bootstrap.sh index 4edf039..93ee706 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -4,7 +4,7 @@ REQUIRED="misc core parser path regex++ getopt++" CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`" LIBS="`pkg-config --libs sigc++-2.0` -lpthread" if [ -z "$LIBPATH" ]; then - LIBPATH=`pwd`/../libs + LIBPATH=`pwd`/.. fi mkdir -p include/msp diff --git a/source/copy.cpp b/source/copy.cpp index 23cd6f1..c9cb311 100644 --- a/source/copy.cpp +++ b/source/copy.cpp @@ -1,5 +1,7 @@ +#include #include #include +#include "builder.h" #include "copy.h" #include "package.h" @@ -13,6 +15,8 @@ Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path worker(*this) { announce(pkg.get_name(), "INST", dest[-1]); + if(builder.get_verbose()>=2) + cout< "<