Subversion Repositories DevTools

Rev

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

Rev 5744 Rev 5819
Line 1807... Line 1807...
1807 
        #   This is an old mechanism whose use should not be encouraged
 1807 
        #   This is an old mechanism whose use should not be encouraged
1808 
        #
 1808 
        #
1809 
        #..
 1809 
        #..
1810 
        if ( $version eq "!current" )
 1810 
        if ( $version eq "!current" )
1811 
        {
 1811 
        {
1812 
            Error ("Use of !version is not allowed in ABT build")
 1812 
            Error ("Use of !current is not allowed in ABT build")
1813 
                if ( $::GBE_ABT );
 1813 
                if ( $::GBE_ABT );
1814 
 
 1814 
 
1815 
            $pkg = "$dpkg/$name/current";       # current
 1815 
            $pkg = "$dpkg/$name/current";       # current
1816 
            $pkg = "$dpkg/$name/current.lnk"
 1816 
            $pkg = "$dpkg/$name/current.lnk"
1817 
                if ( -e "$dpkg/$name/current.lnk" );
 1817 
                if ( -e "$dpkg/$name/current.lnk" );
Line 1851... Line 1851...
1851 
            my $link_src = $pkg;
 1851 
            my $link_src = $pkg;
1852 
            open( LNKFILE, '<', "$pkg" ) || Error( "cannot open '$pkg'" );
 1852 
            open( LNKFILE, '<', "$pkg" ) || Error( "cannot open '$pkg'" );
1853 
            $pkg = <LNKFILE>;                   # real path
 1853 
            $pkg = <LNKFILE>;                   # real path
1854 
            close( LNKFILE );
 1854 
            close( LNKFILE );
1855 
            $pkg = '' unless ( $pkg );
 1855 
            $pkg = '' unless ( $pkg );
1856 
            $pkg =~ s~\s+$~~;;
 1856 
            $pkg =~ s~\s+$~~;
1857 
            $pkg =~ s~^GBE_SANDBOX/~$::GBE_SANDBOX/~;
 1857 
            if ($pkg =~ s~^GBE_SANDBOX/~$::GBE_SANDBOX/~)
- 
 
 1858 
            {
- 
 
 1859 
                    # If the target sandbox is in the 'deploymode' then the package
- 
 
 1860 
                    # will not be in the expected location. It will be in a 'build/deploy'
- 
 
 1861 
                    # subdir. Remove the pkg/name dir to get to the root of the package
- 
 
 1862 
                    my @dirs = File::Spec->splitdir( $pkg );
- 
 
 1863 
                    splice(@dirs, -2);
- 
 
 1864 
                    my $deployBox = catdir(@dirs, 'build', 'deploy');
- 
 
 1865 
                    $pkg = $deployBox if ( -d $deployBox);
- 
 
 1866 
            }
1858 
 
 1867 
 
1859 
            unless ( -d $pkg )
 1868 
            unless ( -d $pkg )
1860 
            {
 1869 
            {
1861 
                Error ("Broken link: $pkg",
 1870 
                Error ("Broken link: $pkg",
1862 
                       "Source link: $link_src",
 1871 
                       "Source link: $link_src",