Changes in driver/cfa.cc [158b026:aced69a]

File:

• driver/cfa.cc (modified) (13 diffs)

driver/cfa.cc

@@ -15 +15 @@
 
 #include <iostream>
-#include <cstdio>      // perror
-#include <cstdlib>     // putenv, exit
-#include <climits>     // PATH_MAX
-#include <unistd.h>    // execvp
-#include <string>      // STL version
-#include <string.h>    // strcmp
-#include <algorithm>   // find
+#include <cstdio>                                                                               // perror
+#include <cstdlib>                                                                              // putenv, exit
+#include <unistd.h>                                                                             // execvp
+#include <string>                                                                               // STL version
+#include <string.h>                                                                             // strcmp
+#include <algorithm>                                                                    // find
 
 #include <sys/types.h>
@@ -34 +33 @@
 using std::to_string;
 
-// #define __DEBUG_H__
-
-// "N__=" suffix
-static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );
+//#define __DEBUG_H__
+
+
+static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "N__=" suffix
 
 void Putenv( char * argv[], string arg ) {
-        // environment variables must have unique names
-        static int flags = 0;
+        static int flags = 0;                                                           // environment variables must have unique names
 
         if ( putenv( (char *)( *new string( string( __CFA_FLAGPREFIX__ + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
@@ -49 +47 @@
 } // Putenv
 
-// check if string has prefix
-bool prefix( const string & arg, const string & pre ) {
+
+bool prefix( const string & arg, const string & pre ) { // check if string has prefix
         return arg.substr( 0, pre.size() ) == pre;
 } // prefix
 
-inline bool ends_with(const string & str, const string & sfix) {
-        if (sfix.size() > str.size()) return false;
-        return std::equal(str.rbegin(), str.rbegin() + sfix.size(), sfix.rbegin(), sfix.rend());
-}
-
-// check if string has suffix
-bool suffix( const string & arg ) {
+bool suffix( const string & arg ) {                                             // check if string has suffix
         enum { NumSuffixes = 3 };
         static const string suffixes[NumSuffixes] = { "cfa", "hfa", "ifa" };
@@ -76 +68 @@
         return (info.st_mode & S_IFDIR) != 0;
 } // dirExists
-
-static inline string dir(const string & path) {
-        return path.substr(0, path.find_last_of('/'));
-}
-
-// Different path modes
-enum PathMode {
-        Installed,     // cfa is installed, use prefix
-        BuildTree,     // cfa is in the tree, use source and build tree
-        Distributed    // cfa is distributed, use build tree for includes and executable directory for .cfs
-};
-
-// Get path mode from /proc
-PathMode FromProc() {
-        std::string abspath;
-        abspath.resize(PATH_MAX);
-
-        // get executable path from /proc/self/exe
-        ssize_t size = readlink("/proc/self/exe", const_cast<char*>(abspath.c_str()), abspath.size());
-        if(size <= 0) {
-                std::cerr << "Error could not evaluate absolute path from /proc/self/exe" << std::endl;
-                std::cerr << "Failed with " << std::strerror(errno) << std::endl;
-                std::exit(1);
-        }
-
-        // Trim extra characters
-        abspath.resize(size);
-
-        // Are we installed
-        if(abspath.rfind(CFA_BINDIR  , 0) == 0) { return Installed; }
-
-        // Is this the build tree
-        if(abspath.rfind(TOP_BUILDDIR, 0) == 0) { return BuildTree; }
-
-        // Does this look like distcc
-        if(abspath.find("/.cfadistcc/") != std::string::npos) { return Distributed; }
-
-        // None of the above? Give up since we don't know where the prelude or include directories are
-        std::cerr << "Cannot find required files from excutable path " << abspath << std::endl;
-        std::exit(1);
-}
 
 
@@ -153 +104 @@
         bool m32 = false;                                                                       // -m32 flag
         bool m64 = false;                                                                       // -m64 flag
-        bool compiling_libs = false;
+        bool intree = false;                                                            // build in tree
         int o_file = 0;                                                                         // -o filename position
-
-        PathMode path = FromProc();
 
         const char *args[argc + 100];                                           // cfa command line values, plus some space for additional flags
@@ -211 +160 @@
                         } else if ( arg == "-no-include-stdhdr" ) {
                                 noincstd_flag = true;                                   // strip the no-include-stdhdr flag
-                        } else if ( arg == "-cfalib") {
-                                compiling_libs = true;
+                        } else if ( arg == "-in-tree" ) {
+                                intree = true;
                         } else if ( arg == "-compiler" ) {
                                 // use the user specified compiler
@@ -319 +268 @@
 
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
-        string libbase;
-        switch(path) {
-        case Installed:
+        if ( ! intree ) {
                 args[nargs++] = "-I" CFA_INCDIR;
-                // do not use during build
-                if ( ! noincstd_flag ) {
+                if ( ! noincstd_flag ) {                                                // do not use during build
                         args[nargs++] = "-I" CFA_INCDIR "stdhdr";
                 } // if
                 args[nargs++] = "-I" CFA_INCDIR "concurrency";
                 args[nargs++] = "-I" CFA_INCDIR "containers";
-                libbase = CFA_LIBDIR;
-                break;
-        case BuildTree:
-        case Distributed:
+        } else {
                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src";
-                // do not use during build
-                if ( ! noincstd_flag ) {
+                if ( ! noincstd_flag ) {                                                // do not use during build
                         args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr";
                 } // if
                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/concurrency";
                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/containers";
-
-                libbase = TOP_BUILDDIR "libcfa/";
-
-                break;
         } // if
 
@@ -350 +288 @@
         args[nargs++] = "stdbool.h";
 
-        if( compiling_libs ) {
+        string libbase;
+        if ( ! intree ) {
+                libbase = CFA_LIBDIR;
+        } else {
+                libbase = TOP_BUILDDIR "libcfa/";
                 Putenv( argv, "-t" );
         } // if
@@ -363 +305 @@
         } // if
 
-        const char * config = nolib ? "nolib" : (debug ? "debug": "nodebug");
-        string libdir = libbase + arch + "-" + config;
-
-        if (path != Distributed) {
-                if ( ! nolib && ! dirExists( libdir ) ) {
-                        cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
-                        cerr << "Was looking for " << libdir << endl;
-                        for(int i = 1; i < argc; i++) {
-                                cerr << argv[i] << " ";
-                        }
-                        cerr << endl;
-                        libdir = libbase + arch + "-" + "nolib";
-                } // if
-
-                if ( ! dirExists( libdir ) ) {
-                        cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
-                        cerr << "Was looking for " << libdir << endl;
-                        exit( EXIT_FAILURE );
-                } // if
-        } // if
-
-        switch(path) {
-        case Installed   : Putenv( argv, "--prelude-dir=" + libdir ); break;
-        case BuildTree   : Putenv( argv, "--prelude-dir=" + libdir + "/prelude" ); break;
-        case Distributed : Putenv( argv, "--prelude-dir=" + dir(argv[0]) ); break;
-        }
+        string libdir( libbase + arch + "-" + (nolib ? "nolib" : (debug ? "debug": "nodebug")) );
+        if ( ! dirExists( libdir ) ) {
+                cerr << argv[0] << " internal error, cannot find prelude directory " << libdir << endl;
+                exit( EXIT_FAILURE );
+        } // if
 
         for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
@@ -403 +324 @@
 
                 // include the cfa library in case it is needed
-                args[nargs++] = ( *new string( string("-L" ) + libdir + (path != Installed ? "/src/.libs" : "")) ).c_str();
-                args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (path != Installed ? "/src/.libs" : "")) ).c_str();
+                args[nargs++] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+                args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
                 args[nargs++] = "-Wl,--push-state,--as-needed";
                 args[nargs++] = "-lcfathread";
@@ -440 +361 @@
         } // if
 
+        Putenv( argv, "--prelude-dir=" + libdir + (intree ? "/prelude" : "") );
+
         if ( debug ) {
                 heading += " (debug)";
@@ -448 +371 @@
 
         if ( bprefix.length() == 0 ) {
-                switch(path) {
-                case Installed   : bprefix = installlibdir; break;
-                case BuildTree   : bprefix = srcdriverdir ; break;
-                case Distributed : bprefix = dir(argv[0]) ; break;
-                }
+                bprefix = ! intree ? installlibdir : srcdriverdir;
                 if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
-                Putenv( argv, string("-B=") + bprefix );
+                Putenv( argv, ( *new string( string("-B=") + bprefix ) ).c_str() );
         } // if
 
@@ -496 +415 @@
                 cerr << " \"" << args[i] << "\"" << endl;
         } // for
-        cerr << endl;
         #endif // __DEBUG_H__
 
         if ( ! quiet ) {
                 cerr << "CFA " << "Version " << Version << heading << endl;
+
                 if ( help ) {
                         cerr <<