Print this page
make: unifdef for NSE (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/doname.cc
          +++ new/usr/src/cmd/make/bin/doname.cc
↓ open down ↓ 334 lines elided ↑ open up ↑
 335  335          Property                command = NULL;
 336  336          register Dependency     dependency;
 337  337          Name                    less = NULL;
 338  338          Name                    true_target = target;
 339  339          Name                    *automatics = NULL;
 340  340          register int            auto_count;
 341  341          Boolean                 rechecking_target = false;
 342  342          Boolean                 saved_commands_done;
 343  343          Boolean                 restart = false;
 344  344          Boolean                 save_parallel = parallel;
 345      -#ifdef NSE
 346      -        Boolean                 save_readdep;
 347      -#endif
 348  345          Boolean                 doing_subtree = false;
 349  346  
 350  347          Boolean                 recheck_conditionals = false;
 351  348  
 352  349          if (target->state == build_running) {
 353  350                  return build_running;
 354  351          }
 355  352          line = get_prop(target->prop, line_prop);
 356  353  #ifdef TEAMWARE_MAKE_CMN
 357  354          if (line != NULL) {
↓ open down ↓ 9 lines elided ↑ open up ↑
 367  364                                  target->state = build_running;
 368  365                                  add_pending(target,
 369  366                                              recursion_level,
 370  367                                              do_get,
 371  368                                              implicit,
 372  369                                              false);
 373  370                                  return build_running;
 374  371                          }
 375  372                  }
 376  373          }
 377      -#ifdef NSE
 378      -        nse_check_file_backquotes(target->string);
 379      -#endif
 380  374  #endif
 381  375          /*
 382  376           * If the target is a constructed one for a "::" target,
 383  377           * we need to consider that.
 384  378           */
 385  379          if (target->has_target_prop) {
 386  380                  true_target = get_prop(target->prop,
 387  381                                         target_prop)->body.target.target;
 388  382                  if (true_target->colon_splits > 0) {
 389  383                          /* Make sure we have a valid time for :: targets */
↓ open down ↓ 127 lines elided ↑ open up ↑
 517  511          }
 518  512  
 519  513  /*
 520  514   * after making the call to dynamic_dependecies unconditional we can handle
 521  515   * target names that are same as file name. In this case $$@ in the 
 522  516   * dependencies did not mean anything. WIth this change it expands it
 523  517   * as expected.
 524  518   */
 525  519          if (!target->has_depe_list_expanded)
 526  520          {
 527      -#ifdef NSE
 528      -                save_readdep = reading_dependencies;
 529      -                reading_dependencies= true;
 530      -#endif
 531  521                  dynamic_dependencies(target);
 532      -#ifdef NSE
 533      -                reading_dependencies= save_readdep;
 534      -#endif
 535  522          }
 536  523  
 537  524  /*
 538  525   *      FIRST SECTION -- GO THROUGH DEPENDENCIES AND COLLECT EXPLICIT
 539  526   *      COMMANDS TO RUN
 540  527   */
 541  528          if ((line = get_prop(target->prop, line_prop)) != NULL) {
 542  529                  if (check_dependencies(&result,
 543  530                                         line,
 544  531                                         do_get,
↓ open down ↓ 247 lines elided ↑ open up ↑
 792  779          }
 793  780  
 794  781          int doname_dyntarget = 0;
 795  782  r_command:
 796  783          /* Run commands if any. */
 797  784          if ((command != NULL) &&
 798  785              (command->body.line.command_template != NULL)) {
 799  786                  if (result != build_failed) {
 800  787                          result = run_command(command, 
 801  788                                               (Boolean) ((parallel || save_parallel) && !silent));
 802      -#ifdef NSE
 803      -                        nse_check_no_deps_no_rule(target,
 804      -                                get_prop(target->prop, line_prop), command);
 805      -#endif
 806  789                  }
 807  790                  switch (result) {
 808  791  #ifdef TEAMWARE_MAKE_CMN
 809  792                  case build_running:
 810  793                          add_running(target,
 811  794                                      true_target,
 812  795                                      command,
 813  796                                      --recursion_level,
 814  797                                      auto_count,
 815  798                                      automatics,
↓ open down ↓ 247 lines elided ↑ open up ↑
1063 1046                          timestruc_t     depe_time = file_doesnt_exist;
1064 1047  
1065 1048  
1066 1049                          if (true_target->is_member) {
1067 1050                                  depe_time = exists(dependency->name);
1068 1051                          }
1069 1052                          if (dependency->built ||
1070 1053                              (dependency->name->state == build_failed)) {
1071 1054                                  dep_result = (Doname) dependency->name->state;
1072 1055                          } else {
1073      -#ifdef NSE
1074      -                                nse_check_sccs(target->string,
1075      -                                               dependency->name->string);
1076      -                                nse_check_derived_src(target,
1077      -                                               dependency->name->string,
1078      -                                               line->body.line.command_template);
1079      -#endif
1080 1056                                  dep_result = doname_check(dependency->name,
1081 1057                                                            do_get,
1082 1058                                                            false,
1083 1059                                                            (Boolean) dependency->automatic);
1084 1060                          }
1085 1061                          if (true_target->is_member || dependency->name->is_member) {
1086 1062                                  /* should compare only secs, cause lib members does not have nsec time resolution */
1087 1063                                  if (depe_time.tv_sec != dependency->name->stat.time.tv_sec) {
1088 1064                                          this_dependency_changed =
1089 1065                                            dependency_changed =
↓ open down ↓ 488 lines elided ↑ open up ↑
1578 1554          for (remove = &line->body.line.dependencies, dependency = *remove;
1579 1555               dependency != NULL;
1580 1556               dependency = *remove) {
1581 1557                  if (dependency->name == NULL) {
1582 1558                          dependency = *remove = (*remove)->next;
1583 1559                          continue;
1584 1560                  }
1585 1561                  /* If dependency name string contains shell wildcards */
1586 1562                  /* replace the name with the expansion */
1587 1563                  if (dependency->name->wildcard) {
1588      -#ifdef NSE
1589      -                        nse_wildcard(target->string, dependency->name->string);
1590      -#endif
1591 1564                          wcb.init(dependency->name);
1592 1565                          if ((start = (wchar_t *) wschr(wcb.get_string(),
1593 1566                                             (int) parenleft_char)) != NULL) {
1594 1567                                  /* lib(*) type pattern */
1595 1568                                  library = buffer;
1596 1569                                  (void) wsncpy(buffer,
1597 1570                                                wcb.get_string(),
1598 1571                                                start - wcb.get_string());
1599 1572                                  buffer[start-wcb.get_string()] =
1600 1573                                    (int) nul_char;
↓ open down ↓ 377 lines elided ↑ open up ↑
1978 1951                                  result = dosys(rule->command_line,
1979 1952                                                 (Boolean) rule->ignore_error,
1980 1953                                                 (Boolean) rule->make_refd,
1981 1954                                                 /* ds 98.04.23 bug #4085164. make should always show error messages */
1982 1955                                                 false,
1983 1956                                                 /* BOOLEAN(rule->silent &&
1984 1957                                                         rule->ignore_error), */
1985 1958                                                 (Boolean) rule->always_exec,
1986 1959                                                 target,
1987 1960                                                 send_mtool_msgs);
1988      -#ifdef NSE
1989      -                                nse_did_recursion= false;
1990      -#endif
1991 1961                                  check_state(temp_file_name);
1992      -#ifdef NSE
1993      -                                nse_check_cd(line);
1994      -#endif
1995 1962                          }
1996 1963                          SEND_MTOOL_MSG(
1997 1964                                  append_job_result_msg(job_result_msg);
1998 1965                                  if (child_pid > 0) {
1999 1966                                          kill(child_pid, SIGUSR1);
2000 1967                                          while (!((waitpid(child_pid, 0, 0) == -1)
2001 1968                                                  && (errno == ECHILD)));
2002 1969                                  }
2003 1970                                  child_pid = 0;
2004 1971                                  (void) unlink(stdout_file);
↓ open down ↓ 1761 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX