Subversion Repositories DevTools

Rev

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

Rev 7114 Rev 7118
Line 289... Line 289...
289 
            //	Query package versions
 289 
            //	Query package versions
290 
            //
 290 
            //
291 
            phase.setPhase("queryPackageVersions");
 291 
            phase.setPhase("queryPackageVersions");
292 
            mLogger.debug("planRelease queryPackageVersions");
 292 
            mLogger.debug("planRelease queryPackageVersions");
293 
            mReleaseManager.queryPackageVersions(this, mPackageCollection, mBaseline);
 293 
            mReleaseManager.queryPackageVersions(this, mPackageCollection, mBaseline);
- 
 
 294
- 
 
 295 
            phase.setPhase("queryPackageWips");
294 
            mReleaseManager.queryWips(this, mPackageCollectionWip, mBaseline);
 296 
            mReleaseManager.queryWips(this, mPackageCollectionWip, mBaseline);
295 
            mReleaseManager.queryTest(this, mPackageCollectionTest, mBaseline);
 297 
            mReleaseManager.queryTest(this, mPackageCollectionTest, mBaseline);
296 
            mReleaseManager.queryRipples(this, mPackageCollectionRipple, mBaseline);
 298 
            mReleaseManager.queryRipples(this, mPackageCollectionRipple, mBaseline);
- 
 
 299
297 
            mPackageCollectionAll.addAll(mPackageCollection);
 300 
            mPackageCollectionAll.addAll(mPackageCollection);
298 
            mPackageCollectionAll.addAll(mPackageCollectionWip);
 301 
            mPackageCollectionAll.addAll(mPackageCollectionWip);
299 
            mPackageCollectionAll.addAll(mPackageCollectionTest);
 302 
            mPackageCollectionAll.addAll(mPackageCollectionTest);
300 
            mPackageCollectionAll.addAll(mPackageCollectionRipple);
 303 
            mPackageCollectionAll.addAll(mPackageCollectionRipple);
301
304
Line 1068... Line 1071...
1068
1071
1069 
                    //  Now that we know which package we are building
 1072 
                    //  Now that we know which package we are building
1070 
                    //      Set the previously calculated nextVersion as the packages version number
 1073 
                    //      Set the previously calculated nextVersion as the packages version number
1071 
                    //      Claim the version number to prevent other builds from using it. Even if doing a test build
 1074 
                    //      Claim the version number to prevent other builds from using it. Even if doing a test build
1072 
                    //
 1075 
                    //
1073 
                    mLogger.error("Update mVersion: {}", build);
 1076 
                    mLogger.debug("Update mVersion: {}", build);
1074 
                    if (build.mNextVersion != null)
 1077 
                    if (build.mNextVersion != null)
1075 
                    {
 1078 
                    {
1076 
                        mReleaseManager.claimVersion(build.mPid, build.mNextVersion + build.mExtension, mBaseline);
 1079 
                        mReleaseManager.claimVersion(build.mPid, build.mNextVersion + build.mExtension, mBaseline);
1077 
                        build.mVersion = build.mNextVersion;
 1080 
                        build.mVersion = build.mNextVersion;
1078 
                        mLogger.error("Update mVersion: {} to {}", build, build.mVersion);
 1081 
                        mLogger.error("Update mVersion: {} to {}", build, build.mVersion);
Line 1223... Line 1226...
1223 
                //  Escrow
 1226 
                //  Escrow
1224 
                //  The basic plan is the escrow build order
 1227 
                //  The basic plan is the escrow build order
1225 
                mBuildOrder = basicPlan.planCollection;
 1228 
                mBuildOrder = basicPlan.planCollection;
1226 
            }
 1229 
            }
1227
1230
1228 
            mLogger.error("Final Plan");
 1231 
            mLogger.warn("Final Plan");
1229 
            for (Iterator<PlannedPackage> it = mBuildOrder.iterator(); it.hasNext(); )
 1232 
            for (Iterator<PlannedPackage> it = mBuildOrder.iterator(); it.hasNext(); )
1230 
            {
 1233 
            {
1231 
                PlannedPackage p = it.next();
 1234 
                PlannedPackage p = it.next();
1232 
                mLogger.error("Plan: {} {} {}", p.mBuildLevel, p.mPkg.mAlias, p.mPkg.mId);
 1235 
                mLogger.warn("Plan: {} {} {}", p.mBuildLevel, p.mPkg.mAlias, p.mPkg.mId);
1233 
            }
 1236 
            }
1234
1237
1235
1238
1236 
        }
 1239 
        }
1237 
 
 1240 
 
Line 1258... Line 1261...
1258 
     *
1261 
     *
1259 
     * @return
 1262 
     * @return
1260 
     */
 1263 
     */
1261 
    private PlanResults planCollection(String name, ArrayList<Package> packageCollection, boolean mode)
 1264 
    private PlanResults planCollection(String name, ArrayList<Package> packageCollection, boolean mode)
1262 
    {
 1265 
    {
1263 
        Phase phase = new Phase("PlanCollection");
1266 
        Phase phase = new Phase("Plan-" + name);
1264 
        ArrayList<PlannedPackage> ripplePlan = new ArrayList<PlannedPackage>();
 1267 
        ArrayList<PlannedPackage> ripplePlan = new ArrayList<PlannedPackage>();
1265 
        PlanResults results = new PlanResults();
 1268 
        PlanResults results = new PlanResults();
1266 
 
 1269 
 
1267 
        //  Reset flags used in the calculations
 1270 
        //  Reset flags used in the calculations
1268 
        Package.resetProcessed(packageCollection);
 1271 
        Package.resetProcessed(packageCollection);
Line 1315... Line 1318...
1315 
        //  Add to the list packages that depend on the excluded package that have not already been excluded
 1318 
        //  Add to the list packages that depend on the excluded package that have not already been excluded
1316 
        phase.setPhase("ExcludeAllUsed");
 1319 
        phase.setPhase("ExcludeAllUsed");
1317 
        while( !exclude.isEmpty() )
 1320 
        while( !exclude.isEmpty() )
1318 
        {
 1321 
        {
1319 
            Package p = exclude.remove(0);
 1322 
            Package p = exclude.remove(0);
- 
 
 1323 
            mLogger.info("planCollection package not buildable {}. {},{}", p, p.mProcessed, p.mIsProcessed);
1320 
            p.mProcessed = true;
 1324
1321 
            p.mIsProcessed = true;
 1325 
            p.mProcessed = true;                        // Used to indicate pkg has had its dependencies scanned
1322 
            mLogger.error("planCollection package not buildable {}", p.mName);
 1326 
            p.mIsProcessed = true;                      // Used to indicate pkg has been added to list to process
- 
 
 1327 
 
1323
1328
1324 
            for (Iterator<Package> it1 = packageCollection.iterator(); it1.hasNext(); )
 1329 
            for (Iterator<Package> it1 = packageCollection.iterator(); it1.hasNext(); )
1325 
            {
 1330 
            {
1326 
                Package pkg = it1.next();
 1331 
                Package pkg = it1.next();
1327 
                if (pkg.mProcessed) {
 1332 
                if (pkg.mProcessed) {
Line 1330... Line 1335...
1330
1335
1331 
                for (Iterator<String> it = pkg.mDependencyCollection.iterator(); it.hasNext(); )
 1336 
                for (Iterator<String> it = pkg.mDependencyCollection.iterator(); it.hasNext(); )
1332 
                {
 1337 
                {
1333 
                    String alias = it.next();
 1338 
                    String alias = it.next();
1334 
                    if ( p.mAlias.compareTo( alias ) == 0 ) {
 1339 
                    if ( p.mAlias.compareTo( alias ) == 0 ) {
1335 
                        if (!pkg.mProcessed) {
 1340 
                        if (!pkg.mIsProcessed) {
- 
 
 1341 
                            pkg.mIsProcessed = true;
1336 
                            exclude.add(pkg);
 1342 
                            exclude.add(pkg);
1337 
                        }
 1343 
                        }
1338 
                    }
 1344 
                    }
1339 
                }
 1345 
                }
1340 
            }
 1346 
            }
Line 1569... Line 1575...
1569
1575
1570 
                //  Sort the packages by buildOrder and buildTime
 1576 
                //  Sort the packages by buildOrder and buildTime
1571 
                phase.setPhase("Sort Plan");
 1577 
                phase.setPhase("Sort Plan");
1572 
                Collections.sort(ripplePlan, PlannedPackage.BuildOrderComparitor);
 1578 
                Collections.sort(ripplePlan, PlannedPackage.BuildOrderComparitor);
1573
1579
1574 
                phase.setPhase("Display Build Order");
 1580 
                if (mLogger.isInfoEnabled() )
1575 
                mLogger.error("Plan Build {} Time: {}", name, results.planTime);
 - 
 
1576 
                for (Iterator<PlannedPackage> it = ripplePlan.iterator(); it.hasNext(); )
 - 
 
1577 
                {
 1581 
                {
- 
 
 1582 
                    phase.setPhase("Display Build Order");
- 
 
 1583 
                    mLogger.info("Plan Build {} Time: {}", name, results.planTime);
- 
 
 1584 
                    for (Iterator<PlannedPackage> it = ripplePlan.iterator(); it.hasNext(); )
- 
 
 1585 
                    {
1578 
                    PlannedPackage p = it.next();
 1586 
                        PlannedPackage p = it.next();
1579 
                    mLogger.error("Plan: {} {} t:{}", p.mBuildLevel, p.mPkg.mAlias, p.mPkg.mBuildTime);
 1587 
                        mLogger.info("Plan: {} {} t:{}", p.mBuildLevel, p.mPkg.mAlias, p.mPkg.mBuildTime);
- 
 
 1588 
                    }
1580 
                }
 1589 
                }
1581 
            }
 1590 
            }
1582
1591
1583 
            //  Daemon mode: Returning calculated plan
 1592 
            //  Daemon mode: Returning calculated plan
1584 
            results.planCollection = ripplePlan;
 1593 
            results.planCollection = ripplePlan;