Attachment #33552 for issue #60948

View | Details | Raw Unified | Return to issue 60948
Collapse All | Expand All




#     License along with this library; if not, write to the Free Software
#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
#     MA  02111-1307  USA
#
#*************************************************************************
#
# build - build entire project
#

# Force build timestamp printing at the immediate start of the program
    print "s build " . time() . "\n";
    
    use Config;
    use POSIX;
    use Cwd qw (cwd);
    use File::Path;
    
    use lib ("$ENV{SOLARENV}/bin/modules");
    
    if (defined $ENV{COMMON_ENV_TOOLS}) {

    $build_finished++;
    generate_html_file(1);
    rmtree(CorrectPath($tmp_dir), 0, 1) if ($tmp_dir);
#    if ($exit_code) {
#        finish_logging("error occured");
#    } else {
#        finish_logging;
#    };
    print "e build " . time() . "\n";
    exit($exit_code);
};

sub deliver_module {
    return if ($show);
    my $module = shift;
    delete $build_in_progress{$module};
    $module_path = CorrectPath($StandDir.$module);




    *   2. It is a target and Force is set
    *   3. It's set of recipe lines has changed.
    */
   if(   Check_state(cp, _recipes, NUM_RECIPES )
      || (cp->ce_time < otime)
      || ((cp->ce_flag & F_TARGET) && Force)
     ) {

     fprintf(stderr, "s target %lu %s\n",  clock() * 1000 / CLOCKS_PER_SEC, cp->CE_NAME);
     fflush(stderr);

      /* Only checking so stop as soon as we determine we will make
       * something */
      if( Check ) {
	 rval = -1;
	 goto stop_making_it;
      }

      if( Verbose & V_MAKE )




      if( Trace ) {
	 tcp->ce_flag |= F_STAT;		/* pretend we stated ok */
      }

      if( Verbose & V_MAKE )
	 printf( "%s:  <<<< Set [%s] time stamp to %lu\n",
		 Pname, tcp->CE_NAME, tcp->ce_time );

      if(strcmp("Shell escape", tcp->CE_NAME) != 0) {
        fprintf(stderr, "e target %lu %s\n", clock() * 1000 / CLOCKS_PER_SEC, tcp->CE_NAME);
        fflush(stderr);
      }      

      Unlink_temp_files( tcp );
      tcp->ce_flag |= F_MADE;
      tcp->ce_attr |= A_UPDATED;
   }

   /* Scan the list of prerequisites and if we find one that is
    * marked as being removable, (ie. an inferred intermediate node
    * then remove it.  We remove a prerequisite by running the recipe

Return to issue 60948

Lines 33-48 Link Here

(-)solenv/bin/build.pl (+5 lines)
33	# License along with this library; if not, write to the Free Software	33	# License along with this library; if not, write to the Free Software
34	# Foundation, Inc., 59 Temple Place, Suite 330, Boston,	34	# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
35	# MA 02111-1307 USA	35	# MA 02111-1307 USA
36	#	36	#
37	#*************************************************************************	37	#*************************************************************************
38	#	38	#
39	# build - build entire project	39	# build - build entire project
40	#	40	#
		41
		42	# Force build timestamp printing at the immediate start of the program
		43	print "s build " . time() . "\n";
		44
41	use Config;	45	use Config;
42	use POSIX;	46	use POSIX;
43	use Cwd qw (cwd);	47	use Cwd qw (cwd);
44	use File::Path;	48	use File::Path;
45		49
46	use lib ("$ENV{SOLARENV}/bin/modules");	50	use lib ("$ENV{SOLARENV}/bin/modules");
47		51
48	if (defined $ENV{COMMON_ENV_TOOLS}) {	52	if (defined $ENV{COMMON_ENV_TOOLS}) {
Lines 2243-2258 Link Here
2243	$build_finished++;	2247	$build_finished++;
2244	generate_html_file(1);	2248	generate_html_file(1);
2245	rmtree(CorrectPath($tmp_dir), 0, 1) if ($tmp_dir);	2249	rmtree(CorrectPath($tmp_dir), 0, 1) if ($tmp_dir);
2246	# if ($exit_code) {	2250	# if ($exit_code) {
2247	# finish_logging("error occured");	2251	# finish_logging("error occured");
2248	# } else {	2252	# } else {
2249	# finish_logging;	2253	# finish_logging;
2250	# };	2254	# };
		2255	print "e build " . time() . "\n";
2251	exit($exit_code);	2256	exit($exit_code);
2252	};	2257	};
2253		2258
2254	sub deliver_module {	2259	sub deliver_module {
2255	return if ($show);	2260	return if ($show);
2256	my $module = shift;	2261	my $module = shift;
2257	delete $build_in_progress{$module};	2262	delete $build_in_progress{$module};
2258	$module_path = CorrectPath($StandDir.$module);	2263	$module_path = CorrectPath($StandDir.$module);

Lines 576-591 Link Here

(-)dmake/make.c (+3 lines)
576	* 2. It is a target and Force is set	576	* 2. It is a target and Force is set
577	* 3. It's set of recipe lines has changed.	577	* 3. It's set of recipe lines has changed.
578	*/	578	*/
579	if( Check_state(cp, _recipes, NUM_RECIPES )	579	if( Check_state(cp, _recipes, NUM_RECIPES )
580	\|\| (cp->ce_time < otime)	580	\|\| (cp->ce_time < otime)
581	\|\| ((cp->ce_flag & F_TARGET) && Force)	581	\|\| ((cp->ce_flag & F_TARGET) && Force)
582	) {	582	) {
583		583
		584	fprintf(stderr, "s target %lu %s\n", clock() * 1000 / CLOCKS_PER_SEC, cp->CE_NAME);
		585	fflush(stderr);
		586
584	/* Only checking so stop as soon as we determine we will make	587	/* Only checking so stop as soon as we determine we will make
585	* something */	588	* something */
586	if( Check ) {	589	if( Check ) {
587	rval = -1;	590	rval = -1;
588	goto stop_making_it;	591	goto stop_making_it;
589	}	592	}
590		593
591	if( Verbose & V_MAKE )	594	if( Verbose & V_MAKE )

Lines 736-751 Link Here

(-)dmake/sysintf.c (+5 lines)
736	if( Trace ) {	736	if( Trace ) {
737	tcp->ce_flag \|= F_STAT; /* pretend we stated ok */	737	tcp->ce_flag \|= F_STAT; /* pretend we stated ok */
738	}	738	}
739		739
740	if( Verbose & V_MAKE )	740	if( Verbose & V_MAKE )
741	printf( "%s: <<<< Set [%s] time stamp to %lu\n",	741	printf( "%s: <<<< Set [%s] time stamp to %lu\n",
742	Pname, tcp->CE_NAME, tcp->ce_time );	742	Pname, tcp->CE_NAME, tcp->ce_time );
743		743
		744	if(strcmp("Shell escape", tcp->CE_NAME) != 0) {
		745	fprintf(stderr, "e target %lu %s\n", clock() * 1000 / CLOCKS_PER_SEC, tcp->CE_NAME);
		746	fflush(stderr);
		747	}
		748
744	Unlink_temp_files( tcp );	749	Unlink_temp_files( tcp );
745	tcp->ce_flag \|= F_MADE;	750	tcp->ce_flag \|= F_MADE;
746	tcp->ce_attr \|= A_UPDATED;	751	tcp->ce_attr \|= A_UPDATED;
747	}	752	}
748		753
749	/* Scan the list of prerequisites and if we find one that is	754	/* Scan the list of prerequisites and if we find one that is
750	* marked as being removable, (ie. an inferred intermediate node	755	* marked as being removable, (ie. an inferred intermediate node
751	* then remove it. We remove a prerequisite by running the recipe	756	* then remove it. We remove a prerequisite by running the recipe