[Boost-commit] svn:boost r75967 - trunk/tools/build/v2/engine

Subject: [Boost-commit] svn:boost r75967 - trunk/tools/build/v2/engine
From: steven_at_[hidden]
Date: 2011-12-15 14:21:40

Author: steven_watanabe
Date: 2011-12-15 14:21:39 EST (Thu, 15 Dec 2011)
New Revision: 75967
URL: http://svn.boost.org/trac/boost/changeset/75967

Log:
Remove SEARCH_FOR_TARGET.
Text files modified: 
   trunk/tools/build/v2/engine/builtins.c |    14 ------                                  
   trunk/tools/build/v2/engine/builtins.h |     1                                         
   trunk/tools/build/v2/engine/rules.c    |    91 ----------------------------------------
   trunk/tools/build/v2/engine/rules.h    |     2                                         
   4 files changed, 1 insertions(+), 107 deletions(-)

Modified: trunk/tools/build/v2/engine/builtins.c
==============================================================================
--- trunk/tools/build/v2/engine/builtins.c	(original)
+++ trunk/tools/build/v2/engine/builtins.c	2011-12-15 14:21:39 EST (Thu, 15 Dec 2011)
@@ -283,12 +283,6 @@
       }
 
       {
-          const char * args[] = { "target", "*", ":", "path", "*", 0 };
-          bind_builtin( "SEARCH_FOR_TARGET",
-                        builtin_search_for_target, 0, args );
-      }
-
-      {
           const char * args[] = { "modules_to_import", "+", ":", "target_module", "?", 0 };
           bind_builtin( "IMPORT_MODULE",
                         builtin_import_module, 0, args );
@@ -1424,14 +1418,6 @@
         return L0;
 }
 
-LIST * builtin_search_for_target( FRAME * frame, int flags )
-{
-    LIST * arg1 = lol_get( frame->args, 0 );
-    LIST * arg2 = lol_get( frame->args, 1 );
-    TARGET * t = search_for_target( arg1->value, arg2 );
-    return list_new( L0, object_copy( t->name ) );
-}
-
 
 LIST * builtin_import_module( FRAME * frame, int flags )
 {

Modified: trunk/tools/build/v2/engine/builtins.h
==============================================================================
--- trunk/tools/build/v2/engine/builtins.h	(original)
+++ trunk/tools/build/v2/engine/builtins.h	2011-12-15 14:21:39 EST (Thu, 15 Dec 2011)
@@ -43,7 +43,6 @@
 LIST *builtin_pwd( FRAME * frame, int flags );
 LIST *builtin_update( FRAME * frame, int flags );
 LIST *builtin_update_now( FRAME * frame, int flags );
-LIST *builtin_search_for_target( FRAME * frame, int flags );
 LIST *builtin_import_module( FRAME * frame, int flags );
 LIST *builtin_imported_modules( FRAME * frame, int flags );
 LIST *builtin_instance( FRAME * frame, int flags );

Modified: trunk/tools/build/v2/engine/rules.c
==============================================================================
--- trunk/tools/build/v2/engine/rules.c	(original)
+++ trunk/tools/build/v2/engine/rules.c	2011-12-15 14:21:39 EST (Thu, 15 Dec 2011)
@@ -49,15 +49,6 @@
 
 static struct hash * targethash = 0;
 
-struct _located_target
-{
-    OBJECT * file_name;
-    TARGET * target;
-};
-typedef struct _located_target LOCATED_TARGET ;
-
-static struct hash * located_targets = 0;
-
 
 /*
  * target_include() - adds the 'included' TARGET to the list of targets included
@@ -209,88 +200,6 @@
 }
 
 
-/* TODO: It is probably not a good idea to use functions in other modules like
-  this. */
-void call_bind_rule( OBJECT * target, OBJECT * boundname );
-
-
-TARGET * search_for_target ( OBJECT * name, LIST * search_path )
-{
-    PATHNAME f[1];
-    string buf[1];
-    LOCATED_TARGET lt;
-    LOCATED_TARGET * lta = <
-    time_t time;
-    int found = 0;
-    TARGET * result;
-
-    string_new( buf );
-
-    path_parse( object_str( name ), f );
-
-    f->f_grist.ptr = 0;
-    f->f_grist.len = 0;
-
-    while ( search_path )
-    {
-        OBJECT * key;
-        f->f_root.ptr = object_str( search_path->value );
-        f->f_root.len = strlen( object_str( search_path->value ) );
-
-        string_truncate( buf, 0 );
-        path_build( f, buf, 1 );
-
-        lt.file_name = key = object_new( buf->value ) ;
-
-        if ( !located_targets )
-            located_targets = hashinit( sizeof(LOCATED_TARGET),
-                                        "located targets" );
-
-        if ( hashcheck( located_targets, (HASHDATA * *)&lta ) )
-        {
-            object_free( key );
-            string_free( buf );
-            return lta->target;
-        }
-
-        timestamp( key, &time );
-        object_free( key );
-        if ( time )
-        {
-            found = 1;
-            break;
-        }
-
-        search_path = list_next( search_path );
-    }
-
-    if ( !found )
-    {
-        OBJECT * key;
-        f->f_root.ptr = 0;
-        f->f_root.len = 0;
-
-        string_truncate( buf, 0 );
-        path_build( f, buf, 1 );
-
-        key = object_new( buf->value );
-        timestamp( key, &time );
-        object_free( key );
-    }
-
-    result = bindtarget( name );
-    result->boundname = object_new( buf->value );
-    result->time = time;
-    result->binding = time ? T_BIND_EXISTS : T_BIND_MISSING;
-
-    call_bind_rule( result->name, result->boundname );
-
-    string_free( buf );
-
-    return result;
-}
-
-
 /*
  * copytarget() - make a new target with the old target's name.
  *

Modified: trunk/tools/build/v2/engine/rules.h
==============================================================================
--- trunk/tools/build/v2/engine/rules.h	(original)
+++ trunk/tools/build/v2/engine/rules.h	2011-12-15 14:21:39 EST (Thu, 15 Dec 2011)
@@ -221,6 +221,7 @@
 #define T_MAKE_ACTIVE         2       /* make1(target) in make1b() */
 #define T_MAKE_RUNNING        3       /* make1(target) running commands */
 #define T_MAKE_DONE           4       /* make1(target) done */
+#define T_MAKE_NOEXEC_DONE    5       /* make1(target) done with -n in effect */
 
 #ifdef OPT_SEMAPHORE
     #define T_MAKE_SEMAPHORE  5       /* Special target type for semaphores */
@@ -269,7 +270,6 @@
 TARGET  * bindtarget                     ( OBJECT * target_name );
 TARGET  * copytarget                     ( TARGET const * t );
 void      freetargets                    ( TARGETS * );
-TARGET  * search_for_target              ( OBJECT * name, LIST * search_path );
 TARGETS * targetchain                    ( TARGETS * chain, TARGETS * );
 TARGETS * targetentry                    ( TARGETS * chain, TARGET * );
 void      target_include                 ( TARGET * including, TARGET * included );