Print this page
make: remove maketool support

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 1306 lines elided ↑ open up ↑
1307 1307   *              .make.state path & name set for make -K
1308 1308   *              continue_after_error    Set for make -k
1309 1309   *              debug_level             Set for make -d
1310 1310   *              do_not_exec_rule        Set for make -n
1311 1311   *              filter_stderr           Set for make -X
1312 1312   *              ignore_errors_all       Set for make -i
1313 1313   *              no_parallel             Set for make -R
1314 1314   *              quest                   Set for make -q
1315 1315   *              read_trace_level        Set for make -D
1316 1316   *              report_dependencies     Set for make -P
1317      - *              send_mtool_msgs         Set for make -K
1318 1317   *              silent_all              Set for make -s
1319 1318   *              touch                   Set for make -t
1320 1319   */
1321 1320  static int
1322 1321  parse_command_option(register char ch)
1323 1322  {
1324 1323          static int              invert_next = 0;
1325 1324          int                     invert_this = invert_next;
1326 1325  
1327 1326          invert_next = 0;
↓ open down ↓ 100 lines elided ↑ open up ↑
1428 1427                          do_not_exec_rule = false;
1429 1428                  }
1430 1429                  return 0;
1431 1430          case 'n':                        /* Print, not exec commands */
1432 1431                  if (invert_this) {
1433 1432                          do_not_exec_rule = false;
1434 1433                  } else {
1435 1434                          do_not_exec_rule = true;
1436 1435                  }
1437 1436                  return 0;
1438      -        case 'O':                        /* Send job start & result msgs */
1439      -                if (invert_this) {
1440      -                        send_mtool_msgs = false;
1441      -                } else {
1442      -                }
1443      -                return 128;
     1437 +        case 'O':                        /* Integrate with maketool, obsolete */
     1438 +                return 0;
1444 1439          case 'o':                        /* Use alternative dmake output dir */
1445 1440                  if (invert_this) {
1446 1441                          dmake_odir_specified = false;
1447 1442                  } else {
1448 1443                          dmake_odir_specified = true;
1449 1444                  }
1450 1445                  return 512;
1451 1446          case 'P':                        /* Print for selected targets */
1452 1447                  if (invert_this) {
1453 1448                          report_dependencies_level--;
↓ open down ↓ 1037 lines elided ↑ open up ↑
2491 2486                                  MBSTOWCS(wcs_buffer, NOCATGETS("PMAKE_MACHINESFILE"));
2492 2487                                  name = GETNAME(wcs_buffer, FIND_LENGTH);
2493 2488                                  break;
2494 2489                          case 32: /* -m seen */
2495 2490                                  if (argv[i+1] == NULL) {
2496 2491                                          fatal(catgets(catd, 1, 197, "No dmake mode argument after -m flag"));
2497 2492                                  }
2498 2493                                  MBSTOWCS(wcs_buffer, NOCATGETS("DMAKE_MODE"));
2499 2494                                  name = GETNAME(wcs_buffer, FIND_LENGTH);
2500 2495                                  break;
2501      -                        case 128: /* -O seen */
2502      -                                if (argv[i+1] == NULL) {
2503      -                                        fatal(catgets(catd, 1, 287, "No file descriptor argument after -O flag"));
2504      -                                }
2505      -                                mtool_msgs_fd = atoi(argv[i+1]);
2506      -                                /* find out if mtool_msgs_fd is a valid file descriptor */
2507      -                                if (fstat(mtool_msgs_fd, &statbuf) < 0) {
2508      -                                        fatal(catgets(catd, 1, 355, "Invalid file descriptor %d after -O flag"), mtool_msgs_fd);
2509      -                                }
2510      -                                argv[i] = NULL;
2511      -                                argv[i+1] = NULL;
2512      -                                continue;
2513 2496                          case 256: /* -K seen */
2514 2497                                  if (argv[i+1] == NULL) {
2515 2498                                          fatal(catgets(catd, 1, 288, "No makestate filename argument after -K flag"));
2516 2499                                  }
2517 2500                                  MBSTOWCS(wcs_buffer, argv[i+1]);
2518 2501                                  make_state = GETNAME(wcs_buffer, FIND_LENGTH);
2519 2502                                  keep_state = true;
2520 2503                                  argv[i] = NULL;
2521 2504                                  argv[i+1] = NULL;
2522 2505                                  continue;
↓ open down ↓ 675 lines elided ↑ open up ↑
3198 3181          strncat(Ar->start, name, cp0-name);
3199 3182          strcat(Ar->start, "=");
3200 3183          strncat(Ar->start, esc_value, strlen(esc_value));
3201 3184          free(esc_value);
3202 3185          return;
3203 3186  ERROR_MACRO:    
3204 3187          /* Macro without '=' or with invalid left/right part */
3205 3188          return;
3206 3189  }
3207 3190  
3208      -#ifdef TEAMWARE_MAKE_CMN
3209      -/*
3210      - * This function, if registered w/ avo_cli_get_license(), will be called
3211      - * if the application is about to exit because:
3212      - *   1) there has been certain unrecoverable error(s) that cause the
3213      - *      application to exit immediately.
3214      - *   2) the user has lost a license while the application is running.
3215      - */
3216      -extern "C" void
3217      -dmake_exit_callback(void)
3218      -{
3219      -        fatal(catgets(catd, 1, 306, "can not get a license, exiting..."));
3220      -        exit(1);
3221      -}
3222      -
3223      -/*
3224      - * This function, if registered w/ avo_cli_get_license(), will be called
3225      - * if the application can not get a license.
3226      - */
3227      -extern "C" void
3228      -dmake_message_callback(char *err_msg)
3229      -{
3230      -        static Boolean  first = true;
3231      -
3232      -        if (!first) {
3233      -                return;
3234      -        }
3235      -        first = false;
3236      -        if ((!list_all_targets) &&
3237      -            (report_dependencies_level == 0) &&
3238      -            (dmake_mode_type != serial_mode)) {
3239      -                warning(catgets(catd, 1, 313, "can not get a TeamWare license, defaulting to serial mode..."));
3240      -        }
3241      -}
3242      -#endif
3243      -
3244      -
3245 3191  static void
3246 3192  report_dir_enter_leave(Boolean entering)
3247 3193  {
3248 3194          char    rcwd[MAXPATHLEN];
3249 3195  static  char *  mlev = NULL;
3250 3196          char *  make_level_str = NULL;
3251 3197          int     make_level_val = 0;
3252 3198  
3253 3199          make_level_str = getenv(NOCATGETS("MAKELEVEL"));
3254 3200          if(make_level_str) {
↓ open down ↓ 38 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX