Subversion Repositories DevTools

Rev

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

Rev 7145 Rev 7147
Line 376... Line 376...
376
        }
376
        }
377
 
377
 
378
        //
378
        //
379
        //  Attempt to release objects that have been created during the planning phase
379
        //  Attempt to release objects that have been created during the planning phase
380
        //
380
        //
381
        mBuildCollection.clear();
-
 
382
        mPackageCollection.clear();
381
        mPackageCollection.clear();
383
        mPackageCollectionRipple.clear();
382
        mPackageCollectionRipple.clear();
384
        mPackageCollectionTest.clear();
383
        mPackageCollectionTest.clear();
385
        mPackageCollectionWip.clear();
384
        mPackageCollectionWip.clear();
386
        mBuildOrder.clear();
385
        mBuildOrder.clear();
387
        mEscrowRawData = "";
-
 
388
        mEscrowSetup = "";
-
 
389
        
-
 
390
        
-
 
391
        
386
        
392
        mLogger.warn("planRelease mDaemon {} returned", mDaemon);
387
        mLogger.warn("planRelease mDaemon {} returned", mDaemon);
393
        phase.setPhase("EndPlan");
388
        phase.setPhase("EndPlan");
394
    }
389
    }
395
    
390
    
Line 1006... Line 1001...
1006
                        //  Use the basic plan FOLLOWED by a plan that does not include
1001
                        //  Use the basic plan FOLLOWED by a plan that does not include
1007
                        //      Ripples done by the basic plan
1002
                        //      Ripples done by the basic plan
1008
                        //      WIPs/RIPPLES done in the course of doing the basic plan
1003
                        //      WIPs/RIPPLES done in the course of doing the basic plan
1009
                        mLogger.error("Use basic plan, then modified full plan");
1004
                        mLogger.error("Use basic plan, then modified full plan");
1010
                        mBuildOrder.addAll(basicPlan.planCollection);
1005
                        mBuildOrder.addAll(basicPlan.planCollection);
-
 
1006
 
1011
                        fullPlan = postRipplePlan("Full-Ripples", basicPlan, false);
1007
                        fullPlan = postRipplePlan("Full-Ripples", basicPlan, false);
1012
                        mBuildOrder.addAll(fullPlan.planCollection);
1008
                        mBuildOrder.addAll(fullPlan.planCollection);
1013
                        
1009
                        
1014
                    } else {
1010
                    } else {
1015
                        //  Use the full plan
1011
                        //  Use the full plan
Line 1216... Line 1212...
1216
                 }
1212
                 }
1217
                 
1213
                 
1218
                 //
1214
                 //
1219
                 //  Examine the build order and 'delete' entries with a -ve mBuildFile
1215
                 //  Examine the build order and 'delete' entries with a -ve mBuildFile
1220
                 //  These will be the product of pvApply errors and the packages that depend on them
1216
                 //  These will be the product of pvApply errors and the packages that depend on them
1221
                 
1217
                 //
-
 
1218
                 //     Insert a dummy marker between build plans
-
 
1219
                 //
-
 
1220
                 int lastLevel = -1;
-
 
1221
                 int listIndex = 0;
-
 
1222
                 int insertMarker = -1;
1222
                 for (Iterator<PlannedPackage> it = mBuildOrder.iterator(); it.hasNext(); )
1223
                 for (Iterator<PlannedPackage> it = mBuildOrder.listIterator(); it.hasNext(); )
1223
                 {
1224
                 {
1224
                     PlannedPackage pkg = it.next();
1225
                     PlannedPackage pkg = it.next();
1225
                     if (pkg.mPkg.mBuildFile < 0)
1226
                     if (pkg.mPkg.mBuildFile < 0)
1226
                     {
1227
                     {
1227
                         it.remove();
1228
                         it.remove();
1228
                         mLogger.error("Purge mBuildOrder {}", pkg.mPkg);
1229
                         mLogger.error("Purge mBuildOrder {}", pkg.mPkg);
-
 
1230
                         continue;
1229
                     }
1231
                     }
-
 
1232
                     
-
 
1233
                     if ( pkg.mBuildLevel < lastLevel && insertMarker < 0)
-
 
1234
                     {
-
 
1235
                         insertMarker = listIndex;
-
 
1236
                     }
-
 
1237
                     listIndex++;
-
 
1238
                     lastLevel = pkg.mBuildLevel;
-
 
1239
                 }
-
 
1240
                 
-
 
1241
                 if (insertMarker > 0)
-
 
1242
                 {
-
 
1243
                     PlannedPackage pp = new PlannedPackage( new Package() );
-
 
1244
                     pp.mBuildLevel = -1;
-
 
1245
                     mBuildOrder.add(insertMarker, pp);                     
1230
                 }
1246
                 }
1231
                
1247
                
1232
                //
1248
                //
1233
                //  To fit in with the old algorithm ( ie: could be improved )
1249
                //  To fit in with the old algorithm ( ie: could be improved )
1234
                //  Insert marks into all packages
1250
                //  Insert marks into all packages