Subversion Repositories DevTools

Rev

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

Rev 4666 Rev 4672
Line 2159... Line 2159...
2159 
#                       Our Package directory
 2159 
#                       Our Package directory
2160 
#                       Interface directory (BuildPkgArchives)
 2160 
#                       Interface directory (BuildPkgArchives)
2161 
#                       Packages (LinkPkgArchive)
 2161 
#                       Packages (LinkPkgArchive)
2162 
#                   Will scan 'parts' subdirs
 2162 
#                   Will scan 'parts' subdirs
2163 
#
 2163 
#
2164 
# Inputs          : $from_package       - 0 - Local File
 2164 
# Inputs          : $from_package   - 0:Local File
2165 
#                   $file       - Basename for a 'realname'
 2165 
#                   $file           - Basename for a 'realname'
2166 
#                                 Do not provide 'lib' or '.so' or version info
 2166 
#                                     Do not provide 'lib' or '.so' or version info
2167 
#                                 May contain embedded options
 2167 
#                                     May contain embedded options
2168 
#                                   --Dll - use Windows style versioned DLL
 2168 
#                                       --Dll           - Use Windows style versioned DLL
2169 
#                                   --VersionDll - USe the versioned DLL
 2169 
#                                       --VersionDll    - Use the versioned DLL
- 
 
 2170 
#                                       --3rdParty      - Use exact name provided
2170 
#
 2171 
#
2171 
# Returns         : Path
 2172 
# Returns         : Path
2172 
#
 2173 
#
2173 
sub ResolveLibFile
 2174 
sub ResolveLibFile
2174 
{
 2175 
{
Line 2186... Line 2187...
2186 
    {
 2187 
    {
2187 
        if ( m/^--Dll/ ) {
 2188 
        if ( m/^--Dll/ ) {
2188 
            $num_dll = 1;
 2189 
            $num_dll = 1;
2189 
        } elsif ( m/^--VersionDll/ ) {
 2190 
        } elsif ( m/^--VersionDll/ ) {
2190 
            $num_dll = 2;
 2191 
            $num_dll = 2;
- 
 
 2192 
        } elsif ( m/^--3rdParty/ ) {
- 
 
 2193 
            $num_dll = 3;
2191 
        } else {
 2194 
        } else {
2192 
            Error ("Unknown suboption to ResolveLibFile: $_" );
 2195 
            Error ("Unknown suboption to ResolveLibFile: $_" );
2193 
        }
 2196 
        }
2194 
    }
 2197 
    }
2195 
 
 2198 
 
Line 2232... Line 2235...
2232 
                if ( $num_dll == 2 ) {
 2235 
                if ( $num_dll == 2 ) {
2233 
                    $sfile = $file . $type . '.*.dll' ;
 2236 
                    $sfile = $file . $type . '.*.dll' ;
2234 
                } elsif ( $num_dll == 1 ) {
 2237 
                } elsif ( $num_dll == 1 ) {
2235 
                    $sfile = $file . $type . '.dll' ;
 2238 
                    $sfile = $file . $type . '.dll' ;
2236 
                    $exact = 1;
 2239 
                    $exact = 1;
- 
 
 2240 
                } elsif ( $num_dll == 3 ) {
- 
 
 2241 
                    $sfile = $file;
- 
 
 2242 
                    $exact = 1;
2237 
                } else {
 2243 
                } else {
2238 
                    $sfile = "lib" . $file . $type . '.so.*';
 2244 
                    $sfile = "lib" . $file . $type . '.so.*';
2239 
                }
 2245 
                }
2240 
 
 2246 
 
2241 
                $sfile = "$root/$subdir/$sfile";
 2247 
                $sfile = "$root/$subdir/$sfile";