[Boost-commit] svn:boost r59829 - trunk/tools/jam/src

Subject: [Boost-commit] svn:boost r59829 - trunk/tools/jam/src
From: ghost_at_[hidden]
Date: 2010-02-21 18:33:14

Author: vladimir_prus
Date: 2010-02-21 18:33:13 EST (Sun, 21 Feb 2010)
New Revision: 59829
URL: http://svn.boost.org/trac/boost/changeset/59829

Log:
Various new builtins.

Text files modified: 
   trunk/tools/jam/src/builtins.c |   123 ++++++++++++++++++++++++++++++++++++++++
   trunk/tools/jam/src/builtins.h |     3                                         
   trunk/tools/jam/src/jam.c      |    12 +-                                      
   3 files changed, 132 insertions(+), 6 deletions(-)

Modified: trunk/tools/jam/src/builtins.c
==============================================================================
--- trunk/tools/jam/src/builtins.c	(original)
+++ trunk/tools/jam/src/builtins.c	2010-02-21 18:33:13 EST (Sun, 21 Feb 2010)
@@ -188,6 +188,12 @@
       }
 
       {
+          char * args[] = { "targets", "*", ":", "log", "?", 0 };
+          bind_builtin( "UPDATE_NOW",
+                        builtin_update_now, 0, args );
+      }
+
+      {
           char * args[] = { "string", "pattern", "replacements", "+", 0 };
           duplicate_rule( "subst",
             bind_builtin( "SUBST",
@@ -355,6 +361,18 @@
                         builtin_md5, 0, args ) ;
       }
 
+      {
+          char * args[] = { "name", ":", "mode", 0 };
+          bind_builtin( "FILE_OPEN",
+                        builtin_file_open, 0, args );
+      }
+
+      {
+          char * args[] = { "string", ":", "width", 0 };
+          bind_builtin( "PAD",
+                        builtin_pad, 0, args );
+      }
+
       /* Initialize builtin modules. */
       init_set();
       init_path();
@@ -1266,6 +1284,60 @@
     return result;
 }
 
+extern int anyhow;
+
+/* Takes a list of target names as first argument, and immediately
+   updates them.
+   Second parameter, if specified, if the descriptor (converted to a string)
+   of a log file where all build output is redirected.
+*/
+LIST * builtin_update_now( PARSE * parse, FRAME * frame )
+{
+    LIST * targets = lol_get( frame->args, 0 );
+    LIST * log = lol_get( frame->args, 1 );
+    int status = 0;
+    int original_stdout;
+    int original_stderr;
+    int n;
+	int targets_count;
+	const char** targets2;
+	int i;
+	
+
+    if (log)
+    {
+        int fd = atoi(log->string);
+        /* Redirect stdout and stderr, temporary, to the log file.  */
+        original_stdout = dup (0);
+        original_stderr = dup (1);
+        dup2 (fd, 0);
+        dup2 (fd, 1);
+    }
+
+    targets_count = list_length( targets );
+    targets2 = (const char * *)BJAM_MALLOC( targets_count * sizeof( char * ) );    
+    for (i = 0 ; targets; targets = list_next( targets ) )
+        targets2[ i++ ] = targets->string;
+    status |= make( targets_count, targets2, anyhow);
+    free( targets );
+
+    if (log)
+    {
+        /* Flush whatever stdio might have buffered, while descriptions
+           0 and 1 still refer to the log file.  */
+        fflush (stdout);
+        fflush (stderr);
+        dup2 (original_stdout, 0);
+        dup2 (original_stderr, 1);
+        close (original_stdout);
+        close (original_stderr);
+    }
+	
+    if (status == 0)
+        return list_new (L0, newstr ("ok"));
+    else
+        return L0;
+}
 
 LIST * builtin_search_for_target( PARSE * parse, FRAME * frame )
 {
@@ -1544,6 +1616,57 @@
     return list_new (0, newstr(hex_output));
 }
 
+LIST *builtin_file_open( PARSE *parse, FRAME *frame )
+{
+    char* name = lol_get(frame->args, 0)->string;
+    char* mode = lol_get(frame->args, 1)->string;
+    int fd;
+    char buffer[sizeof("4294967295")];
+
+    if (strcmp(mode, "w") == 0)
+    {
+        fd = open(name, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+    }
+    else
+    {
+        fd = open(name, O_RDONLY);
+    }
+
+    if (fd != -1)
+    {
+        sprintf(buffer, "%d", fd);
+        return list_new(L0, newstr(buffer));
+    }
+    else
+    {
+        return L0;
+    }
+}
+
+LIST *builtin_pad( PARSE *parse, FRAME *frame )
+{
+    char *string = lol_get(frame->args, 0)->string;
+    char *width_s = lol_get(frame->args, 1)->string;
+
+    int current = strlen (string);
+    int desired = atoi(width_s);
+    if (current >= desired)
+        return list_new (L0, string);
+    else
+    {
+        char *buffer = malloc (desired + 1);
+        int i;
+        LIST *result;
+
+        strcpy (buffer, string);
+        for (i = current; i < desired; ++i)
+            buffer[i] = ' ';
+        buffer[desired] = '\0';
+        result = list_new (L0, newstr (buffer));
+        free (buffer);
+        return result;
+    }
+}
 
 #ifdef HAVE_PYTHON
 

Modified: trunk/tools/jam/src/builtins.h
==============================================================================
--- trunk/tools/jam/src/builtins.h	(original)
+++ trunk/tools/jam/src/builtins.h	2010-02-21 18:33:13 EST (Sun, 21 Feb 2010)
@@ -42,6 +42,7 @@
 LIST *builtin_backtrace( PARSE *parse, FRAME *args );
 LIST *builtin_pwd( PARSE *parse, FRAME *args );
 LIST *builtin_update( PARSE *parse, FRAME *args );
+LIST *builtin_update_now( PARSE *parse, FRAME *args );
 LIST *builtin_search_for_target( PARSE *parse, FRAME *args );
 LIST *builtin_import_module( PARSE *parse, FRAME *args );
 LIST *builtin_imported_modules( PARSE *parse, FRAME *frame );
@@ -56,6 +57,8 @@
 LIST *builtin_python_import_rule( PARSE *parse, FRAME *frame );
 LIST *builtin_shell( PARSE *parse, FRAME *frame );
 LIST *builtin_md5( PARSE *parse, FRAME *frame );
+LIST *builtin_file_open( PARSE *parse, FRAME *frame );
+LIST *builtin_pad( PARSE *parse, FRAME *frame );
 
 void backtrace( FRAME *frame );
 

Modified: trunk/tools/jam/src/jam.c
==============================================================================
--- trunk/tools/jam/src/jam.c	(original)
+++ trunk/tools/jam/src/jam.c	2010-02-21 18:33:13 EST (Sun, 21 Feb 2010)
@@ -200,6 +200,8 @@
 }
 #endif
 
+int anyhow = 0;
+
 #ifdef HAVE_PYTHON
     extern PyObject * bjam_call         ( PyObject * self, PyObject * args );
     extern PyObject * bjam_import_rule  ( PyObject * self, PyObject * args );
@@ -214,7 +216,6 @@
     char                  * s;
     struct option           optv[N_OPTS];
     char            const * all = "all";
-    int                     anyhow = 0;
     int                     status;
     int                     arg_c = argc;
     char          *       * arg_v = argv;
@@ -448,6 +449,9 @@
             }
         }
 
+        if (!targets_to_update())
+            mark_target_for_updating("all");
+
         /* Parse ruleset. */
         {
             FRAME frame[ 1 ];
@@ -514,11 +518,7 @@
             PROFILE_ENTER( MAIN_MAKE );
 
             LIST * targets = targets_to_update();
-            if ( !targets )
-            {
-                status |= make( 1, &all, anyhow );
-            }
-            else
+            if (targets)
             {
                 int targets_count = list_length( targets );
                 const char * * targets2 = (const char * *)