WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/LIB/MakeEntry.pm



#                       Allow files with a $ in the name
#                       Allow files with a space in the name
#                       Allow files with a comma in the name
#                       Allow files with a colon in the name
#                       Allow for paths that have make-varible prefixes
#                           $(GBE_...) or ${GBE_...} or $(OBJDIR)
#                           as these may be generated internally
#
#                       Must also allow $(GBE_TYPE) in the remainder
#
# Inputs          : uarg                - Arg to quote

    #
    $uarg =~ m~^((\$\(.*?\)/)*)(.*)~;
    my $prefix = defined $1 ? $1 : '';
    my $arg    = defined $3 ? $3 : '';
 
    $arg =~ s~\$(?!\(GBE_[A-Z]+\)|{GBE_[A-Z]+}|\(OBJDIR\))~\$\$~g;       # $, not followed by (GBE_ or ${GBE_ or (OBJDIR)- is not $(GBE_ AND not $(OBJDIR)
    $arg =~ s~ ~\\ ~g;
    $arg =~ s~,~\$(comma)~g;
    $arg =~ s~%~\\%~g;
    $arg =~ s~:~\\:~g if ($::ScmHost eq 'Unix');
    return $prefix . $arg;

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LIB/MakeEntry.pm – Rev 5999 → 6073

Rev 5999		Rev 6073
Line 251...		Line 251...
251	`# Allow files with a $ in the name`	251	`# Allow files with a $ in the name`
252	`# Allow files with a space in the name`	252	`# Allow files with a space in the name`
253	`# Allow files with a comma in the name`	253	`# Allow files with a comma in the name`
254	`# Allow files with a colon in the name`	254	`# Allow files with a colon in the name`
255	`# Allow for paths that have make-varible prefixes`	255	`# Allow for paths that have make-varible prefixes`
256	`# $(GBE_...)/`	256	`# $(GBE_...) or ${GBE_...} or $(OBJDIR)`
257	`# as these may be generated internally`	257	`# as these may be generated internally`
258	`#`	258	`#`
259	`# Must also allow $(GBE_TYPE) in the remainder`	259	`# Must also allow $(GBE_TYPE) in the remainder`
260	`#`	260	`#`
261	`# Inputs : uarg - Arg to quote`	261	`# Inputs : uarg - Arg to quote`
Line 274...		Line 274...
274	`#`	274	`#`
275	`$uarg =~ m~^((\$\(.?\)/))(.*)~;`	275	`$uarg =~ m~^((\$\(.?\)/))(.*)~;`
276	`my $prefix = defined $1 ? $1 : '';`	276	`my $prefix = defined $1 ? $1 : '';`
277	`my $arg = defined $3 ? $3 : '';`	277	`my $arg = defined $3 ? $3 : '';`
278		278
279	`$arg =~ s~\$(?!\(GBE_)~\$\$~g; # $, not followed by (GBE_ - id not $(GBE_`	279	`$arg =~ s~\$(?!\(GBE_[A-Z]+\)\|{GBE_[A-Z]+}\|\(OBJDIR\))~\$\$~g; # $, not followed by (GBE_ or ${GBE_ or (OBJDIR)- is not $(GBE_ AND not $(OBJDIR)`
280	`$arg =~ s~ ~\\ ~g;`	280	`$arg =~ s~ ~\\ ~g;`
281	`$arg =~ s~,~\$(comma)~g;`	281	`$arg =~ s~,~\$(comma)~g;`
282	`$arg =~ s~%~\\%~g;`	282	`$arg =~ s~%~\\%~g;`
283	`$arg =~ s~:~\\:~g if ($::ScmHost eq 'Unix');`	283	`$arg =~ s~:~\\:~g if ($::ScmHost eq 'Unix');`
284	`return $prefix . $arg;`	284	`return $prefix . $arg;`