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

*** 36,50 **** # include <avo/intl.h> #endif #include <bsd/bsd.h> /* bsd_signal() */ - #ifdef DISTRIBUTED - # include <dm/Avo_AcknowledgeMsg.h> - # include <rw/xdrstrea.h> - # include <dmrc/dmrc.h> /* dmakerc file processing */ - #endif #include <locale.h> /* setlocale() */ #include <mk/defs.h> #include <mksdmsi18n/mksdmsi18n.h> /* libmksdmsi18n_init() */ #include <mksh/macro.h> /* getvar() */ --- 36,45 ----
*** 163,178 **** static void setup_makeflags_argv(void); static void report_dir_enter_leave(Boolean entering); extern void expand_value(Name, register String , Boolean); - #ifdef DISTRIBUTED - extern int dmake_ofd; - extern FILE* dmake_ofp; - extern int rxmPid; - extern XDR xdrs_out; - #endif #ifdef TEAMWARE_MAKE_CMN static const char verstring[] = "illumos make"; #endif jmp_buf jmpbuffer; --- 158,167 ----
*** 243,253 **** #endif // ---> fprintf(stderr, catgets(catd, 15, 666, "--- SUN make ---\n")); ! #if defined(TEAMWARE_MAKE_CMN) || defined(MAKETOOL) /* * I put libmksdmsi18n_init() under #ifdef because it requires avo_i18n_init() * from avo_util library. */ libmksdmsi18n_init(); --- 232,242 ---- #endif // ---> fprintf(stderr, catgets(catd, 15, 666, "--- SUN make ---\n")); ! #if defined(TEAMWARE_MAKE_CMN) /* * I put libmksdmsi18n_init() under #ifdef because it requires avo_i18n_init() * from avo_util library. */ libmksdmsi18n_init();
*** 474,524 **** * They could be defined in the env, in the makefile, or on the * command line. * If neither is defined, and $(HOME)/.dmakerc does not exists, * then print a message, and default to parallel mode. */ - #ifdef DISTRIBUTED - MBSTOWCS(wcs_buffer, NOCATGETS("DMAKE_RCFILE")); - dmake_name = GETNAME(wcs_buffer, FIND_LENGTH); - MBSTOWCS(wcs_buffer, NOCATGETS("DMAKE_MODE")); - dmake_name2 = GETNAME(wcs_buffer, FIND_LENGTH); - if ((((prop = get_prop(dmake_name->prop, macro_prop)) == NULL) || - ((dmake_value = prop->body.macro.value) == NULL)) && - (((prop2 = get_prop(dmake_name2->prop, macro_prop)) == NULL) || - ((dmake_value2 = prop2->body.macro.value) == NULL))) { - Boolean empty_dmakerc = true; - char *homedir = getenv(NOCATGETS("HOME")); - if ((homedir != NULL) && (strlen(homedir) < (sizeof(def_dmakerc_path) - 16))) { - sprintf(def_dmakerc_path, NOCATGETS("%s/.dmakerc"), homedir); - if ((((statval = stat(def_dmakerc_path, &statbuf)) != 0) && (errno == ENOENT)) || - ((statval == 0) && (statbuf.st_size == 0))) { - } else { - Avo_dmakerc *rcfile = new Avo_dmakerc(); - Avo_err *err = rcfile->read(def_dmakerc_path, NULL, TRUE); - if (err) { - fatal(err->str); - } - empty_dmakerc = rcfile->was_empty(); - delete rcfile; - } - } - if (empty_dmakerc) { - if (getenv(NOCATGETS("DMAKE_DEF_PRINTED")) == NULL) { - putenv(NOCATGETS("DMAKE_DEF_PRINTED=TRUE")); - (void) fprintf(stdout, catgets(catd, 1, 302, "dmake: defaulting to parallel mode.\n")); - (void) fprintf(stdout, catgets(catd, 1, 303, "See the man page dmake(1) for more information on setting up the .dmakerc file.\n")); - } - dmake_mode_type = parallel_mode; - no_parallel = false; - } - } - #else if(dmake_mode_type == distributed_mode) { dmake_mode_type = parallel_mode; no_parallel = false; } - #endif /* DISTRIBUTED */ } } #endif #ifdef TEAMWARE_MAKE_CMN --- 463,476 ----
*** 562,583 **** } } } #endif - #ifdef DISTRIBUTED - /* - * At this point, DMake should startup an rxm with any and all - * DMake command line options. Rxm will, among other things, - * read the rc file. - */ - if ((!list_all_targets) && - (report_dependencies_level == 0) && - (dmake_mode_type == distributed_mode)) { - startup_rxm(); - } - #endif /* * Enable interrupt handler for alarms */ (void) bsd_signal(SIGALRM, (SIG_PF)doalarm); --- 514,523 ----
*** 651,663 **** make_state_dir); temp_file_directory = strdup(tmp_current_path2); } } - #ifdef DISTRIBUTED - building_serial = false; - #endif report_dir_enter_leave(true); make_targets(argc, argv, parallel_flag); --- 591,600 ----
*** 742,757 **** ); } #endif - /* - #ifdef DISTRIBUTED - if (get_parent() == TRUE) { - #endif - */ - parallel = false; /* If we used the SVR4_MAKE, don't build .DONE or .FAILED */ if (!getenv(USE_SVR4_MAKE)){ /* Build the target .DONE or .FAILED if we caught an error */ if (!quest && !list_all_targets) { --- 679,688 ----
*** 829,872 **** make_state_lockfile = NULL; make_state_locked = false; } /* Write .make.state */ write_state_file(1, (Boolean) 1); - /* - #ifdef DISTRIBUTED - } - #endif - */ #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000) job_adjust_fini(); #endif #ifdef TEAMWARE_MAKE_CMN catclose(catd); #endif - #ifdef DISTRIBUTED - if (rxmPid > 0) { - // Tell rxm to exit by sending it an Avo_AcknowledgeMsg - Avo_AcknowledgeMsg acknowledgeMsg; - RWCollectable *msg = (RWCollectable *)&acknowledgeMsg; - - int xdrResult = xdr(&xdrs_out, msg); - - if (xdrResult) { - fflush(dmake_ofp); - } else { - /* - fatal(catgets(catd, 1, 266, "couldn't tell rxm to exit")); - */ - kill(rxmPid, SIGTERM); - } - - waitpid(rxmPid, NULL, 0); - rxmPid = 0; - } - #endif } /* * handle_interrupt() * --- 760,777 ----
*** 886,911 **** { Property member; Running rp; (void) fflush(stdout); - #ifdef DISTRIBUTED - if (rxmPid > 0) { - // Tell rxm to exit by sending it an Avo_AcknowledgeMsg - Avo_AcknowledgeMsg acknowledgeMsg; - RWCollectable *msg = (RWCollectable *)&acknowledgeMsg; - - int xdrResult = xdr(&xdrs_out, msg); - - if (xdrResult) { - fflush(dmake_ofp); - } else { - kill(rxmPid, SIGTERM); - rxmPid = 0; - } - } - #endif if (childPid > 0) { kill(childPid, SIGTERM); childPid = -1; } for (rp = running_list; rp != NULL; rp = rp->next) { --- 791,800 ----
*** 1617,1629 **** return 0; case 'O': /* Send job start & result msgs */ if (invert_this) { send_mtool_msgs = false; } else { - #ifdef DISTRIBUTED - send_mtool_msgs = true; - #endif } return 128; case 'o': /* Use alternative dmake output dir */ if (invert_this) { dmake_odir_specified = false; --- 1506,1515 ----
*** 3407,3463 **** warning(catgets(catd, 1, 313, "can not get a TeamWare license, defaulting to serial mode...")); } } #endif - #ifdef DISTRIBUTED - /* - * Returns whether -c is set or not. - */ - Boolean - get_dmake_rcfile_specified(void) - { - return(dmake_rcfile_specified); - } - - /* - * Returns whether -g is set or not. - */ - Boolean - get_dmake_group_specified(void) - { - return(dmake_group_specified); - } - - /* - * Returns whether -j is set or not. - */ - Boolean - get_dmake_max_jobs_specified(void) - { - return(dmake_max_jobs_specified); - } - - /* - * Returns whether -m is set or not. - */ - Boolean - get_dmake_mode_specified(void) - { - return(dmake_mode_specified); - } - - /* - * Returns whether -o is set or not. - */ - Boolean - get_dmake_odir_specified(void) - { - return(dmake_odir_specified); - } - - #endif static void report_dir_enter_leave(Boolean entering) { char rcwd[MAXPATHLEN]; --- 3293,3302 ----