Attachment #33549 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);




   if( Verbose & V_MAKE && !(cp->ce_flag & F_MULTI) ) {
      printf( "%s:  >>>> Making ", Pname );
      if( cp->ce_count != 0 )
	 printf( "[%s::{%d}]\n", cp->CE_NAME, cp->ce_count );
      else
	 printf( "[%s]\n", cp->CE_NAME );
   }

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

   m_at = Def_macro( "@", cp->ce_fname, M_MULTI );
   m_g  = Def_macro( ">", cp->ce_lib,   M_MULTI|M_EXPANDED );
   m_q  = Def_macro( "?", outall,       M_MULTI|M_EXPANDED );
   m_b  = Def_macro( "<", inf,          M_MULTI|M_EXPANDED );
   m_l  = Def_macro( "&", all,          M_MULTI|M_EXPANDED );
   m_up = Def_macro( "^", imm,          M_MULTI|M_EXPANDED );
   m_bb = Def_macro( "*", cp->ce_per,   M_MULTI );





      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 );

      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 736-751 Link Here

(-)dmake/sysintf.c (+3 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	fprintf(stderr, "e target %lu %s\n", clock() * 1000 / CLOCKS_PER_SEC, tcp->CE_NAME);
		745	fflush(stderr);
		746
744	Unlink_temp_files( tcp );	747	Unlink_temp_files( tcp );
745	tcp->ce_flag \|= F_MADE;	748	tcp->ce_flag \|= F_MADE;
746	tcp->ce_attr \|= A_UPDATED;	749	tcp->ce_attr \|= A_UPDATED;
747	}	750	}
748		751
749	/* Scan the list of prerequisites and if we find one that is	752	/* Scan the list of prerequisites and if we find one that is
750	* marked as being removable, (ie. an inferred intermediate node	753	* marked as being removable, (ie. an inferred intermediate node
751	* then remove it. We remove a prerequisite by running the recipe	754	* then remove it. We remove a prerequisite by running the recipe

Lines 556-571 Link Here

(-)dmake/make.c (+3 lines)
556	if( Verbose & V_MAKE && !(cp->ce_flag & F_MULTI) ) {	556	if( Verbose & V_MAKE && !(cp->ce_flag & F_MULTI) ) {
557	printf( "%s: >>>> Making ", Pname );	557	printf( "%s: >>>> Making ", Pname );
558	if( cp->ce_count != 0 )	558	if( cp->ce_count != 0 )
559	printf( "[%s::{%d}]\n", cp->CE_NAME, cp->ce_count );	559	printf( "[%s::{%d}]\n", cp->CE_NAME, cp->ce_count );
560	else	560	else
561	printf( "[%s]\n", cp->CE_NAME );	561	printf( "[%s]\n", cp->CE_NAME );
562	}	562	}
563		563
		564	fprintf(stderr, "s target %lu %s\n", clock() * 1000 / CLOCKS_PER_SEC, cp->CE_NAME);
		565	fflush(stderr);
		566
564	m_at = Def_macro( "@", cp->ce_fname, M_MULTI );	567	m_at = Def_macro( "@", cp->ce_fname, M_MULTI );
565	m_g = Def_macro( ">", cp->ce_lib, M_MULTI\|M_EXPANDED );	568	m_g = Def_macro( ">", cp->ce_lib, M_MULTI\|M_EXPANDED );
566	m_q = Def_macro( "?", outall, M_MULTI\|M_EXPANDED );	569	m_q = Def_macro( "?", outall, M_MULTI\|M_EXPANDED );
567	m_b = Def_macro( "<", inf, M_MULTI\|M_EXPANDED );	570	m_b = Def_macro( "<", inf, M_MULTI\|M_EXPANDED );
568	m_l = Def_macro( "&", all, M_MULTI\|M_EXPANDED );	571	m_l = Def_macro( "&", all, M_MULTI\|M_EXPANDED );
569	m_up = Def_macro( "^", imm, M_MULTI\|M_EXPANDED );	572	m_up = Def_macro( "^", imm, M_MULTI\|M_EXPANDED );
570	m_bb = Def_macro( "*", cp->ce_per, M_MULTI );	573	m_bb = Def_macro( "*", cp->ce_per, M_MULTI );
571		574