Subversion Repositories DevTools

Rev

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

Rev 5882 Rev 5986
Line 3172... Line 3172...
3172 
 
 3172 
 
3173 
            #
 3173 
            #
3174 
            #   Minor kludge under windows. Ensure directores have a "\" sep
 3174 
            #   Minor kludge under windows. Ensure directores have a "\" sep
3175 
            #   Unless the user has specified a straight shell command
 3175 
            #   Unless the user has specified a straight shell command
3176 
            #
 3176 
            #
3177 
            $fn = "\$(subst /,\\,$fn)"
 3177 
            $fn = "\$(subst /,\$(dirsep),$fn)"
3178 
                if ( $is_path && $::ScmHost eq "WIN" && ! defined($shell_script) );
 3178 
                if ( $is_path && $::ScmHost eq "WIN" && ! defined($shell_script) );
3179 
 
 3179 
 
3180 
            #
 3180 
            #
3181 
            #   Prepend any $fn Prefix
 3181 
            #   Prepend any $fn Prefix
3182 
            #   This will be a tag and is not subject to path processing
 3182 
            #   This will be a tag and is not subject to path processing
Line 4997... Line 4997...
4997 
 
 4997 
 
4998 
            #
 4998 
            #
4999 
            #   Minor kludge under windows. Ensure directores have a "\" sep
 4999 
            #   Minor kludge under windows. Ensure directores have a "\" sep
5000 
            #   Unless the user has specified a straight shell command
 5000 
            #   Unless the user has specified a straight shell command
5001 
            #
 5001 
            #
5002 
            $fn = "\$(subst /,\\,$fn)"
 5002 
            $fn = "\$(subst /,\$(dirsep),$fn)"
5003 
                if ( $::ScmHost eq "WIN" && $winprog );
 5003 
                if ( $::ScmHost eq "WIN" && $winprog );
5004 
 
 5004 
 
5005 
            #
 5005 
            #
5006 
            #   Prepend any $fn Prefix
 5006 
            #   Prepend any $fn Prefix
5007 
            #   This will be a tag and is not subject to path processing
 5007 
            #   This will be a tag and is not subject to path processing
Line 9406... Line 9406...
9406 
        #
 9406 
        #
9407 
        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
 9407 
        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
9408 
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
 9408 
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
9409 
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
 9409 
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
9410 
 
 9410 
 
- 
 
 9411 
        # Workaround for dirsep under windows when being wrapped in a timeout
- 
 
 9412 
        $me->AddDefn('dirsep', '$(dirsep)$(dirsep)') if ($timeout && ($::ScmHost ne "Unix"));
- 
 
 9413 
 
9411 
        $me->AddDependancy( "\$(GBE_$tdir_alias)" );
 9414 
        $me->AddDependancy( "\$(GBE_$tdir_alias)" );
9412 
        $me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );
 9415 
        $me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );
9413 
        $me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};
 9416 
        $me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};
9414 
        $me->AddDependancy( @{ $pEntry->{'copyin' } } );
 9417 
        $me->AddDependancy( @{ $pEntry->{'copyin' } } );
9415 
        $me->AddDependancy( map { $tdir . '/' . StripDir($_) } @{ $pEntry->{'copyonce' } } );
 9418 
        $me->AddDependancy( map { $tdir . '/' . StripDir($_) } @{ $pEntry->{'copyonce' } } );