Make Copy generate verbose output and return errors

Make bootstrap.sh search for libs in ..

diff --git a/Readme.txt b/Readme.txt
index c0004ad9ad4f866fd350acb8c860a4ab0059a1ab..9579372aa448a964f6a0506721d6342e29b637fd 100644 (file)
--- 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 4edf03903f24be786ba6ac937c389b1c46dd5f3e..93ee706b1ccf47772d4e6af96005f735a7f06a16 100755 (executable)
--- 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 23cd6f1af358cebb11e9e526a7ede7ef1af4ef0b..c9cb3112ac25465d81ddf3a098eacbb5e46003ed 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,7 @@
+#include <errno.h>
 #include <fstream>
 #include <msp/path/utils.h>
+#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<<s<<" -> "<<d<<'\n';
 }
 
 int Copy::check()
@@ -21,7 +25,7 @@ int Copy::check()
        {
                signal_done.emit();
                worker.join();
-               return 0;
+               return worker.get_error()?1:0;
        }
        return -1;
 }
@@ -29,9 +33,29 @@ int Copy::check()
 void Copy::Worker::main()
 {
        Path::mkpath(copy.src.subpath(0, copy.src.size()-1), 0755);
-       unlink(copy.dest.str().c_str());
+       if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
+       {
+               int err=errno;
+               cerr<<"Can't unlink "<<copy.dest<<": "<<strerror(err)<<'\n';
+               done=error=true;
+               return;
+       }
+
        ifstream in(copy.src.str().c_str());
+       if(!in)
+       {
+               cerr<<"Can't open "<<copy.src<<" for reading\n";
+               done=error=true;
+               return;
+       }
+
        ofstream out(copy.dest.str().c_str());
+       if(!out)
+       {
+               cerr<<"Can't open "<<copy.dest<<" for writing\n";
+               done=error=true;
+               return;
+       }
 
        char buf[16384];
        while(!in.eof())

diff --git a/source/copy.h b/source/copy.h
index a6d5c51673e8fa6593bd8fddb0a0d79f608099e6..283ef48c5bbfa444b3f52a115562b041d1ca3cb3 100644 (file)
--- a/source/copy.h
+++ b/source/copy.h
@@ -18,9 +18,11 @@ private:
        public:
                Worker(Copy &i): copy(i), done(false) { launch(); }
                bool get_done() const { return done; }
+               bool get_error() const { return error; }
        private:
                Copy ©
                bool done;
+               bool error;
 
                void main();
        };