From 03cb2a3ec9c458dda9054dc46e48268045dbfc4e Mon Sep 17 00:00:00 2001 From: Leo Treggiari Date: Tue, 28 Jun 2005 16:53:14 +0000 Subject: [PATCH] Fix for problem converting CDT 1.2 & 2.0 projects --- .../resources/oldTypeProjects/1.2/test12.zip | Bin 3811 -> 3568 bytes .../resources/oldTypeProjects/2.0/test20.zip | Bin 4203 -> 3771 bytes .../resources/oldTypeProjects/2.1/test21.zip | Bin 6772 -> 4261 bytes .../oldTypeProjects/2.1CPP/Test21CXX.zip | Bin 0 -> 4189 bytes .../core/tests/ManagedProjectUpdateTests.java | 25 ++++++++++- .../core/ManagedBuildManager.java | 41 ++++++++++-------- .../internal/core/Configuration.java | 14 +++--- .../internal/core/ManagedBuildInfo.java | 3 +- .../internal/core/ProjectType.java | 2 +- .../UpdateManagedProject12.java | 2 +- .../UpdateManagedProject20.java | 4 +- .../UpdateManagedProject21.java | 31 +++++++------ .../UpdateManagedProjectManager.java | 16 ++++++- 13 files changed, 92 insertions(+), 46 deletions(-) create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Test21CXX.zip diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip index 5b776ed5446b02c925d63ef14a705e05f9fdd6bd..cd22d850156f9e9eb311a12df406d94cb3f052a4 100644 GIT binary patch delta 1011 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 P{6JXA%)k%=N*4?O`8g5C diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/test20.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/test20.zip index 377fef458b167056f07e1555db1edc21d8cf0a5e..c504c60eab1e72c6c226c167c503a6a652b34714 100644 GIT binary patch delta 1142 zcmV-+1d03WAiEuZP)h>@6aWAK2mo1mPcbBKV>w;|001-(000R9001syWOQP6X>4Te zS6y$@Fcf`9;y+k^0!?$9lrE`QsK&lDiJ@wY@rYdKCKwz$a-6mB>#-fW^=s`41tjQG zZ0Fp2>=XO==CD651iA%XaU~NRkTymjnM%3L6a4=AY(K_-{Z~()9QHFV;HJT$khDqL z4cix&RMH&MfmWY^nb$QJ>4nUci!oH^U=U9eY@jk>o3PZ7q6ru}BxxWdmo;Hu^AVQ> z#z0;~aTLcmo>6;_`qeVM%8nSN~%Gc1V1i0M!Y&2Rz_21 zV=^i#J4CgA;h7zH>)D#gI^eZ!-GM-Br3X}3R)qvBofBY!mlgPBF{OcA(l2m&4|};3 zbbfri9`oj8J?7}$6b3uRnUWdLYfX*&OiuU(Q5wj+;wcR4oJ74&&AP>@Nmc1qKTA7HKpKdD6#Sc4iwL*{fl&$>t%bRvqJ~M_B92HU0k<}z^Sb2rWUbh`bP|C%<-I}qoU-C8$ z0;o04ZWOh{xEtTyDp$>mjs5LM!hhW13RRgu;&As?`d?ezTD5v&Hw z;tk(PD**riyaE6K3jhEBE@NbLaB^>IWn*-Wl1o#bFyM<-bI<+mIeBz6-WECA09D#x#IJ%OXMoZujjM>i&L0MU zH++11c`+J;%yn78Kq`CSuO08(4sd!&<`bl4T1DK@D(FT6*9r=OVg+hh>s$c^(h&68 zOss+X4A@#gZ_G-g(SA2+re35#1e)Tz$;fQ9v*Tw+&RT8awRTNBJU@G)QP3_ERQ(p( zU|G_dDq)5HY70d}J7S?x!Pbp84ZlucP%Lv$tSR0^UPHt!)zEr$xI3zYis}gN#cpWW zPJ}-0DE7xqmco7jTG}-`*;j1stRr5LC&-(z_A$z1sbvxx=Z2M$?zPcbBKV>w;|001-(lXnd%AnSNfG2#v1Nh<*W z0K5VK01E&B000000096X0001m0+YZEHv-uMllcua0^9_XFAg#S00om{4mJWP1(TZ& zH3F;!lhO_|0wxBN2M;y^P6m@d4>tmL29tOXKLU6NlerH;0{IA&{0~6_-wBgH5GDq# I3jhEB010gLM*si- delta 1578 zcmV+_2G#ky9qS-}P)h>@6aWAK2msSkqB8v9ZA1eE005C2000R9001syWOQP6X>4Te zS#59IHW2#0{qy(Vy|^AH zss5vrb3B9*Zl>YFZD4{}M|U>=TZh#zb&^KEnsMG>if+zHqJdlKvZ5G;QH8P&F=|9n z71&r;C^j_;KgExUL3*MQ@v-1OB~rMK2{Ju!Zzejdt6-FB=Z80@c7Vm7iHY*Z@<-R1 zZgl^t0LlG-ws0GQVQ$7rT-%^(v}$OsfIE?={31Q7W5lKMxZs$~NWN;OflgqxsroJE zI)SZ{aS&F&wM%vO0%us8+q=M)VETcZ+ZgFEO^Q;trVMkd(QWWi-+UJPX|2$k;c&Oi z+gH0~UcO(D`ONxeQfbrOM2&TwFx7z><{9V@X0@4rb7{w|&8s|5haZB(IAvXEJ4}PJ zT<0_p3mdTw)>`YV?I1+4z#jIgocRlk;@ktqX$j5g?Pk`k4;IM^I2N`Kzg>&gyY88My9MUj>We2o<-15fMZ( z<_V&ImbARM*s15m#ZEmNHS?l9(~F9(uQ1e_M3InKNS}kF9)h%P z4y~>AbkN135m*DxL1+0MlpX_XAOe?Q&Ncv)+i9(cBSINwib}ywNUqRPV5%fU?WTKD zTm~V+s8G}+p7;Vp`%?52laeX^oZME9!gTk4b`Zn*Ly^Y>5x~=b8p{u)372&?Iwa|AMk1wu z7<_$37fHUH$uD@ltp(cAQh9h(y=XNA3CI{eCLH3On!EE|ccFL9XlJ-@RpVX-;M`vQ z>c*MhpmG$%Cs^`RmX5ng?gk^mImU!>-#^>>abG>R!y)!FUnx&;ae^AMx2|iVIWn*-el0j3#Fc5|B&iEfPxznO2 z4^#%QIz1E_MXyXqR*a;ZPMR`*@b691Rt8kWQ?hTreJ@Qj7;XziHef2LF`-vcpAtZ> zg~U}tU*`9{8#=tbyci6DD_K_10@eqUR}D4-{s)tf4L1TO2$RSSKLRKU clL-z%0;vj*}-YMUt`OWiX9y6;ipKRmIe`?ywi?!_u*B!mw)%;2?mDk;=wd9+7`TYC)^>gR+ zUH19=rsTw7g`Bp;B#o^;AvMWobsw5^OuYEmWaZj5v;JSLZ}^w|P9^_mlIbd8ABlxN1!{jJpSl|J z*<8|!%`G=&_l#beEE#(LmiJkuX4#F`Zb)Z(pV= z(-n#3WqWOUUHr9a`gVPj^LM6C_ImlwFN?`7aM=>M88Si*DY<=pZ+GWO$$t6wi4zxrqvbuWwVHnrHBYuKH{e<3u@=i!n`6N3MXzPfl(Zi9vQ*S~rTPWRkc z-t)VOeZAtvQtkV40!%kW3wMed_qW-pw(RpQa`%}L_A{e?x@`QrBQ3`Lm4_C;^FFnC z=ECMTXZ*KZk5?|m`d_17-uSJHp+&9)*6jFSb# z*e1^sm18ntp1e!coGF%hvLKt}WF9f8$=0HLOcR(VcT1Qt?Es02PrfB#%v8@hnP1YL zseyfRfTSZ6Bgf>)l8&j*IT#q6QuC5CaubWPi}j03lTtE^^m4NUycwB9xN&CzU@l-_ dWKaN-bGVQ)M1VId8%T-|2&0&RIffU+0|2o+bpHSV delta 3223 zcmZ3g_{C&{1v9@00|NsG!=9LhM*5QPtqUiw=Mt;;&!26;aPIibe;V60ryr@~|Np5+K87bPlWAVdxn$Mf zVolpvTX;ewPOr%SD^YLxeeJ>L-{0%8UA7RkmzF(np{>j`N6jtflSj+I2aSD6=(e1y2x=)op<)>;jU*>f2W0U+`Qu% zdO*R0WxDg!Su8%AtXQ8{MIDdRn95WCIihLLnHD)UoAc&xXHR6Ex<++<@9(X5Sth>S zxy`p`zV5a&OPG!wW64^i8gE`7wYi~Fp1J_YIpRV)T^5}1veOUK7H)ixlLkWH)pBj*K3LgV|DE{&N>U;UOU0!M!BKW zkK9S@NwYF1`tjZTSf=hW#o|aJ-?nf~eepK7P1|iAeqFzHmhGzYtp;%5}rDzCH`qh=)5(O%!N0$yM^=nt>9v5-q4WwcxFgaM1gE4liQ}2gWg|cyfxC8 zl%D;%l4$lxN1?t_>({ljJ}jvR)jJvF^HMo^j<1hsdu91Qqw#0Z{lTn{; z?TEkaD{ymO_U$9zZzi4g(MrhiS)dm6sdTX^_Y99qXJq*H@+V9e6-rWm^JCq1uS~n* z=Bu~GjZgP6+)Zn{F(>3n@SAlD>*vjtW#pb5VJ9~wqg!y-jDYEZ`LaTHu6}C1WFxZi zE>~xBt+;Z_eYHx3Wi!QIKA9k!U+(16=`8asp?d14qQne^>eIq;|D#slTwE2-eOYr^ zx4=?6w;O3Cjvx2Vyt%vj>!I)aYs+;mr6&FU`o8G3&3V(@gEl3n*xt3hF>{_T>2th3 zQC;t0Y~=RaXK!<;PN_Qb&F|I`YxUb%ty6?@q={y(YMdikyUZv1BjWnxGw-33hB$f;BiC6#98WtL0n?0*`)z=6rsA4kx7IB;v;OeC)g;kSt&ToLa9q9ckywVVXH_H<}Acv4!Bl5 z&BueaRz+xkfkQhi=n>vQk04Mji!eul9edEYuz)J-$p`qvCyOx)poM1=4o!&I4Dbdy z01=zW1sSNi1p!EG&I6i-S@|OC2Nr||7$qUX0DEApAq;?)i@-#n#dM!%@^?NnCU#z6 zvhZR$$2Yl}-=68bz~nvrj!Xf9lmGKO)|&wxgA{YcrAaB7MS8i}5c_ebaIgo!>EX37 mBE91dbWkcp=mB*yz!9aWj~ryIz&K@KkN`qOAj=jMdJF*9DZE+$ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Test21CXX.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Test21CXX.zip new file mode 100644 index 0000000000000000000000000000000000000000..b604a9116a18f539fc379d0facba60ae4d254dd5 GIT binary patch literal 4189 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