Print this page
make: unifdef for MAKETOOL and DISTRIBUTED (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/misc.cc
          +++ new/usr/src/cmd/make/bin/misc.cc
↓ open down ↓ 135 lines elided ↑ open up ↑
 136  136   *              report_pwd      Should we report the current path?
 137  137   */
 138  138  /*VARARGS*/
 139  139  void
 140  140  fatal(const char *message, ...)
 141  141  {
 142  142          va_list args;
 143  143  
 144  144          va_start(args, message);
 145  145          (void) fflush(stdout);
 146      -#ifdef DISTRIBUTED
 147      -        (void) fprintf(stderr, catgets(catd, 1, 262, "dmake: Fatal error: "));
 148      -#else
 149  146          (void) fprintf(stderr, catgets(catd, 1, 263, "make: Fatal error: "));
 150      -#endif
 151  147          (void) vfprintf(stderr, message, args);
 152  148          (void) fprintf(stderr, "\n");
 153  149          va_end(args);
 154  150          if (report_pwd) {
 155  151                  (void) fprintf(stderr,
 156  152                                 catgets(catd, 1, 156, "Current working directory %s\n"),
 157  153                                 get_current_path());
 158  154          }
 159  155          (void) fflush(stderr);
 160  156          if (fatal_in_progress) {
↓ open down ↓ 7 lines elided ↑ open up ↑
 168  164              (parallel_process_cnt > 0)) {
 169  165                  (void) fprintf(stderr,
 170  166                                 catgets(catd, 1, 157, "Waiting for %d %s to finish\n"),
 171  167                                 parallel_process_cnt,
 172  168                                 parallel_process_cnt == 1 ?
 173  169                                 catgets(catd, 1, 158, "job") : catgets(catd, 1, 159, "jobs"));
 174  170                  (void) fflush(stderr);
 175  171          }
 176  172  
 177  173          while (parallel_process_cnt > 0) {
 178      -#ifdef DISTRIBUTED
 179      -                if (dmake_mode_type == distributed_mode) {
 180      -                        (void) await_dist(false);
 181      -                } else {
 182      -                        await_parallel(true);
 183      -                }
 184      -#else
 185  174                  await_parallel(true);
 186      -#endif
 187  175                  finish_children(false);
 188  176          }
 189  177  #endif
 190  178  
 191  179  #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
 192  180          job_adjust_fini();
 193  181  #endif
 194  182  
 195  183          exit_status = 1;
 196  184          exit(1);
↓ open down ↓ 12 lines elided ↑ open up ↑
 209  197   *              report_pwd      Should we report the current path?
 210  198   */
 211  199  /*VARARGS*/
 212  200  void
 213  201  warning(char * message, ...)
 214  202  {
 215  203          va_list args;
 216  204  
 217  205          va_start(args, message);
 218  206          (void) fflush(stdout);
 219      -#ifdef DISTRIBUTED
 220      -        (void) fprintf(stderr, catgets(catd, 1, 264, "dmake: Warning: "));
 221      -#else
 222  207          (void) fprintf(stderr, catgets(catd, 1, 265, "make: Warning: "));
 223      -#endif
 224  208          (void) vfprintf(stderr, message, args);
 225  209          (void) fprintf(stderr, "\n");
 226  210          va_end(args);
 227  211          if (report_pwd) {
 228  212                  (void) fprintf(stderr,
 229  213                                 catgets(catd, 1, 161, "Current working directory %s\n"),
 230  214                                 get_current_path());
 231  215          }
 232  216          (void) fflush(stderr);
 233  217  }
↓ open down ↓ 43 lines elided ↑ open up ↑
 277  261  get_current_path(void)
 278  262  {
 279  263          char                    pwd[(MAXPATHLEN * MB_LEN_MAX)];
 280  264          static char             *current_path;
 281  265  
 282  266          if (current_path == NULL) {
 283  267                  getcwd(pwd, sizeof(pwd));
 284  268                  if (pwd[0] == (int) nul_char) {
 285  269                          pwd[0] = (int) slash_char;
 286  270                          pwd[1] = (int) nul_char;
 287      -#ifdef DISTRIBUTED
 288      -                        current_path = strdup(pwd);
 289      -                } else if (IS_EQUALN(pwd, NOCATGETS("/tmp_mnt"), 8)) {
 290      -                        current_path = strdup(pwd + 8);
 291      -                } else {
 292      -                        current_path = strdup(pwd);
 293      -                }
 294      -#else
 295  271                  }
 296  272                  current_path = strdup(pwd);
 297      -#endif
 298  273          }
 299  274          return current_path;
 300  275  }
 301  276  
 302  277  /*****************************************
 303  278   *
 304  279   *      Make internal state dumping
 305  280   *
 306  281   *      This is a set  of routines for dumping the internal make state
 307  282   *      Used for the -p option
↓ open down ↓ 666 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX