Subversion Repositories DevTools

Rev

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

Rev 6088 Rev 6092
Line 139... Line 139...
139 
my @ResolveLibFileList;                 # Cached PackageLib File List
 139 
my @ResolveLibFileList;                 # Cached PackageLib File List
140 
my %DebianControlFiles;                 # Control Files
 140 
my %DebianControlFiles;                 # Control Files
141 
my %DebianControlFileNames;             # Control Files by name
 141 
my %DebianControlFileNames;             # Control Files by name
142 
my @DependencyList;                     # Package Dependencies
 142 
my @DependencyList;                     # Package Dependencies
143 
my @ConfigList;                         # Config Files
 143 
my @ConfigList;                         # Config Files
- 
 
 144 
my %opt_aliases;                        # Cached Alias Names
144 
 
 145 
 
145 
#-------------------------------------------------------------------------------
 146 
#-------------------------------------------------------------------------------
146 
# Function        : Main Entry point
 147 
# Function        : Main Entry point
147 
#
 148 
#
148 
# Description     : This function will be called when the package is initialised
 149 
# Description     : This function will be called when the package is initialised
Line 855... Line 856...
855 
#                       - bin/Arch[P|D]
 856 
#                       - bin/Arch[P|D]
856 
#
 857 
#
857 
#
 858 
#
858 
sub CopyDebianPackage
 859 
sub CopyDebianPackage
859 
{
 860 
{
860 
    CopyFileCommon( \&ResolveDebPackage, @_ );
 861 
    CopyFileCommon( \&ResolveDebPackage, '--FromPackage', @_ );
861 
}
 862 
}
862 
 
 863 
 
863 
#-------------------------------------------------------------------------------
 864 
#-------------------------------------------------------------------------------
864 
# Function        : CopyFileCommon
 865 
# Function        : CopyFileCommon
865 
#
 866 
#
Line 870... Line 871...
870 
#                   $dst_dir            - Target Dir
 871 
#                   $dst_dir            - Target Dir
871 
#                   $dst_name           - Target Name (optional)
 872 
#                   $dst_name           - Target Name (optional)
872 
#                   Options
 873 
#                   Options
873 
#                   Options:
 874 
#                   Options:
874 
#                       --FromPackage
 875 
#                       --FromPackage
- 
 
 876 
#                       --FromBuild
875 
#                       --SoftLink=xxxx
 877 
#                       --SoftLink=xxxx
876 
#                       --LinkFile=xxxx
 878 
#                       --LinkFile=xxxx
877 
#                       --ConfigFile
 879 
#                       --ConfigFile
878 
#
 880 
#
879 
# Returns         :
881 
# Returns         :
Line 892... Line 894...
892 
    foreach ( @_ )
 894 
    foreach ( @_ )
893 
    {
 895 
    {
894 
        if ( m/^--FromPackage/ ) {
 896 
        if ( m/^--FromPackage/ ) {
895 
            $from_package = 1;
 897 
            $from_package = 1;
896 
 
 898 
 
- 
 
 899 
        } elsif ( m/^--FromBuild/ ) {
- 
 
 900 
            $from_package = 0;
- 
 
 901 
 
897 
        } elsif ( m/^--LinkFile/ ) {
 902 
        } elsif ( m/^--LinkFile/ ) {
898 
            $isa_linkfile = 1;
 903 
            $isa_linkfile = 1;
899 
 
 904 
 
900 
        } elsif ( m/^--ConfFile/i ) {
 905 
        } elsif ( m/^--ConfFile/i ) {
901 
            $isa_configFile = 1;
 906 
            $isa_configFile = 1;
Line 2028... Line 2033...
2028 
        return 1 if ( $opt_variant eq $_ );
 2033 
        return 1 if ( $opt_variant eq $_ );
2029 
    }
 2034 
    }
2030 
    return 0;
 2035 
    return 0;
2031 
}
 2036 
}
2032 
 
 2037 
 
2033 
my %opt_aliases;
 - 
 
2034 
sub IsAlias
 2038 
sub IsAlias
2035 
{
 2039 
{
2036 
 
 2040 
 
2037 
    #
 2041 
    #
2038 
    #   Get the aliases from the build info
 2042 
    #   Get the aliases from the build info
Line 2585... Line 2589...
2585 
                    push @ResolveDebFileList, $path if ( -d $path );
 2589 
                    push @ResolveDebFileList, $path if ( -d $path );
2586 
                }
 2590 
                }
2587 
            }
 2591 
            }
2588 
        }
 2592 
        }
2589 
        @path = @ResolveDebFileList;
 2593 
        @path = @ResolveDebFileList;
2590 
        @types = ($opt_type, '');
 2594 
        @types = ($buildType, '');
2591 
    }
 2595 
    }
2592 
    else
 2596 
    else
2593 
    {
 2597 
    {
2594 
        @path = ($opt_bindir, $opt_localbindir);
 2598 
        @path = ($opt_bindir, $opt_localbindir);
2595 
        @types = ($opt_type, '');
 2599 
        @types = ($buildType, '');
2596 
    }
 2600 
    }
2597 
 
 2601 
 
2598 
    #
 2602 
    #
2599 
    #   The debian  package name is
 2603 
    #   The debian  package name is
2600 
    #   In packages BIN dir
 2604 
    #   In packages BIN dir