diff options
Diffstat (limited to 'build2/operation')
| -rw-r--r-- | build2/operation | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/build2/operation b/build2/operation index d52c748..22bb8a7 100644 --- a/build2/operation +++ b/build2/operation @@ -110,7 +110,7 @@ namespace build2 // something here remember to update the man page. // const operation_id default_id = 1; // Shall be first. - const operation_id update_id = 2; + const operation_id update_id = 2; // Shall be second. const operation_id clean_id = 3; const operation_id test_id = 4; const operation_id install_id = 5; @@ -198,25 +198,20 @@ namespace build2 // Meta-operation-specific logic to load the buildfile, search and match // the targets, and execute the action on the targets. // - // Note that the model lock is passed locked and is expected to also be - // locked on return (but it can be released and re-acquired inside). - // - void (*load) (ulock&, - scope& root, + void (*load) (scope& root, const path& buildfile, const dir_path& out_base, const dir_path& src_base, const location&); - void (*search) (ulock&, - scope& root, + void (*search) (scope& root, const target_key&, const location&, action_targets&); - void (*match) (ulock&, action, action_targets&); + void (*match) (action, action_targets&); - void (*execute) (ulock&, action, const action_targets&, bool quiet); + void (*execute) (action, const action_targets&, bool quiet); void (*operation_post) (operation_id); // End of operation batch. void (*meta_operation_post) (); // End of meta-operation batch. @@ -234,8 +229,7 @@ namespace build2 // scope. // void - load (ulock&, - scope& root, + load (scope& root, const path& buildfile, const dir_path& out_base, const dir_path& src_base, @@ -245,17 +239,17 @@ namespace build2 // that does just that and adds a pointer to the target to the list. // void - search (ulock&, scope&, const target_key&, const location&, action_targets&); + search (scope&, const target_key&, const location&, action_targets&); void - match (ulock&, action, action_targets&); + match (action, action_targets&); // Execute the action on the list of targets. This is the default // implementation that does just that while issuing appropriate // diagnostics (unless quiet). // void - execute (ulock&, action, const action_targets&, bool quiet); + execute (action, const action_targets&, bool quiet); extern const meta_operation_info noop; extern const meta_operation_info perform; |