Print this page
make: unifdef for USE_DMS_CCR (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 31 lines elided ↑ open up ↑
  32   32  /*
  33   33   * Included files
  34   34   */
  35   35  #if defined(TEAMWARE_MAKE_CMN)
  36   36  #       include <avo/intl.h>
  37   37  #       include <avo/libcli.h>          /* libcli_init() */
  38   38  #       include <avo/cli_license.h>     /* avo_cli_get_license() */
  39   39  #       include <avo/find_dir.h>        /* avo_find_run_dir() */
  40   40  #       include <avo/version_string.h>
  41   41  #       include <avo/util.h>            /* avo_init() */
  42      -#ifdef USE_DMS_CCR
  43      -#       include <avo/usage_tracking.h>
  44      -#else
  45   42  #       include <avo/cleanup.h>
  46   43  #endif
  47      -#endif
  48   44  
  49   45  #if defined(TEAMWARE_MAKE_CMN)
  50   46  /* This is for dmake only (not for Solaris make).
  51   47   * Include code to check updates (dmake patches)
  52   48   */
  53   49  #ifdef _CHECK_UPDATE_H
  54   50  #include <libAU.h>
  55   51  #endif
  56   52  #endif
  57   53  
↓ open down ↓ 5 lines elided ↑ open up ↑
  63   59  #       include <dmrc/dmrc.h> /* dmakerc file processing */
  64   60  #endif
  65   61  
  66   62  #include <locale.h>             /* setlocale() */
  67   63  #include <mk/defs.h>
  68   64  #include <mksdmsi18n/mksdmsi18n.h>      /* libmksdmsi18n_init() */
  69   65  #include <mksh/macro.h>         /* getvar() */
  70   66  #include <mksh/misc.h>          /* getmem(), setup_char_semantics() */
  71   67  
  72   68  #if defined(TEAMWARE_MAKE_CMN)
  73      -#ifdef USE_DMS_CCR
  74      -#       include <pubdmsi18n/pubdmsi18n.h>       /* libpubdmsi18n_init() */
  75      -#endif
  76   69  #endif
  77   70  
  78   71  #include <pwd.h>                /* getpwnam() */
  79   72  #include <setjmp.h>
  80   73  #include <signal.h>
  81   74  #include <stdlib.h>
  82   75  #include <sys/errno.h>          /* ENOENT */
  83   76  #include <sys/stat.h>           /* fstat() */
  84   77  #include <fcntl.h>              /* open() */
  85   78  
↓ open down ↓ 54 lines elided ↑ open up ↑
 140  133  static  Boolean         trace_status;                   /* `-p' */
 141  134  
 142  135  #ifdef DMAKE_STATISTICS
 143  136  static  Boolean         getname_stat = false;
 144  137  #endif
 145  138  
 146  139  #if defined(TEAMWARE_MAKE_CMN)
 147  140          static  time_t          start_time;
 148  141          static  int             g_argc;
 149  142          static  char            **g_argv;
 150      -#ifdef USE_DMS_CCR
 151      -        static  Avo_usage_tracking *usageTracking = NULL;
 152      -#else
 153  143          static  Avo_cleanup     *cleanup = NULL;
 154  144  #endif
 155      -#endif
 156  145  
 157  146  /*
 158  147   * File table of contents
 159  148   */
 160  149          extern "C" void         cleanup_after_exit(void);
 161  150  
 162  151  #ifdef TEAMWARE_MAKE_CMN
 163  152  extern "C" {
 164  153          extern  void            dmake_exit_callback(void);
 165  154          extern  void            dmake_message_callback(char *);
↓ open down ↓ 102 lines elided ↑ open up ↑
 268  257  
 269  258          /*
 270  259           * avo_init() sets the umask to 0.  Save it here and restore
 271  260           * it after the avo_init() call.
 272  261           */
 273  262  #if defined(TEAMWARE_MAKE_CMN) || defined(MAKETOOL)
 274  263          um = umask(0);
 275  264          avo_init(argv[0]);
 276  265          umask(um);
 277  266  
 278      -#ifdef USE_DMS_CCR
 279      -        usageTracking = new Avo_usage_tracking(NOCATGETS("dmake"), argc, argv);
 280      -#else
 281  267          cleanup = new Avo_cleanup(NOCATGETS("dmake"), argc, argv);
 282  268  #endif
 283      -#endif
 284  269  
 285  270  #if defined(TEAMWARE_MAKE_CMN)
 286  271          catd = catopen(AVO_DOMAIN_DMAKE, NL_CAT_LOCALE);
 287  272          libcli_init();
 288  273  
 289  274  #ifdef _CHECK_UPDATE_H
 290  275          /* This is for dmake only (not for Solaris make).
 291  276           * Check (in background) if there is an update (dmake patch)
 292  277           * and inform user
 293  278           */
↓ open down ↓ 10 lines elided ↑ open up ↑
 304  289  
 305  290  // ---> fprintf(stderr, catgets(catd, 15, 666, "--- SUN make ---\n"));
 306  291  
 307  292  
 308  293  #if defined(TEAMWARE_MAKE_CMN) || defined(MAKETOOL)
 309  294  /*
 310  295   * I put libmksdmsi18n_init() under #ifdef because it requires avo_i18n_init()
 311  296   * from avo_util library. 
 312  297   */
 313  298          libmksdmsi18n_init();
 314      -#ifdef USE_DMS_CCR
 315      -        libpubdmsi18n_init();
 316      -#endif
 317  299  #endif
 318  300  
 319  301  
 320  302  #ifndef TEAMWARE_MAKE_CMN
 321  303          textdomain(NOCATGETS("SUNW_SPRO_MAKE"));
 322  304  #endif /* TEAMWARE_MAKE_CMN */
 323  305  
 324  306  #ifdef TEAMWARE_MAKE_CMN
 325  307          g_argc = argc;
 326  308          g_argv = (char **) malloc((g_argc + 1) * sizeof(char *));
↓ open down ↓ 462 lines elided ↑ open up ↑
 789  771   *                              True if -n flag on
 790  772   *              done            The Name ".DONE", rule we run
 791  773   *              keep_state      Set if .KEEP_STATE seen
 792  774   *              parallel        True if building in parallel
 793  775   *              quest           If -q is on we do not run .DONE
 794  776   *              report_dependencies
 795  777   *                              True if -P flag on
 796  778   *              running_list    List of parallel running processes
 797  779   *              temp_file_name  The temp file is removed, if any
 798  780   *              catd    the message catalog file
 799      - *              usage_tracking  Should have been constructed in main()
 800      - *                              should destroyed just before exiting
 801  781   */
 802  782  extern "C" void
 803  783  cleanup_after_exit(void)
 804  784  {
 805  785          Running         rp;
 806  786  
 807  787  extern long     getname_bytes_count;
 808  788  extern long     getname_names_count;
 809  789  extern long     getname_struct_count;
 810  790  extern long     freename_bytes_count;
↓ open down ↓ 116 lines elided ↑ open up ↑
 927  907          if ((make_state_lockfile != NULL) && (make_state_locked)) {
 928  908                  (void) unlink(make_state_lockfile);
 929  909                  make_state_lockfile = NULL;
 930  910                  make_state_locked = false;
 931  911          }
 932  912          /* Write .make.state */
 933  913          write_state_file(1, (Boolean) 1);
 934  914  
 935  915  #ifdef TEAMWARE_MAKE_CMN
 936  916          // Deleting the usage tracking object sends the usage mail 
 937      -#ifdef USE_DMS_CCR
 938      -        //usageTracking->setExitStatus(exit_status, NULL);
 939      -        //delete usageTracking;
 940      -#else
 941  917          cleanup->set_exit_status(exit_status);
 942  918          delete cleanup;
 943  919  #endif
 944      -#endif
 945  920  
 946  921  /*
 947  922  #ifdef DISTRIBUTED
 948  923      }
 949  924  #endif
 950  925   */
 951  926  
 952  927  #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
 953  928          job_adjust_fini();
 954  929  #endif
↓ open down ↓ 2667 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX