Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)
*** 287,299 ****
Doname
doname(register Name target, register Boolean do_get, register Boolean implicit, register Boolean automatic)
{
Doname result = build_dont_know;
Chain out_of_date_list = NULL;
- #ifdef TEAMWARE_MAKE_CMN
Chain target_group;
- #endif
Property old_locals = NULL;
register Property line;
Property command = NULL;
register Dependency dependency;
Name less = NULL;
--- 287,297 ----
*** 310,320 ****
if (target->state == build_running) {
return build_running;
}
line = get_prop(target->prop, line_prop);
- #ifdef TEAMWARE_MAKE_CMN
if (line != NULL) {
/*
* If this target is a member of target group and one of the
* other members of the group is running, mark this target
* as running.
--- 308,317 ----
*** 331,341 ****
false);
return build_running;
}
}
}
- #endif
/*
* If the target is a constructed one for a "::" target,
* we need to consider that.
*/
if (target->has_target_prop) {
--- 328,337 ----
*** 377,396 ****
}
} else if (target->state == build_pending) {
target->state = build_dont_know;
restart = true;
/*
- #ifdef TEAMWARE_MAKE_CMN
} else if (parallel &&
keep_state &&
(target->conditional_cnt > 0)) {
if (!parallel_ok(target, false)) {
add_subtree(target, recursion_level, do_get, implicit);
target->state = build_running;
return build_running;
}
- #endif
*/
}
/*
* If KEEP_STATE is on, we have to rebuild the target if the
* building of it caused new automatic dependencies to be reported.
--- 373,390 ----
*** 530,540 ****
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
- #ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
--- 524,533 ----
*** 546,556 ****
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
- #endif
case build_ok:
result = build_ok;
break;
}
}
--- 539,548 ----
*** 567,577 ****
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
- #ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
--- 559,568 ----
*** 583,593 ****
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
- #endif
default:
/* ALWAYS bind $% for old style */
/* ar rules */
if (line == NULL) {
line =
--- 574,583 ----
*** 603,613 ****
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
- #ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
--- 593,602 ----
*** 620,630 ****
prop,
conditional_prop),
0);
}
return build_running;
- #endif
}
}
}
/* Look for single suffix rule */
--- 609,618 ----
*** 653,663 ****
&command,
recheck_conditionals)) {
case build_failed:
result = build_failed;
break;
- #ifdef TEAMWARE_MAKE_CMN
case build_running:
target->state = build_running;
add_pending(target,
--recursion_level,
do_get,
--- 641,650 ----
*** 669,679 ****
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
- #endif
}
}
/* Try to sccs get */
if ((command == NULL) &&
(result == build_dont_know) &&
--- 656,665 ----
*** 743,753 ****
if (result != build_failed) {
result = run_command(command,
(Boolean) ((parallel || save_parallel) && !silent));
}
switch (result) {
- #ifdef TEAMWARE_MAKE_CMN
case build_running:
add_running(target,
true_target,
command,
--recursion_level,
--- 729,738 ----
*** 790,800 ****
get_prop(target->prop,
conditional_prop),
0);
}
return build_running;
- #endif
case build_ok:
/* If all went OK set a nice timestamp */
if (true_target->stat.time == file_doesnt_exist) {
true_target->stat.time = file_max_time;
}
--- 775,784 ----
*** 944,958 ****
* recursion_level Used for tracing
* rewrite_statefile Set if .make.state needs rewriting
* wait_name The Name ".WAIT", compared against
*/
static Boolean
- #ifdef TEAMWARE_MAKE_CMN
check_dependencies(Doname *result, Property line, Boolean do_get, Name target, Name true_target, Boolean doing_subtree, Chain *out_of_date_tail, Property old_locals, Boolean implicit, Property *command, Name less, Boolean rechecking_target, Boolean recheck_conditionals)
- #else
- check_dependencies(Doname *result, Property line, Boolean do_get, Name target, Name true_target, Boolean, Chain *out_of_date_tail, Property, Boolean, Property *command, Name less, Boolean rechecking_target, Boolean recheck_conditionals)
- #endif
{
Boolean dependencies_running;
register Dependency dependency;
Doname dep_result;
Boolean dependency_changed = false;
--- 928,938 ----
*** 1161,1171 ****
file_max_time;
force->state = build_dont_know;
}
}
}
- #ifdef TEAMWARE_MAKE_CMN
if (dependencies_running) {
if (doing_subtree) {
if (target->conditional_cnt > 0) {
reset_locals(target,
old_locals,
--- 1141,1150 ----
*** 1189,1199 ****
0);
}
return true;
}
}
- #endif
/*
* Collect the timestamp of the youngest double colon target
* dependency.
*/
if (target->is_double_colon_parent) {
--- 1168,1177 ----
*** 1613,1627 ****
return build_ok;
}
/* If quest, then exit(1) because the target is out of date */
if (quest) {
if (posix) {
- #ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true);
- #else
- result = execute_serial(line);
- #endif
}
exit_status = 1;
exit(1);
}
/* We actually had to do something this time */
--- 1591,1601 ----
*** 1697,1718 ****
if (remember_only) {
/* Empty block!!! */
} else if (touch) {
result = touch_command(line, target, result);
if (posix) {
- #ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true);
- #else
- result = execute_serial(line);
- #endif
}
} else {
/*
* If this is not a touch run, we need to execute the
* proper command(s) for the target.
*/
- #ifdef TEAMWARE_MAKE_CMN
if (parallel) {
if (!parallel_ok(target, true)) {
/*
* We are building in parallel, but
* this target must be built in serial.
--- 1671,1687 ----
*** 1720,1734 ****
/*
* If nothing else is building,
* do this one, else wait.
*/
if (parallel_process_cnt == 0) {
- #ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true, target->localhost);
- #else
- result = execute_serial(line);
- #endif
} else {
current_target = NULL;
current_line = NULL;
/*
line->body.line.command_used = NULL;
--- 1689,1699 ----
*** 1741,1755 ****
switch (result) {
case build_running:
return build_running;
case build_serial:
if (parallel_process_cnt == 0) {
- #ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true, target->localhost);
- #else
- result = execute_serial(line);
- #endif
} else {
current_target = NULL;
current_line = NULL;
target->parallel = false;
line->body.line.command_used =
--- 1706,1716 ----
*** 1757,1775 ****
return build_serial;
}
}
}
} else {
- #endif
- #ifdef TEAMWARE_MAKE_CMN
result = execute_parallel(line, true, target->localhost);
- #else
- result = execute_serial(line);
- #endif
- #ifdef TEAMWARE_MAKE_CMN
}
- #endif
}
temp_file_name = NULL;
if (report_dependencies_level == 0){
update_target(line, result);
}
--- 1718,1729 ----