Subversion Repositories DevTools

Rev

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

Rev 908 Rev 910
Line 148... Line 148...
148 
  /**Flag to control output to standard out
 148 
  /**Flag to control output to standard out
149 
   * @attribute
 149 
   * @attribute
150 
   */
 150 
   */
151 
  private boolean mDependentFlag = true;
 151 
  private boolean mDependentFlag = true;
152 
 
 152 
 
- 
 
 153 
  /**Warning message
- 
 
 154 
   * @attribute
- 
 
 155 
   */
- 
 
 156 
  private static final String mCircularDependency = new String("Warning. The following package versions are not reproducible as they have circular dependencies: ");
- 
 
 157 
 
- 
 
 158 
  /**Flag to control output to standard out
- 
 
 159 
   * @attribute
- 
 
 160 
   */
- 
 
 161 
  private boolean mCircularDependencyFlag = true;
- 
 
 162 
 
153 
  /**constructor
 163 
  /**constructor
154 
   */
 164 
   */
155 
  public RippleEngine(ReleaseManager releaseManager, int rtag_id,
165 
  public RippleEngine(ReleaseManager releaseManager, int rtag_id,
156 
                      boolean isDaemon)
 166 
                      boolean isDaemon)
157 
  {
 167 
  {
Line 259... Line 269...
259 
          Package dependency = findPackage(alias);
 269 
          Package dependency = findPackage(alias);
260
270
261 
          p.mPackageDependencyCollection.add(dependency);
 271 
          p.mPackageDependencyCollection.add(dependency);
262 
        }
 272 
        }
263 
      }
 273 
      }
- 
 
 274
- 
 
 275 
      // DEVI 56479 detect and deal with circular dependencies
- 
 
 276 
      for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
- 
 
 277 
      {
- 
 
 278 
        Package p = it.next();
- 
 
 279
- 
 
 280 
        if ( p.hasCircularDependency( this ) )
- 
 
 281 
        {
- 
 
 282 
          mLogger.info("planRelease circular dependency detected " + p.mAlias);
- 
 
 283 
          // exclude all dependent packages
- 
 
 284 
          // max 50 chars
- 
 
 285 
          rippleBuildExclude(p, p.mId, "Package has circular dependency", null, null);
- 
 
 286
- 
 
 287 
          // take the package out of the build
- 
 
 288 
          p.mBuildFile = -6;
- 
 
 289 
          mLogger.info("planRelease set mBuildFile to -6 for package " + p.mAlias );
- 
 
 290 
          standardOut(mCircularDependency, p.mAlias, mCircularDependencyFlag);
- 
 
 291 
        }
- 
 
 292 
      }
264 
 
 293 
 
265 
      // DEVI 55483 now use the fully built mPackageDependencyCollection (in rippleBuildExclude)
 294 
      // DEVI 55483 now use the fully built mPackageDependencyCollection (in rippleBuildExclude)
266 
      for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
 295 
      for (Iterator<Package> it = mPackageCollection.iterator(); it.hasNext(); )
267 
      {
 296 
      {
268 
        Package p = it.next();
 297 
        Package p = it.next();