Subversion Repositories DevTools

Rev

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

Rev 4143 Rev 4147
Line 748... Line 748...
748 
#                                 Symbolic Name
 748 
#                                 Symbolic Name
749 
#                   $dst_dir    - Within the output workspace
 749 
#                   $dst_dir    - Within the output workspace
750 
#                   Options
 750 
#                   Options
751 
#                       --Merge             - Don't delete first
 751 
#                       --Merge             - Don't delete first
752 
#                       --Source=Name       - Source via Symbolic Name
 752 
#                       --Source=Name       - Source via Symbolic Name
753 
#                       --FromPackage       - Souve via package roots
 753 
#                       --FromPackage       - Source via package roots
- 
 
 754 
#                       --IgnoreDbgFiles    - Ignore .dbg and .debug files in dir copy
754 
#
 755 
#
755 
# Returns         :
 756 
# Returns         :
756 
#
 757 
#
757 
sub CopyDir
 758 
sub CopyDir
758 
{
 759 
{
759 
    my ($src_dir, $dst_dir, @opts) = @_;
 760 
    my ($src_dir, $dst_dir, @opts) = @_;
760 
    my $opt_merge;
 761 
    my $opt_merge;
761 
    my $opt_base;
 762 
    my $opt_base;
762 
    my $from_interface = 0;
 763 
    my $from_interface = 0;
- 
 
 764 
    my $ignoreDbg;
763 
 
 765 
 
764 
    $dst_dir = $DebianWorkDir . '/' . $dst_dir;
 766 
    $dst_dir = $DebianWorkDir . '/' . $dst_dir;
765 
    $dst_dir =~ s~//~/~;
 767 
    $dst_dir =~ s~//~/~;
766 
 
 768 
 
767 
    #
 769 
    #
Line 841... Line 843...
841 
            #   This is a very ugly test for 'interface'
 843 
            #   This is a very ugly test for 'interface'
842 
            #
 844 
            #
843 
            $from_interface = 1
 845 
            $from_interface = 1
844 
                if ( $opt_base =~ m~/interface/~ );
 846 
                if ( $opt_base =~ m~/interface/~ );
845 
 
 847 
 
- 
 
 848 
        } elsif ( m/^--IgnoreDbgFiles/ ) {
- 
 
 849 
            Verbose2 ("CopyDir: Ignore Debug Files");
- 
 
 850 
            $ignoreDbg = 1;
- 
 
 851 
 
846 
        } else {
 852 
        } else {
847 
            Error ("CopyDir: Unknown option: $_" );
 853 
            Error ("CopyDir: Unknown option: $_" );
848 
        }
 854 
        }
849 
    }
 855 
    }
850 
 
 856 
 
Line 859... Line 865...
859 
    #   Setup the copy options
 865 
    #   Setup the copy options
860 
    #
 866 
    #
861 
    my %copyOpts;
 867 
    my %copyOpts;
862 
    $copyOpts{'IgnoreDirs'} = ['.svn', '.git', '.cvs', '.hg'];
 868 
    $copyOpts{'IgnoreDirs'} = ['.svn', '.git', '.cvs', '.hg'];
863 
    $copyOpts{'Ignore'} = ['.gbedir', '_gbedir'];
 869 
    $copyOpts{'Ignore'} = ['.gbedir', '_gbedir'];
- 
 
 870 
    push (@{$copyOpts{'Ignore'}}, '*.debug', '*.dbg') if $ignoreDbg;
864 
    $copyOpts{'EmptyDirs'} = 1;
 871 
    $copyOpts{'EmptyDirs'} = 1;
865 
    $copyOpts{'DeleteFirst'} = 1 unless $opt_merge;
 872 
    $copyOpts{'DeleteFirst'} = 1 unless $opt_merge;
866 
    $copyOpts{'Log'} = 1 if ( $opt_verbose > 1 );
 873 
    $copyOpts{'Log'} = 1 if ( $opt_verbose > 1 );
867 
    $copyOpts{'DuplicateLinks'} = 1 unless ( $from_interface );
 874 
    $copyOpts{'DuplicateLinks'} = 1 unless ( $from_interface );
868 
 
 875