Subversion Repositories DevTools

Rev

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

Rev 6276 Rev 6294
Line 5645... Line 5645...
5645 
#                                          --UnitTest=<name>
 5645 
#                                          --UnitTest=<name>
5646 
#                                               Supports unit test
 5646 
#                                               Supports unit test
5647 
#                                               by calling build target <name>
 5647 
#                                               by calling build target <name>
5648 
#                                          --PackageBase
 5648 
#                                          --PackageBase
5649 
#                                               Provides path to base of all packages
 5649 
#                                               Provides path to base of all packages
- 
 
 5650 
#                                          --AllPackages
- 
 
 5651 
#                                               Provide paths to both LinkPkgArchive and BuildPkgArchive
5650 
#
 5652 
#
5651 
# Returns         :
 5653 
# Returns         :
5652 
#
 5654 
#
5653 
our %JAR_FILES;
 5655 
our %JAR_FILES;
5654 
sub MakeAnt
 5656 
sub MakeAnt
Line 5681... Line 5683...
5681 
    my @tool_options;
 5683 
    my @tool_options;
5682 
    my @generated;
 5684 
    my @generated;
5683 
    my $unit_tests;
 5685 
    my $unit_tests;
5684 
    my $auto_tests;
 5686 
    my $auto_tests;
5685 
    my $package_base;
 5687 
    my $package_base;
- 
 
 5688 
    my $allPackages;
5686 
 
 5689 
 
5687 
    foreach ( @elements )
 5690 
    foreach ( @elements )
5688 
    {
 5691 
    {
5689 
        if ( m/^--Debug/ ) {
 5692 
        if ( m/^--Debug/ ) {
5690 
            $PROJECTS{$proj}{'Debug'} = 1;
 5693 
            $PROJECTS{$proj}{'Debug'} = 1;
Line 5712... Line 5715...
5712 
            $auto_tests = $1
 5715 
            $auto_tests = $1
5713 
 
 5716 
 
5714 
        } elsif ( m/^--PackageBase/ ) {
 5717 
        } elsif ( m/^--PackageBase/ ) {
5715 
            $package_base = 1;
 5718 
            $package_base = 1;
5716 
 
 5719 
 
- 
 
 5720 
        } elsif ( m/^--AllPackages/i ) {
- 
 
 5721 
            $allPackages = 1;
5717
5722
5718 
        } elsif ( m/^--/ ) {
 5723 
        } elsif ( m/^--/ ) {
5719 
            Error("MakeAnt. Unknown option ignored: $_");
 5724 
            Error("MakeAnt. Unknown option ignored: $_");
5720 
 
 5725 
 
5721 
        } else {
 5726 
        } else {
Line 5725... Line 5730...
5725 
 
 5730 
 
5726 
    #
 5731 
    #
5727 
    #   Extend option arguments to include the base dir of packages
 5732 
    #   Extend option arguments to include the base dir of packages
5728 
    #   Create definitions of the form PACKAGE_<name>
 5733 
    #   Create definitions of the form PACKAGE_<name>
5729 
    #
 5734 
    #
5730 
    for my $entry (@{$::ScmBuildPkgRules{$ScmPlatform} })
 5735 
    for my $entry (getPackageList())
5731 
    {
 5736 
    {
- 
 
 5737 
        my $pkgType = $entry->getType();
- 
 
 5738 
        next if $pkgType eq 'interface'  ;
5732 
        next unless ( $entry->{'TYPE'} eq 'link' );
 5739 
        next unless ( ( $pkgType eq 'link') || $allPackages);
5733 
        my $dir = $entry->{'ROOT'};
 5740 
        my $dir = $entry->getBase(2);
5734 
        my $name = $entry->{'NAME'};
 5741 
        my $name = $entry->getName();
5735 
        unless ( $package_base )
 5742 
        unless ( $package_base )
5736 
        {
 5743 
        {
5737 
            $dir .= '/jar';
 5744 
            $dir .= '/jar';
5738 
            next unless ( -d $dir );
 5745 
            next unless ( -d $dir );
5739 
        }
 5746 
        }
5740 
        push @tool_options, "-DPACKAGE_$name=$dir";
 5747 
        push @tool_options, "-DPACKAGE_$name=\$(call myabspath,$dir)";
5741 
    }
 5748 
    }
5742 
    #
 5749 
    #
5743 
    #   Extend options to include the base dir of the created package
 5750 
    #   Extend options to include the base dir of the created package
5744 
    #   Allows careful use for direct packaging of artifacts
 5751 
    #   Allows careful use for direct packaging of artifacts
5745 
    #
 5752 
    #
5746 
    push @tool_options, '-DPACKAGEDIR=$(PWD)/$(PKGDIR)';
 5753 
    push @tool_options, '-DPACKAGEDIR=$(call myabspath,$(PKGDIR))';
5747 
 
 5754 
 
5748 
    #
 5755 
    #
5749 
    #   Save the information
 5756 
    #   Save the information
5750 
    #
 5757 
    #
5751 
    $PROJECTS{$proj}{'options'} = \@tool_options;
 5758 
    $PROJECTS{$proj}{'options'} = \@tool_options;
Line 6513... Line 6520...
6513 
            $dist = "$1";
 6520 
            $dist = "$1";
6514 
 
 6521 
 
6515 
        } elsif (/^--Strip$/) {                 # Strip path from source files
 6522 
        } elsif (/^--Strip$/) {                 # Strip path from source files
6516 
            $strip = -1;
 6523 
            $strip = -1;
6517 
 
 6524 
 
6518 
        } elsif (/^--Strip=(\d+)$/) {                 # Strip path from source files
 6525 
        } elsif (/^--Strip=(\d+)$/) {           # Strip path from source files
6519 
            $strip = $1;
 6526 
            $strip = $1;
6520 
 
 6527 
 
6521 
        } elsif (/^--Executable$/) {            # Mark the file as executable
 6528 
        } elsif (/^--Executable$/) {            # Mark the file as executable
6522 
            $exefile = "X";
 6529 
            $exefile = "X";
6523 
 
 6530