Subversion Repositories DevTools

Rev

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

Rev 369 Rev 371
Line 1466... Line 1466...
1466 
 
 1466 
 
1467 
sub LinkSandbox
 1467 
sub LinkSandbox
1468 
{
 1468 
{
1469 
    my( $name, $path, $platform ) = @_;
 1469 
    my( $name, $path, $platform ) = @_;
1470 
    return if ( $Clobber );                     # clobber mode ?
 1470 
    return if ( $Clobber );                     # clobber mode ?
- 
 
 1471 
    Warning ("LinkSandbox() This directive is being deprecated.");       #Dec-2011
1471 
 
 1472 
 
1472 
    Error ("LinkSandbox() expects three arguments:  @_")
 1473 
    Error ("LinkSandbox() expects three arguments:  @_")
1473 
        unless ( $#_ == 2 );
 1474 
        unless ( $#_ == 2 );
1474 
 
 1475 
 
1475 
    Error ("LinkSandbox not allowed in ABT build")
 1476 
    Error ("LinkSandbox not allowed in ABT build","It can only be used in a Development Environment")
1476 
        if ( $::GBE_ABT );
 1477 
        if ( $::GBE_ABT );
1477 
 
 1478 
 
1478 
    Debug( "LinkSandbox:" );
 1479 
    Debug( "LinkSandbox:" );
1479 
    Debug( "Package:   $name" );
 1480 
    Debug( "Package:   $name" );
1480 
    Debug( "Version:   $path" );
 1481 
    Debug( "Version:   $path" );
Line 1713... Line 1714...
1713 
            open( LNKFILE, '<', "$pkg" ) || Error( "cannot open '$pkg'" );
 1714 
            open( LNKFILE, '<', "$pkg" ) || Error( "cannot open '$pkg'" );
1714 
            $pkg = <LNKFILE>;                   # real path
 1715 
            $pkg = <LNKFILE>;                   # real path
1715 
            close( LNKFILE );
 1716 
            close( LNKFILE );
1716 
            $pkg = '' unless ( $pkg );
 1717 
            $pkg = '' unless ( $pkg );
1717 
            $pkg =~ s~\s+$~~;;
 1718 
            $pkg =~ s~\s+$~~;;
- 
 
 1719 
            $pkg =~ s~^GBE_SANDBOX/~$::GBE_SANDBOX/~;
1718 
 
 1720 
 
1719 
            Error ("Broken link: $pkg",
 1721 
            Error ("Broken link: $pkg",
1720 
                   "Source link: $link_src",
 1722 
                   "Source link: $link_src",
1721 
                   "Try deleting the .lnk file" ) unless ( -d $pkg );
 1723 
                   "Try deleting the .lnk file" ) unless ( -d $pkg );
1722 
        }
 1724 
        }
Line 2842... Line 2844...
2842 
{
 2844 
{
2843 
    my $target_archive;
 2845 
    my $target_archive;
2844 
    my $target_archive_name;
 2846 
    my $target_archive_name;
2845 
    my $link_file;
 2847 
    my $link_file;
2846 
    my $tag;
 2848 
    my $tag;
- 
 
 2849 
    my $root_path;
2847 
 
 2850 
 
2848 
    #
 2851 
    #
2849 
    #   Determine the path (and name) of the target archive
 2852 
    #   Determine the path (and name) of the target archive
2850 
    #   Use sandbox_dpkg_archive if it exists
 2853 
    #   Use sandbox_dpkg_archive if it exists
2851 
    #   Use local_dpkg_acrhive for backward compatability (should be removed after JATS 2.64.2+)
 2854 
    #   Use local_dpkg_acrhive for backward compatability (should be removed after JATS 2.64.2+)
Line 2860... Line 2863...
2860 
        }
 2863 
        }
2861 
        else
 2864 
        else
2862 
        {
 2865 
        {
2863 
            $link_file  = 'sandbox' . ${BUILDNAME_SUFFIX} . '.lnk';
 2866 
            $link_file  = 'sandbox' . ${BUILDNAME_SUFFIX} . '.lnk';
2864 
        }
 2867 
        }
- 
 
 2868 
        $root_path = 'GBE_SANDBOX' . substr($Cwd, length($::GBE_SANDBOX));
- 
 
 2869 
        Verbose2("Root Path: $::GBE_SANDBOX, $root_path");
2865 
    }
 2870 
    }
2866 
    elsif ( $target_archive = $::GBE_DPKG_LOCAL )
 2871 
    elsif ( $target_archive = $::GBE_DPKG_LOCAL )
2867 
    {
 2872 
    {
2868 
        $target_archive_name = "local_dpkg_archive";
 2873 
        $target_archive_name = "local_dpkg_archive";
2869 
        $link_file = "$BUILDVERSION.lnk";
 2874 
        $link_file = "$BUILDVERSION.lnk";
2870 
        $tag = "Local";
 2875 
        $tag = "Local";
- 
 
 2876 
        $root_path = $Cwd;
2871 
    }
 2877 
    }
2872 
    else
 2878 
    else
2873 
    {
 2879 
    {
2874 
        Verbose("Cannot locate local or sandbox archive")
 2880 
        Verbose("Cannot locate local or sandbox archive")
2875 
            unless $Clobber;
 2881 
            unless $Clobber;
Line 2897... Line 2903...
2897 
    }
 2903 
    }
2898 
    else
 2904 
    else
2899 
    {
 2905 
    {
2900 
        Log( "Local Link . $BUILDNAME_PACKAGE/$link_file ($tag)");
 2906 
        Log( "Local Link . $BUILDNAME_PACKAGE/$link_file ($tag)");
2901 
        mkdir $link_dir unless -d $link_dir;
 2907 
        mkdir $link_dir unless -d $link_dir;
2902 
        FileCreate ( $link_path, "$Cwd/pkg/$BUILDNAME_PACKAGE");
 2908 
        FileCreate ( $link_path, "$root_path/pkg/$BUILDNAME_PACKAGE");
2903 
    }
 2909 
    }
2904 
}
 2910 
}
2905 
 
 2911 
 
2906 
#-------------------------------------------------------------------------------
 2912 
#-------------------------------------------------------------------------------
2907 
# Function        : BuildSandboxData
 2913 
# Function        : BuildSandboxData