Subversion Repositories DevTools

Rev

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

Rev 1572 Rev 1576
Line 497... Line 497...
497
        }
497
        }
498
    }
498
    }
499
 
499
 
500
    if ($opt_v)
500
    if ($opt_v)
501
    {
501
    {
502
        if( "$opt_v" =~ m/^(\d*)\.(\d*)\.(\d*)-(\d*)\.([a-z]{2,3})$/ ) # N.N.N-N.ppp
502
        if( "$opt_v" =~ m/^(\d*)\.(\d*)\.(\d*)-(\d*)\.([a-z]{2,4})$/ ) # N.N.N-N.pppp
503
        {
503
        {
504
            my ($s1, $s2, $s3, $s4, $s5) = ($1, $2, $3, $4, $5);
504
            my ($s1, $s2, $s3, $s4, $s5) = ($1, $2, $3, $4, $5);
505
 
505
 
506
            $PkgVersionStr = sprintf("%02s%02s%02s", $s1,$s2,$s3);
506
            $PkgVersionStr = sprintf("%02s%02s%02s", $s1,$s2,$s3);
507
            $PkgVersion  = "$s1\.$s2\.$s3";
507
            $PkgVersion  = "$s1\.$s2\.$s3";
508
            $PkgBuildNum = $s4;
508
            $PkgBuildNum = $s4;
509
            $ProjectAcronym   = $s5;
509
            $ProjectAcronym   = $s5;
510
        }
510
        }
511
        elsif( "$opt_v" =~ m/^(\d*)\.(\d*)\.(\d*)\.([a-z]{2,3})$/ ) # N.N.N.ppp
511
        elsif( "$opt_v" =~ m/^(\d*)\.(\d*)\.(\d*)\.([a-z]{2,4})$/ ) # N.N.N.pppp
512
        {
512
        {
513
            my ($s1, $s2, $s3, $s4) = ($1, $2, $3, $4);
513
            my ($s1, $s2, $s3, $s4) = ($1, $2, $3, $4);
514
 
514
 
515
            $PkgVersionStr = sprintf("%02s%02s%02s", $s1,$s2,$s3);
515
            $PkgVersionStr = sprintf("%02s%02s%02s", $s1,$s2,$s3);
516
            $PkgVersion  = "$s1\.$s2\.$s3";
516
            $PkgVersion  = "$s1\.$s2\.$s3";
Line 521... Line 521...
521
        {
521
        {
522
            Error("-v command line arg [$opt_v] has invalid format",
522
            Error("-v command line arg [$opt_v] has invalid format",
523
                  "Allowed formats are N.N.N-B.ppp and N.N.N.ppp where:",
523
                  "Allowed formats are N.N.N-B.ppp and N.N.N.ppp where:",
524
                  "    N is an integer",
524
                  "    N is an integer",
525
                  "    B is an integer",
525
                  "    B is an integer",
526
                  "    ppp is the project acronym",
526
                  "    ppp is the project acronym (2..4 characters)",
527
                  "Check propject acronym.");
527
                  "Check propject acronym.");
528
 
528
 
529
        }
529
        }
530
        $PkgVersionUser  = $opt_v;
530
        $PkgVersionUser  = $opt_v;
531
    }
531
    }