Subversion Repositories DevTools

Rev

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

Rev 7133 Rev 7137
Line 1386... Line 1386...
1386 
        {
 1386 
        {
1387 
            ArrayList<PlannedPackage> toBuild = new ArrayList<PlannedPackage>();
 1387 
            ArrayList<PlannedPackage> toBuild = new ArrayList<PlannedPackage>();
1388
1388
1389 
            //
 1389 
            //
1390 
            //  Daemon Mode
 1390 
            //  Daemon Mode
- 
 
 1391 
            //  Generate the ripplePlan - collection of packages that we need to build inthe current ripple
- 
 
 1392 
            //
1391 
            //  Determine if we have a reason to build anything in this collection of buildable packages
 1393 
            //  Determine if we have a reason to build anything in this collection of buildable packages
1392 
            //      Reset the mCheckedCircularDependency - it will be used to detect  that we have processed a package
 1394 
            //      Reset the mCheckedCircularDependency - it will be used to detect  that we have processed a package
1393
1395
1394 
            for (Iterator<Package> it = packageCollection.iterator(); it.hasNext(); )
 1396 
            for (Iterator<Package> it = packageCollection.iterator(); it.hasNext(); )
1395 
            {
 1397 
            {
Line 1508... Line 1510...
1508 
            {
 1510 
            {
1509 
                PlannedPackage p = it.next();
 1511 
                PlannedPackage p = it.next();
1510 
                p.mPkg.mCheckedCircularDependency = false;
 1512 
                p.mPkg.mCheckedCircularDependency = false;
1511 
            }
 1513 
            }
1512
1514
- 
 
 1515 
            //
- 
 
 1516 
            //  If any packages needed to be build at this level, then there might be a higher level
- 
 
 1517 
            //  If no packages needed to be build at this level, then there is nothing to do.
1513 
            more = !thisLevel.isEmpty();
1518 
            more = !thisLevel.isEmpty();
1514 
            buildLevel++;
 1519 
            buildLevel++;
1515
1520
1516 
        } while (more);
 1521 
        } while (more);
1517
1522
1518 
        //  Sort the packages by buildOrder and buildTime
 1523 
        //  Sort the packages by buildOrder and buildTime
1519 
        phase.setPhase("Sort Plan");
 1524 
        phase.setPhase("Sort Plan");
1520 
        Collections.sort(ripplePlan, PlannedPackage.BuildOrderComparitor);
 1525 
        Collections.sort(ripplePlan, PlannedPackage.BuildOrderComparitor);
1521
1526
- 
 
 1527 
        //  Optionally - Display the calculated plan
- 
 
 1528 
        //      It will fill the log, but ...
1522 
        if (mLogger.isInfoEnabled() )
 1529 
        if (mLogger.isInfoEnabled() )
1523 
        {
 1530 
        {
1524 
            phase.setPhase("Display Build Order");
 1531 
            phase.setPhase("Display Build Order");
1525 
            mLogger.info("Plan Build {} Time: {}", name, results.planTime);
 1532 
            mLogger.info("Plan Build {} Time: {}", name, results.planTime);
1526 
            for (Iterator<PlannedPackage> it = ripplePlan.iterator(); it.hasNext(); )
 1533 
            for (Iterator<PlannedPackage> it = ripplePlan.iterator(); it.hasNext(); )
Line 1528... Line 1535...
1528 
                PlannedPackage p = it.next();
 1535 
                PlannedPackage p = it.next();
1529 
                mLogger.info("Plan: {} {} t:{}", p.mBuildLevel, p.mPkg.mAlias, p.mPkg.mBuildTime);
 1536 
                mLogger.info("Plan: {} {} t:{}", p.mBuildLevel, p.mPkg.mAlias, p.mPkg.mBuildTime);
1530 
            }
 1537 
            }
1531 
        }
 1538 
        }
1532
1539
1533 
        //  Daemon mode: Returning calculated plan
 - 
 
1534 
        results.planCollection = ripplePlan;
 1540 
        results.planCollection = ripplePlan;
1535
1541 
 
1536 
        phase.setPhase("EndPlanCollection");
 1542 
        phase.setPhase("EndPlanCollection");
1537 
        return results;
 1543 
        return results;
1538 
    }
 1544 
    }
1539 
 
 1545 
 
1540 
    /** Generate a plan based on a modified set of packages
 1546 
    /** Generate a plan based on a modified set of packages
Line 2048... Line 2054...
2048 
                        xml.addComment(buildExclusion.toString());
 2054 
                        xml.addComment(buildExclusion.toString());
2049 
                    }
 2055 
                    }
2050 
                }
 2056 
                }
2051 
            }
 2057 
            }
2052
2058
2053 
            // UTF Support (Also while trailing the changes)
 2059 
            // UTF Support (Also while trialing the changes)
2054 
            // Insert build Plan
 2060 
            // Insert build Plan
2055 
            if (mDaemon)
 2061 
            if (mDaemon)
2056 
            {
 2062 
            {
2057 
                xml.addComment("mBuildOrder");
 2063 
                xml.addComment("mBuildOrder");
2058 
                for (Iterator<PlannedPackage> it = mBuildOrder.iterator(); it.hasNext(); )
 2064 
                for (Iterator<PlannedPackage> it = mBuildOrder.iterator(); it.hasNext(); )