Subversion Repositories DevTools

Rev

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

Rev 7326 Rev 7388
Line 372... Line 372...
372
        Verbose ("Looking for descpkg: $PKG_BASE");
372
        Verbose ("Looking for descpkg: $PKG_BASE");
373
        if ( ! -f  "$PKG_BASE/descpkg" )
373
        if ( ! -f  "$PKG_BASE/descpkg" )
374
        {
374
        {
375
            $PKG_BASE = "$CWD_DIR/pkg";
375
            $PKG_BASE = "$CWD_DIR/pkg";
376
            Verbose ("Looking for descpkg: $PKG_BASE");
376
            Verbose ("Looking for descpkg: $PKG_BASE");
-
 
377
            my @descPkgs = glob ("$PKG_BASE/*/descpkg");
377
            Error("Failed to find a package to transfer. Looked in:",
378
            Error("Failed to find a package to transfer. Looked in:",
378
                  "./build/deploy",
379
                  "./build/deploy",
379
                  "./build/pkg",
380
                  "./build/pkg",
380
                  "./pkg"
381
                  "./pkg/*"
381
                  )
382
                  )
382
                unless( -d $PKG_BASE );
383
                unless( @descPkgs );
-
 
384
            Error("Multiple packages detected:", @descPkgs) if (scalar @descPkgs > 1);
383
        }
385
        }
384
    }
386
    }
385
    Verbose("Package directory: $PKG_BASE");
387
    Verbose("Package directory: $PKG_BASE");
386
 
388
 
387
    Error("Repository location not specified: $archive_tag")
389
    Error("Repository location not specified: $archive_tag")
Line 641... Line 643...
641
 
643
 
642
    #
644
    #
643
    #   Use a common routine to parse the package descriptor
645
    #   Use a common routine to parse the package descriptor
644
    #   There are several forms that may need to be processed
646
    #   There are several forms that may need to be processed
645
    #
647
    #
-
 
648
    Verbose ("GetDpkgArchiveVersion from $path");
646
    my $pkg_data = ReadDescpkg( $path );
649
    my $pkg_data = ReadDescpkg( $path );
647
    Error("Failed to open file [$path].") unless $pkg_data;
650
    Error("Failed to open file [$path].") unless $pkg_data;
648
 
651
 
649
    $DESC_NAME    = $pkg_data->{'NAME'};
652
    $DESC_NAME    = $pkg_data->{'NAME'};
650
    $DPKG_VERSION = $pkg_data->{'VERSION_FULL'};
653
    $DPKG_VERSION = $pkg_data->{'VERSION_FULL'};