Subversion Repositories DevTools

Rev

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

Rev 4937 Rev 4990
Line 463... Line 463...
463
    my @apathlist;              # List of AARs from named directories
463
    my @apathlist;              # List of AARs from named directories
464
    my @libListProd;            # List of production libraries
464
    my @libListProd;            # List of production libraries
465
    my @libListDebug;           # List of debug libraries
465
    my @libListDebug;           # List of debug libraries
466
    my @platformParts;          # Platforms Parts
466
    my @platformParts;          # Platforms Parts
467
 
467
 
-
 
468
    my @jarSearch;              # Search paths - diagnostic display
-
 
469
    my @aarSearch;
-
 
470
    my @libSearch;
-
 
471
 
468
 
472
 
469
    #
473
    #
470
    #   Only if we need to do something
474
    #   Only if we need to do something
471
    #
475
    #
472
    return unless (@opt_jars || @opt_aars || @opt_elibs || @opt_jlibs);
476
    return unless (@opt_jars || @opt_aars || @opt_elibs || @opt_jlibs);
Line 532... Line 536...
532
        #
536
        #
533
        #   Copy in all JAR files found in dependent packages
537
        #   Copy in all JAR files found in dependent packages
534
        #   Need to allow for Jars that have a P/D suffix as well as those that don't
538
        #   Need to allow for Jars that have a P/D suffix as well as those that don't
535
        #
539
        #
536
        my $jarDir = catdir($pkg,'jar');
540
        my $jarDir = catdir($pkg,'jar');
-
 
541
        push @jarSearch, $jarDir;
537
        if (-d $jarDir && @jlist)
542
        if (-d $jarDir && @jlist)
538
        {
543
        {
539
            Verbose("Jar Dir Found found", $jarDir);
544
            Verbose("Jar Dir Found found", $jarDir);
540
            Message ("Copy in: $jarDir");
545
            Message ("Copy in: $jarDir");
541
 
546
 
Line 571... Line 576...
571
        foreach my $file (@jpathlistBase) 
576
        foreach my $file (@jpathlistBase) 
572
        {
577
        {
573
            foreach my $suffix ( '', 'P' ,'D')
578
            foreach my $suffix ( '', 'P' ,'D')
574
            {
579
            {
575
                my $jarFile = catdir($pkg, $file . $suffix . '.jar');
580
                my $jarFile = catdir($pkg, $file . $suffix . '.jar');
-
 
581
                push @jarSearch, $jarFile;
576
                if (-f $jarFile)
582
                if (-f $jarFile)
577
                {
583
                {
578
                    Verbose("Jar File Found found", $jarDir);
584
                    Verbose("Jar File Found found", $jarDir);
579
                    Message ("Copy in: $jarFile");
585
                    Message ("Copy in: $jarFile");
580
                    CopyFile ( $jarFile, $androidJars,
586
                    CopyFile ( $jarFile, $androidJars,
Line 592... Line 598...
592
        #   as well as those without
598
        #   as well as those without
593
        #
599
        #
594
        foreach my $part (@platformParts)
600
        foreach my $part (@platformParts)
595
        {
601
        {
596
            my $aarDir = catdir($pkg,'lib/' . $part);
602
            my $aarDir = catdir($pkg,'lib/' . $part);
-
 
603
            push @aarSearch, $aarDir;
597
            if (-d $aarDir && @alist)
604
            if (-d $aarDir && @alist)
598
            {
605
            {
599
                Verbose("Library Dir Found found", $aarDir);
606
                Verbose("Library Dir Found found", $aarDir);
600
                Message ("Copy in: $aarDir");
607
                Message ("Copy in: $aarDir");
601
 
608
 
Line 636... Line 643...
636
        foreach my $file (@apathlistBase) 
643
        foreach my $file (@apathlistBase) 
637
        {
644
        {
638
            foreach my $suffix ( '', '-release', '-debug')
645
            foreach my $suffix ( '', '-release', '-debug')
639
            {
646
            {
640
                my $aarFile = catdir($pkg, $file . $suffix . '.aar');
647
                my $aarFile = catdir($pkg, $file . $suffix . '.aar');
-
 
648
                push @aarSearch, $aarFile;
641
                if (-f $aarFile)
649
                if (-f $aarFile)
642
                {
650
                {
643
                    Verbose("Aar File Found found", $aarFile);
651
                    Verbose("Aar File Found found", $aarFile);
644
                    Message ("Copy in: $aarFile");
652
                    Message ("Copy in: $aarFile");
645
                    CopyFile ( $aarFile, $androidJars,
653
                    CopyFile ( $aarFile, $androidJars,
Line 656... Line 664...
656
        #   Note: Only support current JATS format
664
        #   Note: Only support current JATS format
657
        #   Copy in .so files and in to process massage the pathname so that
665
        #   Copy in .so files and in to process massage the pathname so that
658
        #   it confirms to that expected by the Android Project
666
        #   it confirms to that expected by the Android Project
659
        #
667
        #
660
        my $libDir = catdir($pkg, 'lib');
668
        my $libDir = catdir($pkg, 'lib');
-
 
669
        push @libSearch, $libDir;
661
        if (-d $libDir && @libListProd)
670
        if (-d $libDir && @libListProd)
662
        {
671
        {
663
            Verbose("Lib Dir Found found", $libDir);
672
            Verbose("Lib Dir Found found", $libDir);
664
            Message ("Copy in: $libDir");
673
            Message ("Copy in: $libDir");
665
            CopyDir ( $libDir, $androidJniProd,
674
            CopyDir ( $libDir, $androidJniProd,
Line 709... Line 718...
709
    }
718
    }
710
 
719
 
711
    #
720
    #
712
    #   Report files that could not be located. They were deleted from the lists
721
    #   Report files that could not be located. They were deleted from the lists
713
    #   as they were processed
722
    #   as they were processed
714
    #       These are Warnings in populate Mode
-
 
715
    #       and errors at build time
-
 
716
    #
723
    #
717
    if (@jlist || @libListProd || @libListDebug || @jpathlist || @alist || @apathlist)
724
    if (@jlist || @jpathlist || @alist || @apathlist ||  @libListProd || @libListDebug )
718
    {
725
    {
-
 
726
        ReportError("External dependencies not found:", @jlist , @jpathlist , @alist , @apathlist ,  @libListProd , @libListDebug);
-
 
727
        if (@jlist || @jpathlist)
-
 
728
        {
719
        my $fn = $opt_populate ? \&Warning : \&Error; 
729
            ReportError("Jar Search Path", @jarSearch);
-
 
730
        }
-
 
731
 
-
 
732
        if (@alist || @apathlist)
-
 
733
        {
-
 
734
            ReportError("Aar Search Path", @aarSearch);
-
 
735
        }
-
 
736
 
720
        &$fn("External dependencies not found:", @jlist, @jpathlist, @alist, @apathlist, @libListProd , @libListDebug);
737
        if ( @libListProd || @libListDebug)
-
 
738
        {
-
 
739
            ReportError("Lib Search Path", @libSearch);
-
 
740
        }
-
 
741
    ErrorDoExit();
721
    }
742
    }
722
}
743
}
723
 
744
 
724
#-------------------------------------------------------------------------------
745
#-------------------------------------------------------------------------------
725
# Function        : deleteGeneratedFiles 
746
# Function        : deleteGeneratedFiles