Subversion Repositories DevTools

Rev

Rev 6415 | Rev 6469 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6415 Rev 6423
Line 3301... Line 3301...
3301
    Warning( "GenerateFiles. --AutoGenerate option has no effect",
3301
    Warning( "GenerateFiles. --AutoGenerate option has no effect",
3302
             "The following files are 'source' files",  @has_source ) if ( @has_source );
3302
             "The following files are 'source' files",  @has_source ) if ( @has_source );
3303
    Warning( "No Prerequisite files found in $tool",@tool_args) unless ( $no_warn || $#preq_files >= 0 );
3303
    Warning( "No Prerequisite files found in $tool",@tool_args) unless ( $no_warn || $#preq_files >= 0 );
3304
    Error  ( "No generated files found in $tool",@tool_args) unless ($#gen_files >= 0);
3304
    Error  ( "No generated files found in $tool",@tool_args) unless ($#gen_files >= 0);
3305
 
3305
 
-
 
3306
    #
-
 
3307
    #   Determine the text to display while generating files
-
 
3308
    #   Will be either user-text or the first target file (default)
-
 
3309
    #   Suffix with RecipeTag, if provided
-
 
3310
    #   
-
 
3311
    my $txtSuffix = '';
-
 
3312
    $txtSuffix = "($recipeTag)" if defined $recipeTag;
-
 
3313
    $text = $gen_files[0] unless defined $text;
-
 
3314
    $text .= $txtSuffix;
3306
 
3315
 
3307
    #
3316
    #
3308
    #   Save information
3317
    #   Save information
3309
    #   Will be used to create makefile statements later
3318
    #   Will be used to create makefile statements later
3310
    #
3319
    #
Line 3316... Line 3325...
3316
    $gen_data{'gen'}        = \@gen_files;
3325
    $gen_data{'gen'}        = \@gen_files;
3317
    $gen_data{'preq'}       = \@preq_files;
3326
    $gen_data{'preq'}       = \@preq_files;
3318
    $gen_data{'tool'}       = $tool;
3327
    $gen_data{'tool'}       = $tool;
3319
    $gen_data{'toolargs'}   = \@tool_args;
3328
    $gen_data{'toolargs'}   = \@tool_args;
3320
    $gen_data{'clean'}      = $clean_tag;
3329
    $gen_data{'clean'}      = $clean_tag;
3321
    $gen_data{'text'}       = $text || $gen_files[0];
3330
    $gen_data{'text'}       = $text;
3322
    $gen_data{'preq_sus'}   = 1 if ( $preq_unknown );
3331
    $gen_data{'preq_sus'}   = 1 if ( $preq_unknown );
3323
    $gen_data{'predelete'}  = 1 if ( $predelete );
3332
    $gen_data{'predelete'}  = 1 if ( $predelete );
3324
 
3333
 
3325
    push(@GENERATE_FILES, \%gen_data);
3334
    push(@GENERATE_FILES, \%gen_data);
3326
#DebugDumpData("GenerateFiles", \%gen_data);
3335
#DebugDumpData("GenerateFiles", \%gen_data);
Line 10628... Line 10637...
10628
# Description     : Escape/Quote a pathname for make
10637
# Description     : Escape/Quote a pathname for make
10629
#                       Allow files with a $ in the name
10638
#                       Allow files with a $ in the name
10630
#                       Allow files with a space in the name
10639
#                       Allow files with a space in the name
10631
#                       Allow files with a comma in the name
10640
#                       Allow files with a comma in the name
10632
#                       Allow for paths that have make-varible prefixes
10641
#                       Allow for paths that have make-varible prefixes
10633
#                           $(GBE_...) or ${GBE_...} or $(OBJDIR)
10642
#                           $(GBE_...) or ${GBE_...} or $(OBJDIR) or $(BUILDVERNUM)
10634
#                           as these may be generated internally
10643
#                           as these may be generated internally
10635
#                       Allow for files with a colon in the name
10644
#                       Allow for files with a colon in the name
10636
#                           Mode dependent
10645
#                           Mode dependent
10637
#                               0 - No effect
10646
#                               0 - No effect
10638
#                               T - \\\:
10647
#                               T - \\\:
Line 10661... Line 10670...
10661
    #
10670
    #
10662
    $uarg =~ m~^((\$\(.*?\)/)*)(.*)~;
10671
    $uarg =~ m~^((\$\(.*?\)/)*)(.*)~;
10663
    my $prefix = defined $1 ? $1 : '';
10672
    my $prefix = defined $1 ? $1 : '';
10664
    my $arg    = defined $3 ? $3 : '';
10673
    my $arg    = defined $3 ? $3 : '';
10665
 
10674
 
10666
    $arg =~ s~\$(?!\(GBE_[A-Z]+\)|{GBE_[A-Z]+}|\(OBJDIR\))~\$\$~g;       # $, not followed by (GBE_ or ${GBE_ or (OBJDIR)- is not $(GBE_ AND not $(OBJDIR)
10675
    $arg =~ s~\$(?!\(GBE_[A-Z]+\)|{GBE_[A-Z]+}|\(OBJDIR\)|\(BUILDVERNUM\))~\$\$~g;       # $, not followed by (GBE_ or ${GBE_ or (OBJDIR)- is not $(GBE_ AND not $(OBJDIR)
10667
    $arg =~ s~ ~\\ ~g;
10676
    $arg =~ s~ ~\\ ~g;
10668
    $arg =~ s~,~\$(comma)~g;
10677
    $arg =~ s~,~\$(comma)~g;
10669
    $arg =~ s~%~\\%~g;
10678
    $arg =~ s~%~\\%~g;
10670
    $arg =~ s~:~\\\\\\:~g if ($mode eq 'T' &&  $::ScmHost eq "Unix");
10679
    $arg =~ s~:~\\\\\\:~g if ($mode eq 'T' &&  $::ScmHost eq "Unix");
10671
    $arg =~ s~:~\\:~g     if ($mode eq 'S' &&  $::ScmHost eq "Unix");
10680
    $arg =~ s~:~\\:~g     if ($mode eq 'S' &&  $::ScmHost eq "Unix");