Subversion Repositories DevTools

Rev

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

Rev 361 Rev 363
Line 122... Line 122...
122 
our $ScmToolsetProgDependancies = 1;            # 1: Write program dependancies
 122 
our $ScmToolsetProgDependancies = 1;            # 1: Write program dependancies
123 
                                                # 0: Don't write progdeps. Prog is Phony
 123 
                                                # 0: Don't write progdeps. Prog is Phony
124 
our $ScmToolsetSingleType   = 0;                # Toolset does not support Debug and Production
 124 
our $ScmToolsetSingleType   = 0;                # Toolset does not support Debug and Production
125 
our $ScmToolsetProgSource   = ();               # Toolset Program Source
 125 
our $ScmToolsetProgSource   = ();               # Toolset Program Source
126 
our $ScmToolsetSoName       = 0;                # 1: Shared library supports SoName
 126 
our $ScmToolsetSoName       = 0;                # 1: Shared library supports SoName
- 
 
 127 
our $ScmToolsetNillLibSrc   = 0;                # 1: Librarys created without source specified
- 
 
 128 
 
127 
our $ScmRoot                = "";
 129 
our $ScmRoot                = "";
128 
our $ScmMakelib             = "";
 130 
our $ScmMakelib             = "";
129 
our $ScmPlatform            = "";
 131 
our $ScmPlatform            = "";
130 
our $ScmMachType            = "";
 132 
our $ScmMachType            = "";
131 
our $ScmSrcDir              = "";
 133 
our $ScmSrcDir              = "";
Line 3313... Line 3315...
3313 
    my $pkg;
 3315 
    my $pkg;
3314 
    my $name;
 3316 
    my $name;
3315 
    my $ext;
 3317 
    my $ext;
3316 
    my $info;
 3318 
    my $info;
3317 
 
 3319 
 
- 
 
 3320 
    #
- 
 
 3321 
    #   Split up the arguments
- 
 
 3322 
    #       Options start with '--'
- 
 
 3323 
    #   First non-option is the package name
- 
 
 3324 
    #   2nd non-option is the packag extension
- 
 
 3325 
    #
- 
 
 3326 
    #   Only one option allowed
- 
 
 3327 
    #       Convert it into a known package info item
- 
 
 3328 
    #
- 
 
 3329 
    #
3318 
    foreach ( split(',', $args) )
 3330 
    foreach ( split(',', $args) )
3319 
    {
 3331 
    {
3320 
        if ( m/^--(.*)/ ) {
 3332 
        if ( m/^--(.*)/ ) {
3321 
            Error( "$dname: Too many info requests: $args") if ( $info );
 3333 
            Error( "$dname: Too many info requests: $args") if ( $info );
3322 
            $info = $GetPackageInfo{$1};
 3334 
            $info = $GetPackageInfo{$1};
3323 
            Error( "$dname: Unknown info type: $_") unless ($info);
 3335 
            Error( "$dname: Unknown info type: $_") unless ($info);
- 
 
 3336 
 
3324 
        } elsif ( $ext ) {
 3337 
        } elsif ( $ext ) {
3325 
            Error("$dname: Too many names: $args");
 3338 
            Error("$dname: Too many names: $args");
- 
 
 3339 
 
3326 
        } elsif ( $name ) {
 3340 
        } elsif ( $name ) {
3327 
            $ext = $_;
 3341 
            $ext = $_;
- 
 
 3342 
 
3328 
        } else {
 3343 
        } else {
3329 
            $name = $_;
 3344 
            $name = $_;
3330 
        }
 3345 
        }
3331 
    }
 3346 
    }
3332 
 
 3347 
 
3333 
    $pkg = GetPackageEntry( $name, $ext );
 3348 
    $pkg = GetPackageEntry( $name, $ext );
3334 
    Error ("$dname: Package not found: $args") unless ( $pkg );
 3349 
    Error ("$dname: Package not found: $args") unless ( $pkg );
3335 
 
 3350 
 
3336 
    #
 3351 
    #
3337 
    #   If a BuildPkgArchive then use the interface directory
 3352 
    #   If a BuildPkgArchive then use the interface directory
- 
 
 3353 
    #   Default data item - path to the package
3338 
    #
 3354 
    #
- 
 
 3355 
    $info = 'ROOT' unless ( $info );
3339 
    if ( $info eq 'ROOT' &&  $pkg->{'TYPE'} eq 'link' )
 3356 
    if ( $info eq 'ROOT' &&  $pkg->{'TYPE'} ne 'link' )
3340 
    {
 3357 
    {
3341 
        return ( '$(INTERFACEDIR)');
 3358 
        return ( '$(INTERFACEDIR)');
3342 
    }
 3359 
    }
- 
 
 3360 
 
3343 
    return ( $pkg->{$info} );
 3361 
    return ( $pkg->{$info} );
3344 
}
 3362 
}
3345 
 
 3363 
 
3346 
#-------------------------------------------------------------------------------
 3364 
#-------------------------------------------------------------------------------
3347 
# Function        : GetPackageEntry
 3365 
# Function        : GetPackageEntry
Line 8754... Line 8772...
8754 
    {
 8772 
    {
8755 
        my $pLib  = $LIBS->Get($i);
 8773 
        my $pLib  = $LIBS->Get($i);
8756 
        my $pArgs = $pLib->getItems('ARGS');
 8774 
        my $pArgs = $pLib->getItems('ARGS');
8757 
        my $pObjs = $pLib->getItems('OBJS');
 8775 
        my $pObjs = $pLib->getItems('OBJS');
8758 
 
 8776 
 
- 
 
 8777 
        unless ( $ScmToolsetNillLibSrc )
- 
 
 8778 
        {
8759 
        Error ("Library has no component objects: $i")
 8779 
            Error ("Library has no component objects: $i")
8760 
            if ( scalar @$pObjs <= 0 );
 8780 
                if ( scalar @$pObjs <= 0 );
- 
 
 8781 
        }
8761 
 
 8782 
 
8762 
        MakePrint "#---- (${i})\n\n";
 8783 
        MakePrint "#---- (${i})\n\n";
8763 
        $if->AR(     $i, $pArgs, $pObjs, $pLib);
 8784 
        $if->AR(     $i, $pArgs, $pObjs, $pLib);
8764 
        $if->ARLINT( $i, $pArgs, $pObjs, $pLib );
 8785 
        $if->ARLINT( $i, $pArgs, $pObjs, $pLib );
8765 
    }
 8786 
    }