Subversion Repositories DevTools

Rev

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

Rev 7098 Rev 7106
Line 948... Line 948...
948
                    //
948
                    //
949
                    //  Report numbers for Bryan - can be removed after Aug-2019
949
                    //  Report numbers for Bryan - can be removed after Aug-2019
950
                    //  See PX-14283
950
                    //  See PX-14283
951
                    //
951
                    //
952
                    {
952
                    {
953
                        String BI = "--";
953
                        String bi = "--";
954
                        String BE = "--";
954
                        String be = "--";
955
                        if (fullPlan.planTime != basicPlan.planTime &&  basicPlan.planTime  != 0) {
955
                        if (fullPlan.planTime != basicPlan.planTime &&  basicPlan.planTime  != 0) {
956
                            BI = Float.toString( (fullPlan.planTime - basicPlan.planTime) / (float)basicPlan.planTime);
956
                            bi = Float.toString( (fullPlan.planTime - basicPlan.planTime) / (float)basicPlan.planTime);
957
                            BE = Float.toString( (float)fullPlan.planTime  / (fullPlan.planTime - basicPlan.planTime));
957
                            be = Float.toString( (float)fullPlan.planTime  / (fullPlan.planTime - basicPlan.planTime));
958
                        }
958
                        }
959
                        mLogger.error("PLAN STATS: Estimated time to complete current plan (ETC): {}", basicPlan.planTime);
959
                        mLogger.error("PLAN STATS: Estimated time to complete current plan (ETC): {}", basicPlan.planTime);
960
                        mLogger.error("PLAN STATS: Estimated time to full plan (PBT): {}", fullPlan.planTime);
960
                        mLogger.error("PLAN STATS: Estimated time to full plan (PBT): {}", fullPlan.planTime);
961
                        mLogger.error("PLAN STATS: Build Impact (BI): {}", BI);
961
                        mLogger.error("PLAN STATS: Build Impact (BI): {}", bi);
962
                        mLogger.error("PLAN STATS: Build Efficiency (BE): {}", BE);
962
                        mLogger.error("PLAN STATS: Build Efficiency (BE): {}", be);
963
                    }
963
                    }
964
                    
964
                    
965
                    
965
                    
966
                    if ( (basicPlan.planTime * 12) <= (fullPlan.planTime * 10) )
966
                    if ( (basicPlan.planTime * 12) <= (fullPlan.planTime * 10) )
967
                    {
967
                    {
Line 1013... Line 1013...
1013
                    //
1013
                    //
1014
                    //  Attempt to allocate a new version number
1014
                    //  Attempt to allocate a new version number
1015
                    //  If we can't generate a new version number, then this is considered to be a build failure
1015
                    //  If we can't generate a new version number, then this is considered to be a build failure
1016
                    //  The package will be excluded and the user will be emailed
1016
                    //  The package will be excluded and the user will be emailed
1017
                    //
1017
                    //
1018
 
-
 
1019
 
-
 
1020
                    Package p = pkg.mPkg;
1018
                    Package p = pkg.mPkg;
1021
 
1019
 
1022
                    int pvApplied = p.applyPV(mReleaseManager);
1020
                    int pvApplied = p.applyPV(mReleaseManager);
1023
 
1021
 
1024
                    if ( pvApplied == 0)
1022
                    if ( pvApplied == 0)
Line 1052... Line 1050...
1052
                
1050
                
1053
                //  Now have an mBuildOrder
1051
                //  Now have an mBuildOrder
1054
                //  Mark the selected package in the build order as the one to be built
1052
                //  Mark the selected package in the build order as the one to be built
1055
                //  May need to process its it a bit more
1053
                //  May need to process its it a bit more
1056
                //  
1054
                //  
1057
                if (!mBuildOrder.isEmpty()) {
1055
                if ( build != ReleaseManager.NULL_PACKAGE)
-
 
1056
                {
1058
                    build.mBuildFile = 1;
1057
                    build.mBuildFile = 1;
1059
                    
1058
                    
1060
                    if ( build.mForcedRippleInstruction > 0 )
1059
                    if ( build.mForcedRippleInstruction > 0 )
1061
                    {
1060
                    {
1062
                        mReleaseManager.markDaemonInstCompleted( build.mForcedRippleInstruction );
1061
                        mReleaseManager.markDaemonInstCompleted( build.mForcedRippleInstruction );
Line 1076... Line 1075...
1076
                    {
1075
                    {
1077
                        mReleaseManager.claimVersion(build.mPid, build.mNextVersion + build.mExtension, mBaseline);
1076
                        mReleaseManager.claimVersion(build.mPid, build.mNextVersion + build.mExtension, mBaseline);
1078
                        build.mVersion = build.mNextVersion;
1077
                        build.mVersion = build.mNextVersion;
1079
                        mLogger.error("Update mVersion: {} to {}", build, build.mVersion);
1078
                        mLogger.error("Update mVersion: {} to {}", build, build.mVersion);
1080
                    }
1079
                    }
1081
                }
-
 
1082
                
1080
                
1083
                //
1081
                    //
1084
                //  Massage the package collection
-
 
1085
                //      Replace WIP/TEST/RIPPLE so that the mPackageCollection is a collection of packages we would like in the release
1082
                    //  Ensure that the package we are about to build is present in the mPackageCollection as its
1086
                //      Don't replace those that we can't build due to errors
1083
                    //  this list that is used to generate the build.xml file - that may be a bad way to do it , but ...
1087
                //  
1084
                    //
1088
 
-
 
1089
                //         Update packages in the basicPlan
-
 
1090
                //         Update / Add packages to the fullPlan
1085
                    //  Note: Can't really modify others as they will be used as dependencies
1091
                //
1086
                    //
1092
                ArrayList<Package> buildCandidates = new ArrayList<Package>();
-
 
1093
                buildCandidates.addAll(mPackageCollectionTest);
-
 
1094
                buildCandidates.addAll(mPackageCollectionWip);
-
 
1095
                buildCandidates.addAll(mPackageCollectionRipple);
-
 
1096
    
-
 
1097
                for (Iterator<Package> it = buildCandidates.iterator(); it.hasNext(); )
-
 
1098
                {
-
 
1099
                    Package p = it.next();
1087
                    Package pEntry = findPackage(build.mAlias);
1100
                    if ( p.mBuildFile >= 0 )
1088
                    if ( pEntry != ReleaseManager.NULL_PACKAGE)
1101
                    {
1089
                    {
1102
                        Package pReleased = findPackage(p.mAlias);
-
 
1103
                        if ( pReleased != ReleaseManager.NULL_PACKAGE)
-
 
1104
                        {
-
 
1105
                            int index = mReleaseManager.findPackageLastIndex;
1090
                        mPackageCollection.set(mReleaseManager.findPackageLastIndex, build);
1106
                            mPackageCollection.set(index, p);
-
 
1107
                            p.mIsNotReleased = false;
1091
                        build.mIsNotReleased = false;
1108
                        }
-
 
1109
                        else
1092
                    } else {
1110
                        {
-
 
1111
                            mPackageCollection.add(p);
1093
                        mPackageCollection.add(build);
1112
                            p.mIsNotReleased = false;
1094
                        build.mIsNotReleased = false;
1113
                        }
-
 
1114
                    }
1095
                    }
1115
                }
1096
                }
1116
                
-
 
-
 
1097
 
1117
                //
1098
                //
1118
                //  Report packages that are indirectly excluded
1099
                //  Report packages that are indirectly excluded
1119
                //  ie: They will not be built because one, or more, of there dependents is not buildable
1100
                //  ie: They will not be built because one, or more, of there dependents is not buildable
1120
                //
1101
                //
1121
                mLogger.debug("planBuildOrder process packages which are not ripple buildable");
1102
                mLogger.debug("planBuildOrder process packages which are not ripple buildable");