WebSVN – DevTools – Diff – /buildtool/branches/planMetrics/src/main/java/com/erggroup/buildtool/ripple/RippleEngine.java



                    // relevant (direct and indirect) excluded pv's in the database
                    if ( be.compare(p.mId) && be.isARootCause() && p.mTestBuildInstruction == 0 && p.mForcedRippleInstruction == 0 )
                    {
                        // package is not reproducible, discard
 
 
                        rippleBuildExclude( p, p.mId, null, it, be, true );
                        p.mBuildFile = -3;
                        mLogger.info("planRelease set mBuildFile to -3 for package {}", p.mAlias );
                        break;
                    }

                    }
                    
                    if ( pvApplied != 0) 
                    {
                        // If this package is not a WIP/TEST/RIPPLE, then remove it from this collection
                        // Want to keep all WIP/TEST/RIPPLE items to simplify reporting
                        if (! p.mIsNotReleased )
                        {
                            it.remove();
                        }
                    }

                    if (p.mTestBuildInstruction != 0)
                    {
                        //  Not a Test Build
                        if (testBuild == ReleaseManager.NULL_PACKAGE)
                        {
                            testBuild = p;
                        }
                        mBuildOrder.add(p);
                    }
                }
            }

                mBuildOrder.addAll(build.mRipplePlan);
            }
            
            //
            //  Mark the first package in the build order as the one to be built
            //  This will give test builds priority, while indicating what will be built after that
            //
            
            if (!mBuildOrder.isEmpty()) {
                build = mBuildOrder.get(0);
                build.mBuildFile = 1;

     * @param xml	- An xml element to append data to
     * @param p	- Package to process
     */
    private void generatePackageInfo (XmlBuilder xml, Package p)
    {
        String joiner = "";
        
        String comment =
                "pvid="+ p.mId + 
                " name=\"" + p.mAlias + "\""+
                " reason=" + p.mNoBuildReason +" "+ 
                " buildFile=" + p.mBuildFile + " "+
                " directlyPlanned=" + p.mDirectlyPlanned + " "+
                " indirectlyPlanned=" + p.mIndirectlyPlanned + " depends=[" ;
        
        for (Iterator<String> it2 = p.mDependencyCollection.iterator(); it2.hasNext(); )
        {
            String alias = it2.next();
            comment += joiner + alias;
            joiner = ",";
        }
        
        comment += "]";
 
        xml.addComment(comment);            
    }
 
    /**returns an ant target for the passed Package

Rev 7050	Rev 7051
Line 612...	Line 612...
612	`// relevant (direct and indirect) excluded pv's in the database`	612	`// relevant (direct and indirect) excluded pv's in the database`
613	`if ( be.compare(p.mId) && be.isARootCause() && p.mTestBuildInstruction == 0 && p.mForcedRippleInstruction == 0 )`	613	`if ( be.compare(p.mId) && be.isARootCause() && p.mTestBuildInstruction == 0 && p.mForcedRippleInstruction == 0 )`
614	`{`	614	`{`
615	`// package is not reproducible, discard`	615	`// package is not reproducible, discard`
616		616
617		-
618	`rippleBuildExclude( p, p.mId, null, it, be, true );`	617	`rippleBuildExclude( p, p.mId, null, it, be, true );`
619	`p.mBuildFile = -3;`	618	`p.mBuildFile = -3;`
620	`mLogger.info("planRelease set mBuildFile to -3 for package {}", p.mAlias );`	619	`mLogger.info("planRelease set mBuildFile to -3 for package {}", p.mAlias );`
621	`break;`	620	`break;`
622	`}`	621	`}`
Line 1067...	Line 1066...
1067	`}`	1066	`}`
1068		1067
1069	`if ( pvApplied != 0)`	1068	`if ( pvApplied != 0)`
1070	`{`	1069	`{`
1071	`// If this package is not a WIP/TEST/RIPPLE, then remove it from this collection`	1070	`// If this package is not a WIP/TEST/RIPPLE, then remove it from this collection`
1072	`// Want to keep all WIP/TEST/RIPPLE items to simplify deporting`	1071	`// Want to keep all WIP/TEST/RIPPLE items to simplify reporting`
1073	`if (! p.mIsNotReleased )`	1072	`if (! p.mIsNotReleased )`
1074	`{`	1073	`{`
1075	`it.remove();`	1074	`it.remove();`
1076	`}`	1075	`}`
1077	`}`	1076	`}`
Line 1137...	Line 1136...
1137	`if (p.mTestBuildInstruction != 0)`	1136	`if (p.mTestBuildInstruction != 0)`
1138	`{`	1137	`{`
1139	`// Not a Test Build`	1138	`// Not a Test Build`
1140	`if (testBuild == ReleaseManager.NULL_PACKAGE)`	1139	`if (testBuild == ReleaseManager.NULL_PACKAGE)`
1141	`{`	1140	`{`
1142	`build = p;`	1141	`testBuild = p;`
1143	`}`	1142	`}`
1144	`mBuildOrder.add(p);`	1143	`mBuildOrder.add(p);`
1145	`}`	1144	`}`
1146	`}`	1145	`}`
1147	`}`	1146	`}`
Line 1156...	Line 1155...
1156	`mBuildOrder.addAll(build.mRipplePlan);`	1155	`mBuildOrder.addAll(build.mRipplePlan);`
1157	`}`	1156	`}`
1158		1157
1159	`//`	1158	`//`
1160	`// Mark the first package in the build order as the one to be built`	1159	`// Mark the first package in the build order as the one to be built`
1161	`// This will give test builds priority`	1160	`// This will give test builds priority, while indicating what will be built after that`
1162	`//`	1161	`//`
1163		1162
1164	`if (!mBuildOrder.isEmpty()) {`	1163	`if (!mBuildOrder.isEmpty()) {`
1165	`build = mBuildOrder.get(0);`	1164	`build = mBuildOrder.get(0);`
1166	`build.mBuildFile = 1;`	1165	`build.mBuildFile = 1;`
Line 1954...	Line 1953...
1954	`* @param xml - An xml element to append data to`	1953	`* @param xml - An xml element to append data to`
1955	`* @param p - Package to process`	1954	`* @param p - Package to process`
1956	`*/`	1955	`*/`
1957	`private void generatePackageInfo (XmlBuilder xml, Package p)`	1956	`private void generatePackageInfo (XmlBuilder xml, Package p)`
1958	`{`	1957	`{`
-		1958	`String joiner = "";`
1959		1959
1960	`String comment =`	1960	`String comment =`
1961	`"pvid="+ p.mId +`	1961	`"pvid="+ p.mId +`
1962	`" name=\"" + p.mAlias + "\""+`	1962	`" name=\"" + p.mAlias + "\""+`
1963	`" reason=" + p.mNoBuildReason +" "+`	1963	`" reason=" + p.mNoBuildReason +" "+`
1964	`" buildFile=" + p.mBuildFile + " "+`	1964	`" buildFile=" + p.mBuildFile + " "+`
1965	`" directlyPlanned=" + p.mDirectlyPlanned + " "+`	1965	`" directlyPlanned=" + p.mDirectlyPlanned + " "+`
1966	`" indirectlyPlanned=" + p.mIndirectlyPlanned;`	1966	`" indirectlyPlanned=" + p.mIndirectlyPlanned + " depends=[" ;`
-		1967
-		1968	`for (Iterator<String> it2 = p.mDependencyCollection.iterator(); it2.hasNext(); )`
-		1969	`{`
-		1970	`String alias = it2.next();`
-		1971	`comment += joiner + alias;`
-		1972	`joiner = ",";`
-		1973	`}`
-		1974
-		1975	`comment += "]";`
1967		1976
1968	`xml.addComment(comment);`	1977	`xml.addComment(comment);`
1969	`}`	1978	`}`
1970		1979
1971	`/**returns an ant target for the passed Package`	1980	`/**returns an ant target for the passed Package`

Subversion Repositories DevTools

(root)/buildtool/branches/planMetrics/src/main/java/com/erggroup/buildtool/ripple/RippleEngine.java – Rev 7050 → 7051