Subversion Repositories DevTools

Rev

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

Rev 2636 Rev 3621
Line 573... Line 573...
573 
   {
 573 
   {
574 
      if ( versionBase.length == 0 )
 574 
      if ( versionBase.length == 0 )
575 
      {
 575 
      {
576 
         return "Action failed: version number is of zero length" + forPkgName;
 576 
         return "Action failed: version number is of zero length" + forPkgName;
577 
      }
 577 
      }
578 
      else if ( versionExt != ".cots" )
 578 
      else if ( versionExt != ".cots" && versionExt != ".tool")
579 
      {
 579 
      {
580 
         if ( isPatch )
 580 
         if ( isPatch )
581 
         {
 581 
         {
582 
            if ( !re_patch_ver_format.test(versionBase) )
 582 
            if ( !re_patch_ver_format.test(versionBase) )
583 
            {
 583 
            {
Line 590... Line 590...
590 
            {
 590 
            {
591 
               return "Action failed: version is not of form (integer).(integer).(integer).(extension)" + forPkgName;
 591 
               return "Action failed: version is not of form (integer).(integer).(integer).(extension)" + forPkgName;
592 
            }
 592 
            }
593 
         }
 593 
         }
594 
      }
 594 
      }
595 
      else if ( versionExt == ".cots")
 595 
      else if ( versionExt == ".cots" || versionExt == ".tool")
596 
      {
 596 
      {
- 
 
 597 
         var extName = versionExt.toUpperCase().substr(1);
- 
 
 598 
 
597 
         if ( !re_cots_ver_format.test(versionBase) )
 599 
         if ( !re_cots_ver_format.test(versionBase) )
598 
         {
 600 
         {
599 
            return "Action failed: COTS version must begin with letter/digit/underscore, cannot contain any whitespace, and only special characters underscore/dash/dot are allowed" + forPkgName;
 601 
            return "Action failed: " + extName + " version must begin with letter/digit/underscore, cannot contain any whitespace, and only special characters underscore/dash/dot are allowed" + forPkgName;
600 
         }
 602 
         }
601 
 
 603 
 
602 
         if ( re_cots_ver_format_exc1.test(versionBase) )
 604 
         if ( re_cots_ver_format_exc1.test(versionBase) )
603 
         {
 605 
         {
604 
            return "Action failed: COTS version cannot contain two adjacent special characters (underscore/dash/dot)" + forPkgName;
 606 
            return "Action failed: " + extName + " version cannot contain two adjacent special characters (underscore/dash/dot)" + forPkgName;
605 
         }
 607 
         }
606 
 
 608 
 
607 
         if ( !re_cots_ver_format_exc2.test(versionBase) )
 609 
         if ( !re_cots_ver_format_exc2.test(versionBase) )
608 
         {
 610 
         {
609 
            return "Action failed: COTS version must contain one or more alphanumeric characters" + forPkgName;
 611 
            return "Action failed: " + extName + " version must contain one or more alphanumeric characters" + forPkgName;
610 
         }
 612 
         }
611 
      }
 613 
      }
612 
   }
 614 
   }
613 
 
 615 
 
614 
   // everything ok - no error
 616 
   // everything ok - no error