Subversion Repositories DevTools

Rev

Rev 872 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 872 Rev 874
Line 580... Line 580...
580 
            p.mBuildFile = buildFile;
 580 
            p.mBuildFile = buildFile;
581 
            mLogger.warn("planRelease 2 set mBuildFile to " + buildFile + " for package " + p.mAlias );
 581 
            mLogger.warn("planRelease 2 set mBuildFile to " + buildFile + " for package " + p.mAlias );
582
582
583 
            if ( buildFile == 1 )
 583 
            if ( buildFile == 1 )
584 
            {
 584 
            {
585 
              p.applyPV(mReleaseManager, mBaseline);
 585 
              int pvApplied = p.applyPV(mReleaseManager, mBaseline);
- 
 
 586
- 
 
 587 
              if ( pvApplied == 1 )
- 
 
 588 
              {
- 
 
 589 
                // max 50 chars
- 
 
 590 
                rippleBuildExclude(p, p.mId, "Package has non standard versioning", null);
- 
 
 591 
              }
- 
 
 592 
              else
- 
 
 593 
              if ( pvApplied == 2 )
- 
 
 594 
              {
- 
 
 595 
                // max 50 chars
- 
 
 596 
                rippleBuildExclude(p, p.mId, "Package has reached ripple field limitations", null);
- 
 
 597 
              }
- 
 
 598 
              else
- 
 
 599 
              {
- 
 
 600 
                buildFile = 2;
- 
 
 601 
              }
586 
            }
 602 
            }
587 
            else
 603 
            else
588 
            {
 604 
            {
589 
              mLogger.info("planRelease package has future (downgraded) build requirement " + p.mName + " " + buildFile);
605 
              mLogger.info("planRelease package has future (downgraded) build requirement " + p.mName + " " + buildFile);
590 
            }
 606 
            }
591
- 
 
592 
            buildFile = 2;
 - 
 
593 
          }
 607 
          }
594 
        }
 608 
        }
595 
      }
 609 
      }
596
610
597 
      // are more build files required
 611 
      // are more build files required
Line 857... Line 871...
857 
  /**sets the mBuildFile to -5 for the package and all dependent packages
 871 
  /**sets the mBuildFile to -5 for the package and all dependent packages
858 
   */
 872 
   */
859 
  private void rippleBuildExclude(Package p, int root_pv_id, String root_cause, ListIterator<BuildExclusion> list )
 873 
  private void rippleBuildExclude(Package p, int root_pv_id, String root_cause, ListIterator<BuildExclusion> list )
860 
  {
 874 
  {
861 
    mLogger.debug("rippleBuildExclude");
 875 
    mLogger.debug("rippleBuildExclude");
862 
    if ( p.mBuildFile == 0 )
 876 
    if ( p.mBuildFile == 0 || p.mBuildFile == 1 )
863 
    {
 877 
    {
864 
      p.mBuildFile = -5;
 878 
      p.mBuildFile = -5;
865 
      mLogger.warn("rippleBuildExclude set mBuildFile to -5 for package " + p.mAlias );
 879 
      mLogger.warn("rippleBuildExclude set mBuildFile to -5 for package " + p.mAlias );
866
880
867 
      // if found, process it, else add it (unprocessed)
 881 
      // if found, process it, else add it (unprocessed)
Line 930... Line 944...
930 
  /**sets the mBuildFile to -5 for the package and all dependent packages
 944 
  /**sets the mBuildFile to -5 for the package and all dependent packages
931 
   */
 945 
   */
932 
  private void rippleBuildExclude(Package p, BuildExclusion buildExclusion, ListIterator<BuildExclusion> list )
 946 
  private void rippleBuildExclude(Package p, BuildExclusion buildExclusion, ListIterator<BuildExclusion> list )
933 
  {
 947 
  {
934 
    mLogger.debug("rippleBuildExclude");
 948 
    mLogger.debug("rippleBuildExclude");
935 
    if ( p.mBuildFile == 0 )
 949 
    if ( p.mBuildFile == 0 || p.mBuildFile == 1 )
936 
    {
 950 
    {
937 
      p.mBuildFile = -5;
 951 
      p.mBuildFile = -5;
938 
      mLogger.warn("rippleBuildExclude set mBuildFile to -5 for package " + p.mAlias );
 952 
      mLogger.warn("rippleBuildExclude set mBuildFile to -5 for package " + p.mAlias );
939 
      buildExclusion.process();
 953 
      buildExclusion.process();
940
954