Subversion Repositories DevTools

Rev

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

Rev 7319 Rev 7320
Line 816... Line 816...
816 
unless ( $GBE_JATS_SANE )
 816 
unless ( $GBE_JATS_SANE )
817 
{
 817 
{
818 
    Error ("GBE_SANDBOX must not be set by the user") if ( $GBE_SANDBOX );
 818 
    Error ("GBE_SANDBOX must not be set by the user") if ( $GBE_SANDBOX );
819 
    Error ("GBE_DPKG_SBOX must not be set by the user") if ( $GBE_DPKG_SBOX );
 819 
    Error ("GBE_DPKG_SBOX must not be set by the user") if ( $GBE_DPKG_SBOX );
820 
 
 820 
 
821 
    #
 - 
 
822 
    #   The ABT does not use the sandbox
 - 
 
823 
    #   It will never be found and will be ignored
 821 
    ($GBE_DPKG_SBOX,$GBE_SANDBOX)  = scan_for_dir ('sandbox_dpkg_archive');
824 
    #
 - 
 
825 
    unless ( $GBE_ABT )
 822 
    if ($GBE_SANDBOX)
826 
    {
 823 
    {
- 
 
 824 
        #
- 
 
 825 
        #   Support for auto detection of Build System Sandboxes
- 
 
 826 
        #
827 
        ($GBE_DPKG_SBOX,$GBE_SANDBOX)  = scan_for_dir ('sandbox_dpkg_archive');
 827 
        my $sbAbtMarker = $GBE_DPKG_SBOX . '/abtMarker';
- 
 
 828 
        if ( -f $sbAbtMarker ) {
- 
 
 829 
            $GBE_ABT=1;
828 
    }
 830 
        }
829 
 
 831 
 
830 
    #
 832 
        #
831 
    #   Support sandbox specific buildfilter
 833 
        #   Support sandbox specific buildfilter
832 
    #   Remove comments(#) and empty lines
 834 
        #   Remove comments(#) and empty lines
833 
    #
 835 
        #
834 
    my $sbBuildFilter = $GBE_DPKG_SBOX . '/buildfilter';
 836 
        my $sbBuildFilter = $GBE_DPKG_SBOX . '/buildfilter';
835 
    if ( $GBE_SANDBOX && -f $sbBuildFilter )
 - 
 
836 
    {
 - 
 
837 
        Verbose("sbBuildFilter:$sbBuildFilter");
 - 
 
838 
        if ( open (my $BF, $sbBuildFilter ))
 837 
        if ( -f $sbBuildFilter )
839 
        {
 838 
        {
840 
            my @bf;
 - 
 
841 
            while ( <$BF> )
 - 
 
842 
            {
 - 
 
843 
                s~\s$~~;
 - 
 
844 
                s~^\s~~;
 - 
 
845 
                next unless ( $_ );
 839 
            Verbose("sbBuildFilter:$sbBuildFilter");
846 
                next if ( m~^#~ );
 840 
            if ( open (my $BF, $sbBuildFilter ))
847 
                push @bf,$_;
 - 
 
848 
            }
 - 
 
849 
            close $BF;
 - 
 
850 
            if ( @bf )
 - 
 
851 
            {
 841 
            {
- 
 
 842 
                my @bf;
- 
 
 843 
                while ( <$BF> )
- 
 
 844 
                {
- 
 
 845 
                    s~\s$~~;
- 
 
 846 
                    s~^\s~~;
- 
 
 847 
                    next unless ( $_ );
- 
 
 848 
                    next if ( m~^#~ );
- 
 
 849 
                    push @bf,$_;
- 
 
 850 
                }
- 
 
 851 
                close $BF;
- 
 
 852 
                if ( @bf )
- 
 
 853 
                {
852 
                $GBE_BUILDFILTER = join (' ', split( /[,\s]+/, join(',', @bf)));
 854 
                    $GBE_BUILDFILTER = join (' ', split( /[,\s]+/, join(',', @bf)));
853 
                Verbose ("Local BuildFilter: $GBE_BUILDFILTER");
 855 
                    Verbose ("Local BuildFilter: $GBE_BUILDFILTER");
- 
 
 856 
                }
854 
            }
 857 
            }
855 
        }
 858 
        }
856 
    }
 859 
    }
857 
 
 860 
 
858 
    #
 861 
    #