Subversion Repositories DevTools

Rev

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

Rev 7077 Rev 7078
Line 102... Line 102...
102 
	        {
 102 
	        {
103 
	            Package p = it.next();
 103 
	            Package p = it.next();
104 
	            if (!p.mDirectlyPlanned && p.mTestBuildInstruction == 0 && p.mForcedRippleInstruction == 0)
 104 
	            if (!p.mDirectlyPlanned && p.mTestBuildInstruction == 0 && p.mForcedRippleInstruction == 0)
105 
	            {
 105 
	            {
106 
	                p.mIsNotReleased = false;
 106 
	                p.mIsNotReleased = false;
- 
 
 107 
	                if (p.mBuildTime <= 0)
107 
	                p.mBuildTime = 90;
 108 
	                    p.mBuildTime = 90;
108 
	                packageCollection.add(p);
 109 
	                packageCollection.add(p);
109 
	            }
 110 
	            }
110 
	        }
 111 
	        }
111 
 
 112 
 
112 
		}
 113 
		}
Line 121... Line 122...
121 
                if (p.mDirectlyPlanned )
 122 
                if (p.mDirectlyPlanned )
122 
                {
 123 
                {
123 
                    p.mIsNotReleased = true;
 124 
                    p.mIsNotReleased = true;
124 
                    p.mDirectlyPlanned = true;
 125 
                    p.mDirectlyPlanned = true;
125 
                    p.mBuildReason = BuildReason.NewVersion;
 126 
                    p.mBuildReason = BuildReason.NewVersion;
- 
 
 127 
                    if (p.mBuildTime <= 0)
126 
                    p.mBuildTime = 100;
 128 
                        p.mBuildTime = 100;
127 
                    packageCollection.add(p);
 129 
                    packageCollection.add(p);
128 
                }
 130 
                }
129 
            }
 131 
            }
130 
 
 132 
 
131 
        }
 133 
        }
Line 693... Line 695...
693 
		           || setName.compareTo("iteration4") == 0
 695 
		           || setName.compareTo("iteration4") == 0
694 
		           || setName.compareTo("iteration5") == 0
 696 
		           || setName.compareTo("iteration5") == 0
695 
		           || setName.compareTo("iteration6") == 0 )
 697 
		           || setName.compareTo("iteration6") == 0 )
696 
		         {
 698 
		         {
697 
		           p = new Package(1, 15, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
 699 
		           p = new Package(1, 15, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
- 
 
 700 
		           p.mBuildTime = 9990;
698 
		           plannedPackage = findPackage(p.mAlias, packageCollection);
 701 
		           plannedPackage = findPackage(p.mAlias, packageCollection);
699 
		         }
 702 
		         }
700 
		         else
 703 
		         else
701 
		         {
 704 
		         {
702 
		           p = new Package(1, 16, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
 705 
		           p = new Package(1, 16, "MergedProduct", "1.0.0000.tim", ".tim", "MergedProduct.tim", "CC::/vob/MergedProduct::MergedProduct_1.0.0000.tim", 'm');
- 
 
 706 
		           p.mBuildTime = 9990;
703 
		           plannedPackage = findPackage(p.mAlias, packageCollection);
 707 
		           plannedPackage = findPackage(p.mAlias, packageCollection);
704 
		         }
 708 
		         }
705
709
706 
		         if ( plannedPackage == NULL_PACKAGE )
 710 
		         if ( plannedPackage == NULL_PACKAGE )
707 
		         {
 711 
		         {