From 70f115ea4dfcc774daa90a5cd7ffb4209be3d5bf Mon Sep 17 00:00:00 2001 From: Leo Treggiari Date: Thu, 23 Feb 2006 18:04:57 +0000 Subject: [PATCH] Update tests because of dependency calculation changes and Echo changes --- .../resources/oldTypeProjects/1.2/test12.zip | Bin 3229 -> 3150 bytes .../resources/oldTypeProjects/2.0/test20.zip | Bin 3791 -> 3714 bytes .../resources/oldTypeProjects/2.1/test21.zip | Bin 4546 -> 4363 bytes .../oldTypeProjects/2.1CPP/Test21CXX.zip | Bin 4579 -> 4450 bytes .../test21Projects/linkedLib/linkedLib.zip | Bin 2711 -> 2642 bytes .../multiResConfig/testResCfg.zip | Bin 6431 -> 6904 bytes .../singleFileExe/testSingleExe.zip | Bin 3152 -> 3227 bytes .../test21Projects/twoFileSO/testDoubleSO.zip | Bin 3435 -> 3572 bytes .../CDTFortranTest1/CDTFortranTest1.zip | Bin 3653 -> 3669 bytes .../CDTFortranTest2/CDTFortranTest2.zip | Bin 18677 -> 18942 bytes .../test30Projects/TestATO/TestATO.zip | Bin 3377 -> 3396 bytes .../copyandDeploy/copyandDeploy.zip | Bin 3998 -> 4597 bytes .../test30Projects/deleteFile/deleteFile.zip | Bin 3425 -> 3559 bytes .../linkedFolder/Benchmarks/makefile | 86 +- .../linkedFolder/Benchmarks/objects.mk | 12 +- .../linkedFolder/Benchmarks/sources.mk | 28 +- .../linkedFolder/Benchmarks/subdir.mk | 68 +- .../test30Projects/linkedFolder/f1.c | 16 +- .../test30Projects/linkedFolder/f2.c | 16 +- .../test30Projects/linkedFolder/test_ar.h | 4 +- .../resources/test30Projects/linkedLib/f1.c | 16 +- .../resources/test30Projects/linkedLib/f2.c | 16 +- .../test30Projects/linkedLib/linkedLib.zip | Bin 2715 -> 2613 bytes .../test30Projects/linkedLib/test_ar.h | 4 +- .../multiResConfig/multiResConfig.zip | Bin 6406 -> 7910 bytes .../preAndPostBuildSteps.zip | Bin 3383 -> 3514 bytes .../rcbsBasicTest/rcbsBasicTest.zip | Bin 3468 -> 3536 bytes .../singleFileExe/singleFileExe.zip | Bin 3160 -> 3238 bytes .../test with spaces/test with spaces.zip | Bin 4117 -> 4331 bytes .../test30Projects/test30_1/test30_1.zip | Bin 4379 -> 4466 bytes .../test30Projects/test30_2/test30_2.zip | Bin 3595 -> 3627 bytes .../testFileWithNoExtension.zip | Bin 3436 -> 3514 bytes .../testMacroSupportInBuildDefinitions.zip | Bin 2917 -> 2924 bytes .../test30Projects/twoFileSO/twoFileSO.zip | Bin 3399 -> 3479 bytes .../tests/ManagedProject30MakefileTests.java | 1236 +++++++++-------- 35 files changed, 754 insertions(+), 748 deletions(-) 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 1da3f7f9c7d3ef74fb2cd0475f814fd2c18fd87f..62345aa29491f640003571b5b032da67bb520bd1 100644 GIT binary patch delta 1617 zcmZ`(3pCSv9RF|RwRzmkyWDvskIF=G)jW>~l_@)Jl1DU*7R3^~3+cFC$zSVgEn{)5 zYx0QXm2n$V*9wtKY^cx>nm2cK>YjE__jk_kalYTr=X=ig{660gP2(^1vaOP27S_uG z_-4UGZ-?MBr$QnEqVVTTJ=`QD5u%U`;CR~00&8#ExB&qGrA+{!EDnqazz3fW4G(4= z^(9d4l;RaOZv>e5RA8W9D=Ei})VnNLTeEESol_CCfbx4B;=EPC{1B1NA#*VA8!z7& zi6O=a&%CjwU0ri$NStJjQ9`vVcdX#=dC&tjm0e=5D8RSLFd@pNwwRC7$lR`Yf@pbYS%x|8Ps6pQ7-zul$tr(8`j*pZEs zMI~o>xYE-FC*Heo7*2 zS40atG|UcO3N$^Lon;ftg!$`2ex6vi^@{TO6^jfpGB=LBX2v8NIoT&rZkf7ARzG!_ zV`!XqXJtKg5Juad%6}9eJ)=V0RB0)2AMxhBh-_weGMy&lU2%6Uiz1`bJ{)hR2bRDK z@zA@C=+PQA(*{nmElxUJIAHzZNH7NPWHm5!cL4ZnV*1kya)} zTLl0UU}|8l)Sf-NhsXG1vmegOVaqBunK>r;Ch^y3^>*=qIGfXF9pTF$hNj*e&bxbVEuHTOl#rx4Zd7z96TeAsU`elt@^0n7tMsxjK~M z4R0TQ#t?>T(=r__}HC%@-x|^(6E4 zn98w8{qe(Im?y<{wJU`W`6``Hj%NE!EfG!LCT_7eY*W5@WIe{_!0h(^9|pMh`wM0b zn%q|QS($q$gLw+tNpoD}{dYM%hh~;CRa;DhZxYfD3Z7zh^n_C4J=UrYgvN>bLrDMt z0swX3s$`buA^ZpmvA=hC1Lc-oyREH`>l5NyJtbY|q1o?fn!tBS-TCsR`Ep46qahqs zvcF?0AF5|Qcffr5AlTkpYLPpPgLhNdZ55%yf*07j-66@e(DRvEiG={meUa1SSN|f& zg^oxU1kM<;ppQ|j(_5-!s)U*e#k_3G>@7Lu5*!^@mQjScU_vu`kRfyd0~>xJ{bGFE z%r6ieU0R@%+JbxY7cSPXll%`PO4Xk6WDL2re=ly(Kd>y$mbW#r`c#-{n%wpD)S1{qb^ zM8eR2>%@5c9eI5pE_7l((AzShxHcMa9)Y#}b{_8{_EOlO&tz zJ|V4~)4S@bXug56R6xHT^z(45%#$^MkP(2KNO=J8J&XLD0F*?RvgCgZ69PquzVZJo z^AiyQAVueXapG44^>F)AK=+I3iVx5y{?`iO;3b&4$-jgzc=3_>7B2v~-@%K^?^`?{ oM8efXVue7}B*1)Gb$R*ES&>wMri7~?0j@9S2?c;RvY*2L0Myl?_W%F@ delta 1756 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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/test21.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/test21.zip index 0b1270a81c8dd890e341a21cdbcd901ce6b5fa48..e667da1c81c5cbd4f4cbde8d1b67125926896376 100644 GIT binary patch delta 2240 zcmZ{l3pAAL8pmg1ko#rKxW&*#j9ZdRD3@$%!cf=}VvLzF$z|N5k3HlRi5Y{4Tw*I` zl*_nnLXzSfmD+ah3?kVR$sW1P8Fltc*NWhi01W=wp2y`CjVn7s}7*7C$ zKsY`SNEt*8mOub>XHOK%0vczS&JDgxcglLE*(!_lWC=DSU~A(j%U8Du`WN-weVeu>1W_^4TjS!Yb{HYW~KW*%{ zVpL@?Cvy;j88{S`>6+j>`v=li+lt=u10o=2$%;az0H4p#N@|r5pkAkN&#@)uukJ<_ z9EXwCb1q~|t@aJ!u~oB?xW*H>)!@%K+ts$h0w*)?vEF0T zDLTOAIi!c(M>hsaD|_3TL~U({o5`c@KkDppe7a7gIx!sdMQ=7@SCt3f$2?uT ze1(nhm*loiJqmA)1!h_y^<4_ypQcCu$+8zT0XPwis_jK$Z8jTE@QUQj4+6<-FL$61 z5$jL5h^0H*2jy8vnhRdz>d~~{+9i~mtGQfn-)B#>@>9~tP_vmIX&+T!H}y!@aa;Kg z=%i7WrFD8@TZ}&W3y^PaoX3HvgYUI#C^glJU~PhW5%WBt5fp z?Z0PxzgAt+Irq3y-x>C;5MzhmDV&Hy*Zfan!t(&tIi~Z#Hf#d;zw|9m1i*OAGUN_A1uI%=%2=WcUV!}u|fkbN6?jwNy z`1IuT(qfpf>w{{@A#1WHd2%EF7mHZXcHrX$QN21ID38}_JAkC1@K6kP3rJ7z6YkIx z?P4djTKnPRK<$q=&!VAN(zvCZ2i()gqsX4t(h~kbk1fJ~#hW9vD$U;mz;NKiv@kac z1v?}@4`0Eb>QE@S|3qw`LX3TUT`?_E_x$Y;7~EX}_h1B!%a%`m8(mi2h&;Mkajny{ zb5%Rl!B?TvMvWoEExvA)3$CmPz@jNDlO^Tgiu?@Y1I!mDD75Npe5n(Sdx9*m0g293 zdKEH64vb}c>Ykh%jR9sph-}XkVZ&L8;AN@Ln|fQb@Ne^z6z=Os2;EB5*`CPKgPIMD zbM;V^CTvDzQT>a|iz5)JFeEB5>7{lf951x^r9Wp!|WLA=)PGx&W z8@Atp-lM+Me9JTioD^}tr2c@xc$}HMK7OzRuLyixHmWjHl*WtAGc^S4ezw#QXDd4H z@x}aPxi27kiUt+j50{&jucQVZ@hYtk9m$P1tMDq=baCV~wrL`Jyz^@rXJ_M-b-2GT zN|k{bUJQoHap@Su7rz1LBSHi^-AI!%R)kX3uO4BVa$WqMv5TvD$-4*5<0 z|2E<`Js5=GJ%Xq~5~{#X{m$XM74c24CAjU!{v6di0Xu#C9dK;-Ho#X`17B^uld;pf z-x-g#Grk*nCt{~3z9W9-RpBp(h>&#uvIvzSu0&mt6z6vo1%asA5__pgDP?df^^_E9 U*M=xHTS`?pnCGx0u`SlW0m!L+lmGw# delta 2294 zcmZ{mc|6qlAIHCjDfdifCPL-jkua`YD-_&LO*)Mma{C zA`+2fa;y|ai=l{dlq>R^+U@t7+5PPwpYP-I$LIZge?H&$>-GM8Qe~dV-rEl)It#+( z1OOCZj1BSj5B7|}MXEa3^8wtoo_G_47v99-A`j5xyn!cL35vr|oC}G;f{F+=w=j*f z)sY!dTmazD4FCrK6fq5Y5d2CpU{U5-;~Rxy>t^1141Vdziych=5IVwUiQ-f-1Vg5j zz?ygobT?w_RQ>3+evqj^MUr7M)4Y-zwfe-dsE0eBq6jLzUd4JavuOt^JgNRQ!$_&y zqD;dTei-VHeR71nGxpfB7@1b^?9Fu-XbK5zq)GnHTed15SMJp*aZ>oykj4wlO*1>i zM~vR7fm8S>!cx~{>-wHgCf|SOd_D|C2~v7JVx!RKL@yYxk{d@39#TPD zi)2ITt&Y1DKu`?~G+r?3IGRf>nQGRA{7N8*>lL^2jjijIXAFQIdEq3Q_e)B5x^>Ni zON!*0qMLc7G_>4j$c2R?W~t)S3+fNd4Vb0cEty6m#+{~1m0WTS`y{6Gf2?#F0Em+I zxXm47awV?L2y-f%C&pHHF51?^s|7I-kCoquQV)Cf;XtQ{cnt3xdb>M&1NkOYQtBbd z|9S|Cu!ZHl#e=hbF+~a^2e;emRjM$C=&+KE`n<$<&b(I``8C@1t0!K;o7&Z$-V<3) z-sBmc(T%;EuUNVwBkSg<-PgPY-rZ&TvM#76Zm%5PPDdv}SE9x-Q<$I;^OMC@o|Tz} z^YaFg8Qz5tJ55B!nS1*VNiRf_Rkv#UTgLA9%zN`{BHwzF`=^KMN1mR}Rmra*9FuMYN(NOB!>m@i%*idIe&=qasy;asO8i#Be?>uwna=>(Ro~E&Pu4 zQojE8aMq6=6Gf9@0B4fKIDWNSR)SoX>i(7_GBi5E8~d+GC|NZACm6wYW>TYxkKY;) ze{H*>82x;@IYG)r!p#$OAz5ZOHb%e4Fa>z7xbtqTi(Kt;Y&K5b|E@|#zOsJ*km~zB z`$Un#$~Ingp+<#c75`$tVG&Kenj3eDvJI+K#o} zkMTb*P-bE;b8#MC7_syrn00V4>M<55!(JZl@<0laiRg zr3`lXXWyAiK&NY*Gb^p8QWe9j!jPVI=?8!NG_hI0P4OI4X#?JAqT50mKMqPcDu^8~ zx#hBYdl>zoxtQWX45C!upg*?^hU|K^{BmxMp%mh`o{MUGW_I=rx=s(IUC8`_?mfG> zJ7`mz3Ls*#o2CZQ-0c4=_jHP5TjHQqh&{3ydpxy%+$E0TIngBz~T zN{IzYAmR_Fm!~UvYfW0{F-lD{wwS9sYFFoQ!ZVe2sEj@zH3oN2ds0)U+O04>G35}9 zq3XxTf{6hHh)WhtHe~iQvu9@Tg(9221wyEuU!E<}M2^$PCnRdE1b0I~QEq;gQUM^0 z)hWMD{`v?2LVwNRK(i473UFST&_AzChl>D9`&^KJqo6n_Hk=f*=n!wB1N@-WKkw8( zbF)+gG{@yaiK$SjT@LoFoCZWsI70uQU7daXx!oLl{a=s&7H{w+p0g3K$NTYd#Iv^r z4g#mk*$G>m1a{AVBba>I1E*Ek32UsPusu=OjPnKX)ieM=l!YJSA`?%;k8`~x65-|$ SXCdMnxHNwk%Xxo%rTqt{w5oFe 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 index 85fa12caede6f57dbbb917ab3a3f3d82c8e92d4f..51ca87b51b50a863444d44e1f43e3d6225cedfe4 100644 GIT binary patch delta 2280 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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/linkedLib.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/linkedLib.zip index 8c423b59eb66e72d79bfcf8861af86d389ea3488..35f4182a8e608224cc7cb28bf2d53a802fc684b3 100644 GIT binary patch delta 914 zcmbO(dP!u%T^8#rxuGTuNPrv2c1q1l&d5zH$}ZLq@MdNa0Sa+21muL8a8^G!aEg(E zL63!jL6~9keooQ)wL!l5w+(n~uQ&W>ZfEh}xpMFBfre+?VwcO`Ub@ReN&e>v_dd7z)iLQTn{T~pikxVq`TvJ?NX86TzL^sw4g@t{ z5}UyNyY<5SnwaCIH4B3xi(3?aL~XF$w#SL{w#9a7j{S|A2h1ZsFRw3J$}+d{te{rx zY!PjZnF~L;dit)A<+y4!Im(0Yj6#9e$`uP`c==xRU3A)ZP|L@D^*f!Ii8FA0C~{?k`|-&8)or;wUoCL0oy^7m__ z%oV57ocYDCHmu2I^(nltHTV9^`iriY%UTn*PGhlrG3CpJRZ52)CNLW}sZI*1p7?p% zOxa0ywlFAqO!Qdz?ZkB@&ItBhwNo#Z`UNVQikz)KCU>{|W7h8*burK1FkOy0yeBcw zEje1rDgMho?Nhtd<2@F86&E@PzX`d!d*;HEhYvrQ@;>pCo?`8_@XviaxNAhe|KBjp z_ltFI{M5_GRQ_w!FirNG({aSqo!4__nV?hC&&Myz9@`p!6RubOFtdJ=!H%DTvG*s- zn9MK}f1B@lyK&V?xg)DxOZLvmeSesL`cb>-pTs9KvCkI*MRfX%xjPmEqrC(e*`f@S zW4XlZ*Y=<1YBu0G_P%wWbKCQu49&97<{vJb8L@}=$hMn0D_YI&et3JmlfC?V^MUF5 ziVvr&{O;P!qSyH5#>Bw824{|o`@OJo;`KL9;A(9>DYU?>q~o@AxAD18VOMrGT$Z#D z&J7Mt-Rt?T{<819yJ6F}yGE}4cRYCC#j_8ZuN+&bBt2WDf1%tSUcZM;PZN3OIVfd( zIVCAsSY09!ZxUI!c6v7dv}2Fna8GXFxR@xyzy(gv*itrFfB*K6z zr9-qaGAIBUe^@~2e)2<3E#~iR43p*AB_^wJ@v9?iMh!h=%{`N2xFo~^yjj^mqU=C; L3mC#l93UP5Hb`zY delta 1058 zcmca4GF^1TU6y*O`T}DHB*4ue%HWimmzEG|xKOJ(#PcfQ` zA2&Y#`Ptr?7hi0d|GxLZuEJ#^eMSqf+|THhT3eu@sNQOLh9~1OgX+#=xA}AKe^y>9ePhXV zAL$^W7S{At(jyZ&*}X8D{T&u<24m(0(^@GpsZEI*@1ee33sgB3=z?bjaq zpmgUjzvF#pT}^wfiMLm=dj=I<4}F{^5Y?0!^L>7F@V1~Vmh_&a6W3DKTzoN$xms!a zp-CR1)*Cm!h`eFCslL_b3X90nt}kp)ZI^C*;duW4)GvFTLk?MqU5;Np;r#v8KR<2V z{o~$E(X`gagj+$|>vs2bJ`6voSAD$Ie2#AgQ>0_`mXA^9)(snM0y+3JoBcI^7S)@- zUAh0~n)ffKO<$!~A$UnYx_yCp#zD5*2i?omgEdMHZOE{Rv}<`k=kNx5-G~}7*(u%g z>-6N}Z}7_bhIek?^ysg{-D`c}pJyL^{HE&XB$-(8@AppFgCc$MdQOSS!tBlUpm@Ke zb4_z0FclO5<6aas-iz}~i;`1|^>VYZ$9(^Ju4V(CWA9t{IlGGuAGa(j6F9x^>me$ol3_wC7#IS)8JWbHab*>VDZtQUIM67_ied^V;|M}>4$wGI z&H))Wc_pV76BGO7tDG81$i||^1hTQy*-?x|ju#|z1H4(;Kt5szLPjPAh6WB04*;_V BoAv+z diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/testResCfg.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/testResCfg.zip index 0fd7d9c5caad3cf179d2e212a2ab8c698aacb9bb..e552559d784194239b30171029c1f92c12b277f6 100644 GIT binary patch delta 3333 zcmc&$c{r4N8-C3&WM9S-#}<_(j5U!8nMAUtvK6up2@#<;*|!$&$TF6QP>eM(hD<0& zVp@*WWIx&Wj)uW;M!t@t>zwcV?>p~Y*YADa>%H&i_gwSb_wRjjRF>4sa}c}$zyhqe zpHd4UVs>)C0HB5msz3;XR`x!)Bix~!yz7qgww2~E>y=n5S&cwSwQu6oQKNjrUl`aL zX`#n%Nm=|JCb()~H%yF79ljVC7?^rME9+L6*CTlIn<919gRXi+!cL=i9p_=Pf@7pJ z;Z_LL;0T`qIOl9z^Vx4_f{N}Ok(5zd-u*cl$C_zMT4%k=fj{{O)Jc(NEJAkh=9(4U zthk=(A(u1yF0$kLOW{N#Mc(tmlDXJqVVk_?(Vy;4m!5vrtYTDqNb3>&DSOT2DCxsJ z>nSx;0}!Qwlk-X_T@Yt#}31U&1?upU~o{MP-bVr+4?v~HicL=Xi#{+o!$2EmT8pfuENff^XHeML29(u(qx;QPh&^a3Yx+OcFbgl7ST#v z#t$b$1!mS!dxH{=qv}PtMoq6hYVN>KfM&*UMkMfEEDGcR*^~6ANvM*=TwP`0^U&vo z`OB=<<&{jz`VsaKLu*;YBcZ@{5~Wb0d7H4lw6V6UF~hjK4AT9&SN$nLx^+G?^#A6A!sAQg7L?_MT7 zs^Lcz0HTtaNe(_1R+3#`MfVio2DwI|&db@N3fLl1JQY;w4RsYdN0j2icKPVJN>i#M zX_b}Z&4Zp=Od%4}HonE7KnRW1It;#Y{4F!zc?vqJNxn6)@>I!aWPO0LLkSx>utHI* zV*Q7pj|heB)p0yKBCG0*2<#ig_`8rOmn` zL{eio4><$QGa7Y^#?_8Kvm3EbCeKI0q*4{&p+7BFO#3H~IebW_dWx4WOSrC$E)d^-5T^%QIpy zH;89+(WUc9&|US6fxR*DQsMGLYcUTMh4{k>h2yaMn0?T}!;2bPxr%`+%j4A}edjVq z^E}8Chx__w$t$Fqh?-WnFGJ3?Qv=>U{)%!-waFi4c}gfwd|~$t-@dc0?IAeWzQ2-Z z64!V)hLgLSvGBCAOwOK_(xiD^oQEIEJg>60H?G=E8+<-Dq3(aIYRx!ZIqsrxJAtS+ z&r$bNQj@Fcm)5*AQ__rKwS}GBC`qiVsol8Tji7%X)}dH6cp*K!=8;Qx_mXf{&(2uf z;8-j=jC|mHwB8G7-tl4?mw#}wW6%lz)=PdjaMa@L_r-?}lBpskzzWratAX}vg-|xU zRFL$QU%CP6{kb81Z~ClH(+`fUYGfjBnhP3dmj-{Zl{Vr3X)8B4_^;YZr5F5HZPf?K z{tsJm&u7-Q($7yG7*xk83ch5GKyee9S7Q{iF&?*~#3qKx4(#y*xe|wJ)bAmZdxrY= zdlt(!5V%!TwYB$QD3f;$yfmrtPwJdp`qY}ghKt7AIWk@8z6U=Pb5p)4zBnnc%ub*p zHgz`^VJ>jYf&B$vV*8EZb;SY%8%T_nH!*QVN6!S@S-UP=hfuBPv{TXkf=*CzP!7ry zI`Y+^mGN#oX2Izp;^z?aq01+Bcq{QES@_#6%JszS(BW6-TNagGV*{nWv^Y|isR_Rs z+#eZpyR(1$xnTx(x)w=4H=N;64VM&nWZf}-T85NqGlq+cz?CKI#d?U*oMcApt1cfU z@Kf&$fc+_v@J?GJ&d8RI>8YubJy4fUum1@PhH9KqlP*~FY@gmw_ zA*5RND4Kx(&|KK~<>urGxq9>k?o10flU(F;=-T&zrLwXlnE zN~ne)=b7LkH&=muZv#7Mm44uOQEf(-W$72?hb#OIO=pXR&8TI*)lh9`H@Avd9rk%k~XS!*}{F zXA4h8f92v@U5z}WPrUZ2!+m%mEaFN2Oi5Mli1lWilg8Fq3IH4XZd?q21XRhtOX@r3&uN7I zj{h6t8-^aehp7A#f8w?eAe%sXE_!eV(h}G!{XO5-M-KpYZ^AbAq({5hAVIdhP>BG` zpWv;7cVnvAyf(q}?9ep3n7o-W0}Kgl%}!h1|FPP7NK$aC+ARwK-`E?eHxpMu7X)<~ zJfH`HIt(c2SNi%A+9heGsAQ9{xqkn@0brx{oFYAiL$Ft*D~S*D?pM3OD3ERC&1m>RNgQzUNT*p)&YOPM5%EwV+3 znTARTgG6PCpS>n2vQEPt-Cw!C{(#?o&-0w;JkR-__q^wP-_QFls%7pe&D;p)!H{72 zMlryWKm-~oU)2&)=>0uV;0KbdD^Vs?|b1dRzNky%X89SA+-$KwJf@t@!H$FbeI!eFzczD^;_S&nN8jY@i%e?sI z9^7MgB|X?MOZa_2Rs-41#5^Dv92obwT>GR|`W0w0l45tUAP39@!~r7NltX;S~KDtZXtuIovCts@az^P^zo7JUEy(s-LqUD*=xr zySU2F%8h)TI8F7sKE1Oh{phZ0l>;Yng<1*5j)if!b5kT@WRhkGWAy`9-tA=H4dXETNkE8j|$)+4)bgl1jNzlo7%wcS>OLAG=cWrDh5b<_$0bDUiG* zU7HgUBCM`3R)gtBOM2VQ&1$cijdvV$|5T`?L;fq?uEy} z>K26-sU_X21dpM`o3`2?XLg%V!Li$?FRSbtb&qf6^S|0WgG`Gt2a3xXwN$pkTZvEY z>}TIp@QBUxRx2GRV`4+X9mpb^taeQ6hBDR+a{ZJO5zY1U2JDBQS^`P{*BoRp*PL_N z-B{=00`lRU-is*IbCOJukdvk=VPn^02Oaz6=?qyrfvDk!VsO5N+Xp84RaH4F3p(`d zguWs72D&J%pyz@4kyD>jo?BYuo+Xo-4jD}$cCh>A>^52IQ#1oN`N(1y=K*(j-ZQwo zp{oUke<}#YC7mzpKm#^BL?fDC;nF?JEp(@(iIUm8W~pbMG}%)Z$FVk9c=f^Aa-)Wf zT8(xCBDE8svFQ%e3dc<{m@}N$X2o8Q+eoT-mWH_ykYh%Xm2C9v#-UheM?{cK(*B0#X zDSsN73z*=d50!rC^3rK{6)t6C?Q!@Ne^P>OU93szMBtS=984gY%XQ2_$+mBX7F!C7)eWGuIRuIZzNcuj?cT z1Oe*^{VN2?tRwUfg1%RY1g;YVh;XN!zO&C+H*W`DPd{ZpvcKp+I@LE>AYz-n-zkpz(_Hc#J2b{X2wtZA>5(g?8K8#P{$ z&kAAJi8^N`)@Qt#)JNYHk+^Z5uJXBix-T^|FEaA{o#!DN8ifU4UUvjn@fZP7P9UmS z$?oCU%cfdWEW9}~8vRt^rSu8wJ@`Zqho);R{^Uv71{DM^A#ZOoTu>y1ws*f3wzJ=q zKC~^N&!@+AxRkQOQ3~$7`#9H&wRx=_E!_G_YPjF_8v0{Uv>`A+-KstJ+}?rwZeq zIn(49;>y&{x4pf{Y6Xqh-MufA?KvNo>98UPBE>QEf<&_8Dr4?7`lP&=!M${o_eNzF zzF}eU_44m*M~IgI#eI+X#GC_IbA7Cq0Yw*q@2#=J_Y!+V3cNerwFh;kZiU^IegfF6 z3b3R<)3gn(FxhdH@AC~qV&tQm4EuTxEWW<)(~K~EpeTg>v*B)>`RKhW3X&k^+!a1f z((PilVh@~>uo9Z-3qFHdkOEoX>$GR00F`|cMuZlcvT+(vvvSB{Kjom-O#e$m@1W4Y zCz03^bjTMS4DxxU3a07RmEP(-Ck4iLW-9rO0^K^Au)I8}0i)@o8qv&DzbBs^Z6{}? zKvm`zaBRO%{Qazwv@=DEK`}OmzOMkP5pk5WVTY0jACzYeThj--EM7OoM6E*CoUm=v zsl3D;3>zH&p4rCRgvyhJlwe?#$S{~84o9u;Xb41@YuSGTj27L#0}g>hg#IL}{#wl3 zn`MU>$h5q$|pTEcf2H`&a&$xpC+YzFmnHUag z3tke_hGM{K?wJP8i|IlYKy`854N1aay|^TpB)$s@2kXRTkh~k$G6-=GTOJ6c;N~`>UsNc0tzm>7SBn?9c6d{=-l0{qLXmSj5&E zixy8ZURu|#nziN3!UiX;o`hTnX?Bezza6f=|MPR+`_`c1t6VJ_zalo;e%lk|eO-0C zbccQ8T7@mH<;x4F)-we++*UMMwpB)Y#muE2Q+<_6ID@{Q+%wgSVKYaQf+^>%g-03h zZnR$Y?Qp_u?#$zclm9!s<7?fg&fRODXg4=s?Ed7dX@6B?V^R-VhMy=g@Gw7jN^05X ztBu zAAS?+v@0f7kN?Q=V}$lJeoJEY*}iY8|BpW~o*}!(^JG+Y$%LMl*A=ee2vgqXP3C9wI_0Bg zJTt}Q*WHQf%5#=`tnCRqx$I`wDT~LcCQ{kAX9!JaaTj#E{i8kn|ECk1?HaFb$eWzh zP$D%Y>Hq$3SCp=)Nw_R(o4#k#qXkcxm}TpmLpSvvTm2<$os{r|^zP@&>$}xu&Tcq! z>eG&?*QRpKJ%9M2JJNNhz+~^3~1tQ}h;17dNxnY25Rz z&YS*JY%djMQe7{xMX)R8OWD*#oRwypnOx_LHACmUJ=?pAQ`|c6`WKPMm-(Mf^Z#|| z%oOuX^E36oHWj^`yd{Y1(Lw=}Pi13wyWAFQbB*!=#=g4eR|-~Zg*SkY4P zd*c5GHQ#E__j9dVyLsWW@?Ee0c{j_{>^NKwiV-egLSkT$KLadtz$_@i4Wyk?^O7@i z6N|Eo^(TjOJ(7ndT145zz#t4&&&Z%KIf7eB1*Qg`uz~WT2sJ>KGyCKKc5(FpZ$>5& z21HIkP1Fz_AVcqPtJK2`MWh)9uuhOFpc)`Kivz{E#idCpnMHcJ*$`VGe#GWQkO>S7 d0zm8lRD|T=0B=?{kQ65na>+0;Fl2%a0RV-*VrKvV delta 1293 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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/CDTFortranTest1.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest1/CDTFortranTest1.zip index b92612420d922b2bb33e1eed75a9d8ce5979e767..1d4db049aa6c0b8ade6a4b71bc8e38f7ffe40664 100644 GIT binary patch delta 1495 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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/CDTFortranTest2.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/CDTFortranTest2.zip index c42f9ae35f9ebcd6dae1261c97338a59dea82eac..52e986138191eec1e25358ee1e17c49f882cc75f 100644 GIT binary patch delta 4392 zcmZ{n2{@E%8^`Az)4|xr7L8qut!!bK8O+$1VytCfitGwwiHz(?GTxM}5RsxJOG**h zr;}`1jx5=?l8_ejO?6t%cfN1tx}N2o-~Ya!`@NrKo(&4H0|J%iFfIs$2?BSuRw=gp zAOeR$AdD!`4JJW$2<%hjY0od~e{-S-e;U8UkFz-Q)K=QvFNXgz+o7DGllB)RZVQ(B zZZ4e62@N`BhAK7nrVL)TZT#$;pL=0td0FL?cU|a&sEv3K&sLryH8g3TXRie{DJH3$ zoEsTxKtL9+9VYFY+}>Jp{nj=W(G;U8uooY45RvZo3i5l@hL2P%g5tyNWnMX_pj2vM7YvQ_O(#O!6M_q;?o@7N=J#MFPQj zsF_jRMdnO0dD&d?L0fXAc+0$J;=6>6nYUhdSp)JhPLs}=XU|cR5QMkHQ-J7GMDI*v zYNZh$O&PBE1T~#`fq!QXLE%J&homu!iCZ)4h>6oXZ|!RKN+X(&r6xaxF>*Mh9RS^9 zgK>muBq#24V#l-8>5VIaLT`iuVaAIe9hJ?QvkByjC=+l^or*8nE@%vek5iXuiH{AVBj}cLOD+r4_%uITR;#Con&%f3#2JOEKek zwwjx0afTV|Y0mRC)~^!R|$v3oQUH zL@1Mcu^Y|x85;I^NnVo)Rv$=jr`}C>KNM+y^N{j3SYhKbd+*itsj3gEOTtN?s=LO} zHim}Pi;G>vOurK>dzTZBS0`uZaMXJmE0+83jk=~!KKM+jg89%h?YGI zIJ;|R1KnO9_#&4UP|N(#g=ZfhQ(k_4--CVKvVXbOAbk?L9LkoxTxf3NW%b)Ub0AanFY*Fw5X^+MW z`s(-}^K0EN3sU4KRKthsQUmmr^v;ysjDTJA#W{B^IITqPw?dJS4Tlu`-)0;iDa#>m z)ZJ~-Id%9_uAiWsN_+@yr>#P9r8tXpRHlAM!P(*2XbT}B)2y@W)3Kh}KLhLKvNw;1 z4M-2R1(B_e29D-9-7Jv025`-CcHCm2bJM@By7w!QHk(N9UtL5s@PD`D&_pNypqR>gr&EA?_QA5%q9ZP{n z&5Nma6lEFh21!{Js(4aD`g{v9u6K7jOQi7tEy}T-ge$bPI{_PS>>5JKITyz7f6~bx zE1;;=~%OQjq+-jNU0DyT+HkGfkZ+0PY!v#A)7!Ek^n&p_7RE8!20`P#AQ zTCIb-nfYcT<@*}a!%6U*!2@RQn247C!S&~U#$E4LZ1cdkhunf)Q{v?PHX0Q%a&?`Y z<%1a}uSh1oKABciuFu0fVWtwk8iRX`RUF355c3w( zrQ|o)Ng3&}FHSe2w7j%ecOKSroiM#1=kg-XD4H@JYrA5hhsv$Ee2gedDU0c9@QhSm zUFOeSd8;8vopL7gm|l9Jj^tYB=u>D2?E6ysaQ>t)WDH>)w@?v4JZUYNsm;dt;&mlD zoAJ0y`q;up*solE-T2*Xs{8irfzo!np8u8gI z9UF;#Wa-&?#Ndf~+T7@Iao+7CDF~Fsz6X{0gdAgpn*`aWpN&@Sz{1{)xE5mH1#R)6C!P10v+%fO5CHzH&FT)$7u3p8}mGg(CI%Vf71b(fig8G|2^wUEe?Bb9nLmx~kdgT8 ztw$`@vFzBh%h8e8A-U^mv6(yEs6(bRUeD+%xs-=k!lPUiBL~0#_%W(*dz?ol|GEE- zl-nF%T1Jn2kl|6LH4CFDM8;6*7$n+_s2kI8o)lX#x?GNw{Xlu76H zXVr;Re)Me@2KlpVS(bVSQ>FT0uQy0B?x7~B0+;Uq2i!lW@Yj8Ql*S)+N9?+Rj7!BsdZaVhrDM}}dK68HrW~)YI=nz& zQ|?>#aEL7*YKnWZx-j3e^Ky&PN!90U3fNiDXqY}pt#XMA4Cd&2t z8&7(A+g5r+Q**vC#Jt@Da#??}M5ipPRq^vA>VcjPDKb*+(+HEgF3yMZ{MfR}R6Y5M zTOmcL)PTq(j>@gcGSxWjzP}i?#rWrfw4?)Wdnk~SH3+}Ke|vBNs|lM6n{8)R7}_0Y z9zR#$v$2#PAZwkrUp>?w!6$rPzHA0=J1j8tX{O2htZTv%r_kptm5-9~$Ng$k(-STP ziq**B=J#0xnhbQ&ysPDp>(3HhLZYIUOPZaYHMfQC zpw$dWGy@9lrqSy-tv?Uq#!g;KuFF@u^ip6z)%S8zQPEzsT}6U6X6IZ%%a_l}ZarbP z@EWzSqf|rJgWM^b#_{b60qOp!as|O`p~Jl^D@D)aYjP|^g-^D6V>z_gG(Sv{QMz-9 z15?eCa7?&&xbfbsrx{AIvE5x5Wj3iBS36!M?eoopU1|2GZuNv=KQ-K4IKb_Bau%f% z#ymcza@eRO;Ej`h;$NIXrCL4<)vY~uRqHIL&#tlyIde8~hUi5xyKpEys4E%WbIf!F z_aWA`XdWwP|EcnH%hZ#YiQO)b-;t;M->0Puj-lR#&PfV(ml ze)8SG8^b#~#K|qyC9S6uD{*;x?fYL|UNe|;l8Y9pwAgthJ^ld`5c?M}8cyzv$+&+P zw|Hc**`$?f$fvNG%Wdj3-`UBvm6`1Sh$*_M`E%B+M=err+%b>3+T6kG9_6e)iEbM?I1lt0ykL{I$0|iL%qm%REpAoQEbb*9I2&3%!g60qra?*d zRDW2Ve40(SJkNzRrSns33@sSd%4-8LE{bXqZ%)yk0qe=xVIhv$jFA*I^Oejw+7bPM zH`@Q)L-+TPWX$NN;}W>WVL?`&n3O~w_A+6P#Jx)Qa_K~SxmlSmwt6{ z=PId9437PH@u~0)=K}vH3C+DmQdgU;3$EKp);f86m8%g&PxN2sN?5AYNw_FcCKB*^ zlYKNnC1VsRB;jw3y*AAT0^F#3nVe@OJQ!ebdYBN%typW7Z;ihT7JB_#@L%83ckt`+ z^gBquto#o82OcB&c_{po2d^>-Fj;+ne+rXbM|JXnv z+`kxl>pX}?3xDJOeQ16M>9**N05BYl`pNyA81!Gh=J@O9JJ$q0L5u$6{(CO`;s_v2 zT?bGB4b?I1MVt`GkI>xQK_v_iSfq{w(BNZrEVPXa{G_e{Sc0k=SoYWS!T%tS9{WaS zXdnS^utEb1o#p`-H88Bl=>z(~fSg9Wpgsl(o#O@FFc`oG%)?-yOS{1#dM6y@#^L~0 zkch>86YS24gni#fOdJcZL_x~n-s)+;~!EsGZXsZw?tc3xrK|3uB+auv$;E8XcRBIst zb?`ZzxCg?uv4A0Hpp60UgJ}lg^OY4QlDi(u48VB|v9nz;azYkO;2me$A?) z9)Y!8?x*~FrYL$}b6T#42MWLyJp$kWD(K^(ANPYN_3^Cb@;_-`a7{-59MVU!;uU^A z^!qjfqyduk*6$C$k`4w)KmiOjAVAv`!FmHcG+YUMuCyEctb+i>43Pi~#2MlN7x1(p z0XnG+HW_LI(HTZ~KnNrl=|F2$KsHrAFwaPqtgrghT|`8L%lFvjJv9`GrT~-&^8Z)) zxA_l2(5p$hiGQs5U&8;j>VFC0Y7n2_l|MIu|8L;OLWX?vj8XfC=O5W8n(q4Js}~~u Ndz!BBrDG7te*oiqE(ZVr delta 4070 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 UG41&^>ka8=I}iQ)`|FqWA1ONl1^@s6 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/TestATO.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/TestATO/TestATO.zip index a0c5a351486e5a7e6fa2214b91eac97919b41682..7e24fe90283d2517c0287f3e932aaad532be35d6 100644 GIT binary patch delta 1471 zcmdlebwp}I6sr&e0|!I7d#K4p*T5|&85tNvStjSOO4kQw-!>4aTc`N{p&OH@+?$QI zQf#F``KLV|3s`S(Qao`@^`eru+oaRK-j|onIj31-up%z!?%aLvcfZfGsJUc3tO@$ z&93Iy-=KNW{P#1z`l6*Qd)dofHtaHEjao57@#msNYF8LrvL;vRs<5XCSU75Bz35=8 zF1h=9fz8+E(sQjl`(FML7kd};qb+99hPgK9JRL)=xqS*RY|Z}v-EDfWPWOW?(?UKi z;l8wb>QV>)55mSxPbcmAbvy6a8OD=*QUM&2QR1nd4kw;>y%D{4;Puq{7K2$To8@0_ z`MGX$?5>&1FE^GKcOMNryk=pJO|dSs=>2_9#9AsA#c)jA`e=dC+z?*7Bl|b5h+Ql= z&1vq1JvNHxRDbL$O7UI(FxcUG_{Q_GZwl`S|FYPpk^A7E@JjxY*2|}Ud7Vz_-@@?I z{+8_FA35nxn+@hZeUhp;apiGDxfV~K z|B+JyCWS|FgoSN7qk2Z%fm1xo<>!rJL$!~-_P#fNO}?i$byGyHX#ae!eQR&@)jy3| zdb2GwMtk8^>u+<~V=vx4$nTpjv+bbUj+q5a`RvypWvlW(KggaTVD)9Kv2V=#7Cz01 zR?%WlSLgbteblH#^IUiJwFGBi4!Fp~zyJy`r_{XUjNHVc>|*`m(xjBkBE8(~wUZ8J zA2JX*c3%5SeMPSYtN=Was9CWzW324qx@$RTHgOw zt$DAy_+qZRL{Gv?j@wOBG-f?Bxa+Cw>$s_DZB`1;dJZYhl%+4`y_D`Zcp)4js&UtH zQ@{(Z3xWIZOXW0XWvU7!9X=t)%I=yQ`GIeWpQ-2@?!{f3CW;+WsE z_QF3iJiSlr)OKxLZ2WX*cumuj`@$P7X1)B?)f>ydWcB&UmK72IzRX+yZmoc6M0nUK z5629?3s&B1N@9x{9@o6not3QX_5Q#j<0e;Eg@DO{OO-PZCp=m|m(hL35hb2?VnJ6p zR$n&!A7?Cap8a|A@2{uN@l3mxxN7b>gSR!`6%KAozQLp7?w4@t?G6q7{$t%XpHAEK z+tl)==sn7m;|<@Zy*B6U{TCtEB2C)*-~I$ANiJXrGcag-gqnaEP=XssBZd3s4z5Xz zDzLPRD54k`grOQ385Dr55Z1{BtfJZh-i%Bl;JAa7X{d=Eq64DAZ*m=v0^DFkvIb=e zWOe7+C(Ck(*P|PZo>V|uAO;`dK=A-P;Xq8l?P-Xm0zk?Vs0b+t0=!w-fQ2*z0}l|M K0Vd5Pupt01U`R#) delta 1307 zcmX>iwNYwA6zgOTR*}hhtdjM<{kIGRZ1siyCu&V#3Yxsi)@{`m#!J(>R6AH!Ry(Q9 zZ0Oz?d^Mxb#w>y(%T z24mKs$OBEc`CIl`*YAH`JhOY314om;dfAb->E3y<#eZ2IhF?(sQ2O$p=Q@D}^d9Qsh96ujS)Fu;^e5TDrvRg7+-9)m4)o?qgCMrwb8-5@6Whx zJYl-f{{tBoMq!`1+7?Id@jCvv|1sY_-EY+z+;RJ|C#KB278E$))v9f5GjtrTZu_aX z)yh(v?Vy$_$EQU_pH?hc=yd!E_vJZnSyT(_do_})`b89Dvp6KBq*FZ|CZF$kb9PVN zdS=d(jz&Lc_T8 z_C5aagSpwtzAx-bq^+OMYk=Orc*W~_4?@Rcq9BJ3?aGjf1G`G_AciW|j?3p&c(>7=PmD#tu?%Sd- z@&VrL9RG_x?z+Rsz!1VRiB)ED2D_i?uD^R??B@9$JUS3?S9I z7fLmK85kH|PyWv$JNYHMO#P}u1|lur8}}TZxNbea!j2dIJ3@}Ms4Y-h_=DUF9tXEo+$>pfHXcWM8UoX?(A{qLuckS98l0PXCxZ}@L;X_~D^ z_?HNgTkE*0ZYF)#IFUE0Z1GJW54F~Rdr#_ZjS#UhX&1OxJ+m@@(#02hw0+$+d}xXF zopjaf?ege_t!q6CZg{8`RXAMmP}s5L^a8u;|MwW5D{TGvWWhC=3&HjGBHlDaJ!BDB z#5GBFQ-a7=ZikcwAA{-(Z(I$#)+@w!X-Q1z``6c#c*DPcnD*pnsj7_bs!wX}&h`^- z%XRW~#pgfCQ8;~7-egu>fL=V`6Z7`7?&pt|^qXcM{MqKMEwS*f^K)6&BNAKLUoU>o zdrPtVN_4>sUG4=c2`f&XIySi=)2K5wT|mdDXquXM@xiE;oXQ>I@;PjeeRjV&VcR~j zmMxEs`}vcw@Q7I!4jLPb9rOBcCG2jFICaud%3=Er-xF#{Ga4>K%D3|9OBN810gD^165g>$hasjL8WL+K( zWtd`knggm5MW_U_3MWVKD8LOxL?F64MvlpIc;w*n%hU|g!B9l5GeyQVc7q`fI@wYAky~+2 ziVBs82&r7+oZLgxbaN+{A)L{i>ev6Ay`R0;-p}*C-}=^i-}QYtN^>e@GH_`C5C(i6 zIOvrwOWnW42LL7l0I&ssuqZ5e!*0^QpCGnEiCs&;SbfY;zELn_YF}MA-h(aIRI1#} zc)dRfe|$7K+Orj`g=##BmhKEhKw{*<(8)nxLRf$LR@friXeYBfzjzd{kxs6hvaWaT zPHGU1G1+YGx0c#-qPnxt9;@clB{-Q&kRU8hR9E(#DZOAnEbgBlKmvaw>80|EGY)lB z#1Y-;xBf_v)#FUxTioeVx4cPHvTff0T%`&#_(27X`DG@0iEhbBU??7&$7w};o_;$& zawv67|3x2F8F$iMt>RF9!Jw&RR?+_cmo8<>Np1z>DL(cw4M*Yd3L!?5OAW&9z8=TL z<8h-bsw8F6J~Qi$wF4;J<(jYmPzPB$|3t=b=%8s6p&_KdBKTaQbVl!#-{nU9k>ldI zvP|72c5hBtQA&tZO=|XVti;c$l~**(IwP=$6x8T@T`6uS8AKa}XEu^KYTKDW2*_7b zEij**qfJ1RVAvEg&QZgD$9UMd>zv z0C0gr7$FSk%9Rrxb@S2MNGe+4PM_jfE6HbX7T#sAbyhusk^dwp-~7Chlh&J|$)_zw zMS*uOeteV>T-tX3-N)jt@Szby#rNqJSFwzGFMKA@M;ehRI; ztIkV`a*jCaQ*nWcIac!` zRo#QWlaWT3P_@q^p~tm(G2$O~)iYlhC5%oChs*9$eF(C4VMnRm?z(KJmB<38?PdBq zwt+-4=$6TU*48BbTBf)2IMp5@Xrazf*G@{amZa(R&6(*~Ij8ml6TiSjB^_-+{6ymLiOAlj6gTLc;3W0XwIoy=UL7^( z99~GKNqwRQ&eMqIap4Q}faKqHC!3!H1%5}rBxlyv$EAlpdN32P>h;m<+F{taj=V-` z*NRn3>XtCa&rYn8{ks>Yj|hF1Ht33;;n;7#H=v_P^OWl}^fgmA&UJhxH}lk=+0^Jc zu+J_Fm2+iz?N&%5)owSza@Pk)WhzbMo#iEIN~nzeuZHsN5t3^^CpzA}a=hPv;jXd4 z2b_L^h|zKv5#=c(3t~NdmY$OGE9L~JQCFOE!iWC4%p=7`tBpXCM zL2OVcDB=9gIUwfOXuIOGQrA0}q`u%kjr)yt$<;Mv=l6U|M~9>08M{o%H1$QW!G+72 z7fK#X+=(7Ob8TzD$W6lm<9zoHfgYSQXPo&+&O7i>7K^`f_poN`>}8zy>4~CV9i!xs za-~*v^wqPa7YT-E)r%zpBrX;mo<*sTR28|;WKo@@&L5z9De+s;m zR!DOy#DBu;H4-E8MDo05%a+BqCzbSgP*Yy0QCFiZ=eGtdl{4f|kL*@yHIUydcqH;_ z3qXr)wg|(UyPk0RJ^6P1b^e!CjtUcE$Osa1zQ|#v@o;7^Dv7_`H#QV&%O`t!q2^nS z#P#N?7JxnqjN&@n`>Hc3WzHpjY%DRlRx7$qdWy>bEN*r(r6a!9Y;4wOk@f`TT>5L`1YZoVL!t$tg-K*7Z)1l9AXDgdUm5F;H9exb-1nFP~6F_iH z2>=b;miOi3pO*-CH1(n#^P##2`Jd8WSDXiI{sGAKG8QGH@ZA!=T)?7C9o&H%0mZe2 z!WV#$1)X+GN6Qn6+O*@qmm?FT(Q2dB^1NN+rO++poE^HueC7rrF3rS{Z)2<$mnUZH zr)`q^h;Ph_>h4S9g_Qjg@+tB8^DY~5N0-n~GdIw6!Mghqkenz>>1+Al*weYOxECLQ zg)k_*>Q~J776AZ~JjgnR`?V?vDG5nwkZkz)(ZKhf@~s+hAyOL%j!+2-tMWDQ#sa_t z@&b25lPK)B1il|9;L9xQNFJ^p0Zk*MA*;fHg9jkc$xjXp1e85 zxC31D2X)t%^l$p|XaKNI)Z!5#HI#(r|8B(pi_T;55_cC}_Xy=53;f9YQQ&nZk2kq7 XO`hB&8@S*)1jW5i!2lotwf^@v7Bb;@ delta 1981 zcmZ8hdpy(YAOA9!nTaB_+USM39ZZf}BlneC$KA=gxQ)$hVJ-B+>QE;RiG@OPD-&i8 zrX)qkZAYS+mRq_^M9M^BKYIN-UccYx`RDVzUhmK6c|Onk{k(-5MQSV+NxFr&k~jjO z+w4@KQK-S8gcw5-vBv8Jk&jYJWVVT>(lx1lSGj{ttZTmz&}LwRz9-8l)hp$^V0P$I zmZ>Odq}QGsnM@rH)R>^mTfaX7gBE@5sTUjX3gjQadzx`_eS3BMrL^j}8L#iLQD(Nz z@RJH_qe41Jx5Ql~`7l8<5=wY@mhHsIq4|TkW{#u3+hJ-JeFQtJOUasMw};-|^+d!k zug-p+PDssDOz5$oQTJvXffI!JHpO`@1&KWGq!3=mz1I68(6qJ_viEzfhGY9$sQGQi z)U-=Pg(Hjnm)SSl943(+Rrj@pP0n*DfQ)0b84OU0Y1@o1wDcTS7OE@MdzwKHeu;A+mr zf@IMLPB#B=Sf@9~Fs!dn)-aO4vv0B2(QrqH3z+plmi1xRoZ?szO0OFGHu0D)SI7I} zIr|l<{^cOA>ehA9!RT`?eFw`O@B~*DbyP5{9`;e z@N3|N=tcX{?;qmkyfcvlNq~o|G`K^tAoq?K060p}QR4e(iU0uEO68MAo!f z582D*m<^BHKWIt8l$~88-O3%gbP^}La;)vfwY8`Wh+O@3J3~zjYPh&TvOgv9u)uue zbbN`&ahl&Ad!?~?o-*-7NeZ>6Q|UDtg$BFNbA6cCiYctUDPI1ULS!UOd|Gw7Qv#Ab zs4>1WH^fZ9dpz|HG}t9;$8hHHP1bULRc_b6@EBgNAT_;w*JBUAU3i7SJ2F3MpFxj3 zhk4popxqG9)mIb>Ckq1m9CA{>M}QcDzl{rVv^SNENEtU=u|8Jx9`6TTpZLKhRqMcJ79+=fHTaXtO887N*a z`1fFfbTiLe%;A^vakZ#Em3D)L-6-S}?YnQ*-XT^o$rG_J?t|(ZcZn^mhn#h*#`bna z(IzY15no#3+GIEMXJG3CkCW#vOVz%5#;V>3fUhvc!Z{So7|nLVCUr8qgkZD2WSnhJ z8gwN3I(_eMdACn}cwD6DmxN^{keu4^!856{%_v4;%r#{4Y9tS9)#<;G zxqjlE(UxYgfdO}(yGS{lrEQ%{-u=lEVm|w-K{wl^!^GiCnxK`NN z^m?BPYfLPhP&9Ddbcj+E_Vg2K3U9O78Yxs$%(>j>stWIrNFrc5WjWH-!~mQ}_VT+L zfs7woBN|F7iOnsx!wYR$nNXMDs=b}j#GuIY*#{Gf1+lfa z_8pNSHLF^=Xat2EnZSl)Qv%{I29g~1qxHKPrnDm4+CW9BMxFjmL-UN!-SwwvT$?;% zLg7?w*J=fO_>xUYE#=Wl^dyKaGcj)6(s5wwt*g$iInH=a>7~rQl{a^_HCw+FfU=mx z<*2%*x<)eVj=SXPGDQjMc^1;*VXED#RY8=oHScsAmBSy= zLYgSAK{uDpuRvSgEp@OPT*}vuYgW6mayMhyRPO8Ke7QtgYmZFRoAmV55g68hJK}$w z$1c-(s;_w8Ldwtn{Me}rz9WH|OAjvW0l_wqozN1{fQ(j!aj<;IZi`tU8f zOnv3c^EQ2M0rZ2edZ-Vbykk-g41j^(;!c}v+aLfSHd*~|&`I(Jnm;kyvIl@IpWF_R zG`&?GuJIGNEp`Cdy^Y$;T<9C}>i^=lCG`KemvlP?^?wiEzB>RY{ZGFa5c)VonO>lv or_Y1}0ES8qIYT&2rWkEy#)feou98w)1(3}}-u$sJxvkxQ07frx+W-In diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/deleteFile.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/deleteFile.zip index 91883e7a119944b5bb9bcdbebdb16915fabd18d3..ba82e9f6ba0e308e53d1b14bd831e82729624348 100644 GIT binary patch delta 1569 zcmaDT^;~+xJ60hE1`dY9dqYgti7?OPWMW_lXPv|*RUdpi>$ZbHZJ)z`gQINGDnZ<} z!Yq%vFD=`eoOttrgTk7n6Zd|t3XfgO^!In)li4y#&sD1;&ptgf^QPtPtlD?!(Yh~0 z-EwC>G!%X`f45WTEJ+`Qr%bjIS`$t&sNJbq_{RTV&gpG2ddYz*9P_@Ho;Hj4Sai}? za!%jD{j7Ug!*ti|2_FKC@?J zA58B3dr^TYDrR4N)uan?n-4uXkixXe;A;J`s2usFkPj?C=ix+WP;`IQ7g|?47E!$KrHf=IYnk4B@ureoM~JEss1Y zVf&^0O?3$G7sF+Xb}zp^ZT-tu9sMo$8qdAUQY%?oRbO4AKlMYcSMlw;FK<{HY}^-f7k=OnOQ^_VCh8nLaC-7koS7>U-m#lqX$nPJ^l2tgez>rCRRh| z=Gf*(f9LLTs9`|W6f3%N%3h$RyNr|jIArTja~(1e*u(ybU)%OIJBQq_6OMvXQQWp1 zmzJ$&%VMt7_*?y$`3`?UVq#iZd4!thzvwxt6WH?e=3ZYVeY~>rAZPCL!iLRqg{-ZO zCo2v({&v0duek77WL?%0k*h1$eUiE+U7^Y1?HS>zp6e}XtF`&AcxTv?vx;ZGJ=z}5 z;dzF$ezC=@%O{^7o&Sl;@6N?@51i~Xx=+pakh>LsaAtz&zR$%4+~=J84Hg84eK)+W z9ra{Q-lnAJy?6U^L}zbSNA=ilo2uAWMg|5aW(EdO7&)cpC1>O&7G)Rf7ndfbWESb= zX0HwM&3?$7)D{&&t~ zhw4`gnUsw`yBSycFTQwvosIOv>aKNy7d-;6SBGV--rEtCn4WdE@OeUPOPJccps(WV zZC(p&uqNLYVQvX6(ERq_`n}Wz*6JNB+UpPeyQFYX<;J>; ziXB0lqi!386+gPWOhVs`HDmWZk-7gq2L*{K#5Qg=&bsXR{)~>}^KQx5T)T&_79IF8 z=U2p_SB5D>j2NKt@}7z=U6%i7ws&FTTrRB z+Pdm?botv|Y`^Z8|KXT*>51YI@w+qUfBtse=|&D(S}O6W=8^Cy9;+qjG;_n+aI=INDG-}T~vPp61tY!-|3l#GvE5$p#Z&M!Qd z!Hf9<2M)1A*N&NrnuAKsn6`*u6W3$F$9J!eN= z?pyFG;*iPCJ9qQ0{ceA8bm~U`N&lDvyxBP(U1~kPmyv;igJp6)lgwlr4nMVBfA_@L z&GS3R6}C+wEn`D=z@Gh+#XI;JK+1J5lxq4iFfhDk04v|iAzkmy)odVemwnG+k?UU> zTJ`>H+Z(m@{69zt>J>Q=l-(z57#w6rq6K%RJ>{FS?9j8(xIl&&}jcXsm%{BtPv49cmjkTOI_0onSHt7fdCw9HfX__c?;_Q`! zrIV(K`8d^P@U<#sKaIT@yVq4d^UwRwW!sNkSstV$&@uD7$>K_>{`+OUn+)xidGvOL zt=@I7`;x`uP!ra&ZDvB{EbfBKHhh!~-@mi&{Q`}I*x5-9MXVY}|LysFMIlU0!e!Ac z?|Gh^1B)6P`wrHd-Q0Cx^QW-fY+-{_dGqJh_w@CG`r@5`xwqL!@ zY%Fl)aQXNC`opgL<@erAT_ad`Rv616Mx*L&z-ki zwmB};qD^mFaow#Xt?tt@ley1vPJXJI=eKg<`tX?bmGx~EEkFMH|7!kp_T}8;OY9=k zosZ7{X3#cSWg`FQ8dgwr{8??vxwZ $(@:%.o=%.d) && \ - gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 $< >> $(@:%.o=%.d) - @echo 'Finished building: $<' - @echo ' ' - - +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables +C_SRCS += \ +$(ROOT)/f1.c \ +$(ROOT)/f2.c + +OBJS += \ +${addprefix ./, \ +f1.o \ +f2.o \ +} + +DEPS += \ +${addprefix ./, \ +f1.d \ +f2.d \ +} + + +# Each subdirectory must supply rules for building sources it contributes +%.o: $(ROOT)/%.c + @echo 'Building file: $<' + @echo 'Invoking: MBS30.compiler.gnu.c' + @echo gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $< + @gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $< && \ + echo -n $(@:%.o=%.d) $(dir $@) > $(@:%.o=%.d) && \ + gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 $< >> $(@:%.o=%.d) + @echo 'Finished building: $<' + @echo ' ' + + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f1.c b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f1.c index 5e77893b8a6..eba1ec730fa 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f1.c +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f1.c @@ -1,8 +1,8 @@ -#include -#include "test_ar.h" - -void f1_ar() -{ - printf ( "Hello from f1_ar.\n" ) ; - return ; -} +#include +#include "test_ar.h" + +void f1_ar() +{ + printf ( "Hello from f1_ar.\n" ) ; + return ; +} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f2.c b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f2.c index 56e2c730d4d..f37980720b4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f2.c +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/f2.c @@ -1,8 +1,8 @@ -#include -#include "test_ar.h" - -void f2_ar() -{ - printf ( "Hello from f2_ar.\n" ) ; - return ; -} +#include +#include "test_ar.h" + +void f2_ar() +{ + printf ( "Hello from f2_ar.\n" ) ; + return ; +} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/test_ar.h b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/test_ar.h index 55e38f0d5ac..b41ce20c434 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/test_ar.h +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedFolder/test_ar.h @@ -1,2 +1,2 @@ -void f1_ar() ; -void f2_ar() ; +void f1_ar() ; +void f2_ar() ; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f1.c b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f1.c index 5e77893b8a6..eba1ec730fa 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f1.c +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f1.c @@ -1,8 +1,8 @@ -#include -#include "test_ar.h" - -void f1_ar() -{ - printf ( "Hello from f1_ar.\n" ) ; - return ; -} +#include +#include "test_ar.h" + +void f1_ar() +{ + printf ( "Hello from f1_ar.\n" ) ; + return ; +} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f2.c b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f2.c index 56e2c730d4d..f37980720b4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f2.c +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f2.c @@ -1,8 +1,8 @@ -#include -#include "test_ar.h" - -void f2_ar() -{ - printf ( "Hello from f2_ar.\n" ) ; - return ; -} +#include +#include "test_ar.h" + +void f2_ar() +{ + printf ( "Hello from f2_ar.\n" ) ; + return ; +} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/linkedLib.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/linkedLib.zip index ce01ebc6dc1f7951188fa6c46acc7e4a4b5130ac..4d3e311b6e50658564d562bc0c60bc687fa02ac0 100644 GIT binary patch delta 1068 zcmbO&x>aPuMV9(q`$9|@kN`K3?Ub6AoROPYlwGVJ;LXe;0ug;W=`tbpxEr&4gxiO4*wIodABJ9an}lqDBaF_e66c#iWpO4!KJlp zR-Z3_^)ltf{`X#G^)c4Dx2E4YUHj(Exp#MZ+}7`oNoNU6|2i!)&`7iXS9VCo3|GFX z6C@5eHD3~&!2P@J!umZi$4hG#dfhB+QK;CRDlJpdDzuG1jk87mK+Zw)(E883|w27?oS{(W=cAC)4Pkx8inl5VmSn_X2M}G17-Cz8?vI-qQC*$u`zy7B9~6JwNp#*S@SfVe2%On=dDQxv*+!yRc)~8ICZI zptsxSl%H8M@rfF9i-N0S>n(-&&U&SU>I-)_Pg+;p$CbIDLeU&HthE{(mO(OZQI+(UbGL>bKZ8o{U>GMa7I=)pPzqKE;E7KAL#%Q9t(4un+)@E_Ixv-#G+x209Z@=SmEcv4SZ;JwKj>M!!-qs`t(mz%Xe7FE9q4&Tp! znjmy9lxq3`6T)jC7G;<$$R$2GfZf#8=)u!RPd|Mu;R@TZiPg}#Ikx%H-?@7nYS47& zT)8oIAy8)uFi8P*Cvu6`ukAm`)odW(^1kuUVX^aHnYnB;M6&dCy{ff5e72b`V4LLI zU4K8s<_oh-Luxhhvam@qF3h?t?nnB~0t$KH(= zkA1fI>PlJ2G;Tg^|NQyXO;K}JRqwRADE74UY5f0By?Jc%R=F}-n=aPyd{ugoTfjA4 zQtsFTPAit)ILpgND{ZZwtl9b0HB>*7f7-FfZ@4G7a9pexVc-I~n}Gpa?g2|M2mq<$ zz-)q&ml&Bu7;xt%kVZxZ1t9qWRU<5K1$aXZP=@A5)Zho{hnet~4HOyLa2-$$s3DH5 bp>A>lmxNe=H!B-RlpP4q0%IkJ1H=OWT1%6< delta 1247 zcmdlgGFx=RMV5NbngU}6B*4ue%HWimmzKYFcJaD%g}m4b{#dlOU%2|GzdU zF#C4Bfk555ga048F>On{##U|2Gs{HsY{sml?ag+)H?59GrJS7n^uWKr=gPb$mECn- z8LxA%AJ#0!(aLDaqXREEfV0>$|J_MrLe(i7k^7#dENc) zrFtRi0usMNKFjj$3G%+Ke%Vwd{@^u%+ne?W@AhicJXjyfvG!$7qpr!Fpx>Jm1*^D& z_)qSc?8UI1qsc2vC}iPL;a!Kb!`}Nf$LcMy?VtHaTr7{}RM6vmj^&B3*W@Hf=}jw- z6shg;`_R7N{X(%#HK9sduga-#I>wsM&2G$QTvmK|=ayyfmTuuVC*e9_ucpW1i@L0S zF7I|uwF!T6_0`n>HPVwVDh1B}9h-Ur+{G3TRT$^SJ=-p^eubZO(v`twS^>{CvE zd0y~wZ@0IO7W2V9%isMiV-`NB-<(|L+FCxvH^KJ&zM8Z9eoahd7itnTys~dyIJDqhX2iBVx9;ery-fb}>fes# z^ZqfRCIj6IrJBCLMDZGkMNyMMeo|Iya!IjXZZ<|jU^yH4|NmqIcGLP@fA_@L&GS3R z6}C+wEn`D=z@Gh+#XI;JP;IeUGv8u9(1s*Xf8Ld7%s5aO$bGpiHzI4u%#y1)# zH7t2P?>o#nSLMnFBj#lRQ8RQHvz&MD*!#2gT-WjpF2;7{g0i2_|Lh66CbIlj+}d?( z)@lFUxBlLXv=0lf9$Tm+efD?&|2?+l1)2{NdFCx}z3^hHajwqw#m?uB=<2^t^Q_)r z(zTgUe{vAV#d>jOE}-ui7%;OXFIb#`L4e_a<8feCL&>D9kW3m{!2k>|MkaA)T-g(1 z3NY{(4m7f|qL>28to4xG3N#LsTd^638qLVYaj>HphaBm6%tMV(4`c)9q8f-CzbFQ> SvVnqz9S9kj7#LbOKs*2_bkX+! diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/test_ar.h b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/test_ar.h index 55e38f0d5ac..b41ce20c434 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/test_ar.h +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/test_ar.h @@ -1,2 +1,2 @@ -void f1_ar() ; -void f2_ar() ; +void f1_ar() ; +void f2_ar() ; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/multiResConfig.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/multiResConfig.zip index 3155d37b6d38ee498e71376a71280db93c0fdb09..dfee95a1f287ed7d2a01d6117bafcefc9e680b81 100644 GIT binary patch delta 4452 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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/preAndPostBuildSteps.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/preAndPostBuildSteps/preAndPostBuildSteps.zip index 3504025ef12e3d3461b0251ebf223e728c7a8554..f7b18776f7ad47a81d3401b5756ed9789114c980 100644 GIT binary patch delta 1670 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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/rcbsBasicTest.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/rcbsBasicTest/rcbsBasicTest.zip index 9f9fbc8b7a9692565e31cfc219e47aa4e49ecd9e..1d19b4f2aa53f7966006f522d0e118da2b202bd5 100644 GIT binary patch delta 1385 zcmeB?z979}16w@<0|$e*Td2tnlYMvYGBPmOvoJ6SGcYhXrRF7PDd+o&sg0bsn_TlN*KVHZL(AzWLMrN~Y&+K>%hP=FugPw`LmzBxvMP6cvkjTLg8#U7(FLw; z@%vY09FBdgV-VVy7xO({dT;LaZ5)2to)g&5dh)N;iIw5}bf70;smj%VCwHc#wW^p) zDli`Qo^7Q4Lul>oR_(-t$WCyUF$V0B>d%5n$Xy zQiSe>QcXV~@Ac#Z9D#;L51u}H`srf{SJ;M4tcK3bvCWVE&fVis!+@$O?ee$tOMsfv z87BvF%GNt_9WoGb{oZ&daY?pq!-GY>n*&&uZhhdSk!y6z;kJWOU{!VU%R|gx4j=e^ z*x`Ncy7I38t^E-cF(QR^D zKPPi>VmqIu_G%q_vCrGtZy$a5h8xxW`cInYYXP&tRVD@o5r)YLykhlhC;59Hb`Usv zp6!$DypR`;LhoH2qrX0IJXj@?vU#Qo_e;MUbJu>my?gd0r)d96mb#yxozIuEo;k<- zQ%+O6!k(a{Ew6t2UYw-5yd}$I*>a(Np3_XLdSi~gGIpQW%Tmgl+^!&Z>e>T^$GZ#n zG?hHzJap&yB-7U%r>-4$2?}7ne7!zGJ3Zv;WcPWx`=-6`R$cf0!_28qdoNF&ubuye zy;9Tk(xL4?Pp^C6@jTGq!{4j?!@^a)%DQjNB3Shejd}jE=`Bg+-L2cOQP+ljdGaL= zljy=_Tuyf9`^3%^a7|4Y|GvcfSdF<(r2XNmZ{sST=3n4{so;4{P&I0^?LBT@Yk zLa&6hnk_V0cDFxstJ}pz7wQ8RB+U6S(dz$IlXcZ**M8{LEuHJlZtiP%ch_HVU~&PY zpMfD3Sf+p(P=XssBb6zWySQJ=!%`Z0*#pwT$e=KJ3XhU9Obt9W0_8+O3V;Bp21xFh ze3M53ZWbZ|qNtlJ!K(r{3pJ8KCc(@Sm>kb5>C4C@!hqWs5cL8;DhKE(BtHdsv$BCC PIe}0Wn0}^${LBCVrg%8Q delta 1248 zcmca0-6OqW1KVVFHj#Q^1_lPF)V$=3+{B{nV*T92?9{Z(oYb{J-r2Vu1nk@&{5Lqt z<{7ZE^&U%W#73{+M-~x$D$6%T^*&h}zWdcXtqb+{FDl>Q^W{_B>H$pWxdW zD<>)~@%BCN;n1=(T>G3~yPbJ=^vKL|Hm?&$)&5Rw|FZA==C|h`8hqB%oA}=JN2dRs zO}ErY)?v%bZUd$#ZWzWh9S;RU}N6Lr>RdUH3gQt$fwCaZXNRG$3g@bAZMSO4M;@Mh;Y(xmr! zA0q>UD9hyktTK}?armk2`nxB_Zl2#kuCQ$iX&D=`1NQ8nEZ)J-08*}dp;Xfsm>ga+ zfRzVxO4lFcI%L4p_P%wWb4vPmhNkw?*N%cy&Ni|;ZZq3;Xq(e)t?KI6Hx9B#D17*< zs8Zv(DX(yvgV+f^UdgLp{%)y#*s)IW$_EqMWdRWqx{O)Qvv=(MRe$c2d+0OKH{TB2 z{5k(<;X^Tg-}=Lz#&oHZF+3s;;t_QCK|7=eV?el__S{Z%=NPeAo2B zt@G-t*JZBGww9_X0k`|S?ig2zP1sl@cUOJBy^sX+ZGK0ako*IV$Ex2}FlU|=ZrRyA zP4_j&slENJOBQf#GrpmfULSgOqWiqHcGuRgHr31jFmLM9sh6k5Yvq5HuGBQWbYS|^ z%l8VFd|sixgneoBj{wQn9^AWS%?^66;c?#H%$*r=HjimTE%W(p4 z(`0KdU$4~KKogBG@+uk<`;9#H|9{PRRJUdC*W5q;zgP5qJ5+P(k2EOW>oQ9!w1COv zHWLHGfP%^Md6bl4Y7mJAn9g7-!1T(=Pk0pIX2Bx~ zlpYc4CM)x*1i;Kfc8CZ<4Ui?rg;GitmnNlT7U|_?2Y9oxffRyFcmp)KiyOoP00KA^ ABLDyZ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/singleFileExe.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/singleFileExe.zip index 47787cb0b8b03d58ae2f27e1f3b02f6a224e9cfc..e671d6792e9c72135caa43d75b8c2e13d93a3d3c 100644 GIT binary patch delta 1466 zcmca1u}pG<6{`>f0|&!0w@{O3lMYGTWn^HmXPNB7DqSC#ecM2wZr#EE58aqL7k*=_ zHs;Ave|JrHrT3geT&;^vJa_5VsoWH^tA79H$!TSg+o%6>wYyvX{ci0qx5eB4#-y_Z zCYPRE^T6j+{68^KsWiiOCl8*4b&i?bGq`{EUC95lv+wl}r^1_0I2=FhOR0WS(JHjf zcil9BI;P;J{4TR)^@U4WVjJ!%UfE?Rlf7cb!jG=5-YaxDuBw{%POvm+o)GNq%Ki32 zLjSu6*(tyOrEWgiDtYhaS^g*A7)oRVHU4m3{#YVe>z#J`=W~;&lzW!bPfWS)ef?So z*Rjht58LcKY4iTh>#a7iyZKhdh%A3BYMIgcYe(I@%Wa{_*$GC-1)$v|&dV|Ci(ShZ67pKW%l%yC`9=^7Wj5hW}X9*js~yZpf6X zR9YFguzWs#`Rb+WG#UTN?@zudlRetKq_{1TwHbjHcI*=6e;xegf!xPEWElei?? zw&B4d-^~FmOSe97(#SQs<#5}05#Va37Y~LwtH;7`o(q{It>S@8TnJZ2^P1#`2kUqWsoFDhe-6B_Y&z>ua?68`C zy|td}Q*R!Vd{nNC)~1a$Jl3TTatpZ9h54O7u;@0qt)G**II*42QhT+Iz1ZjN?6;3T ze8Y|E{$)$HIMf4Ez9aMG102%zL9yAl9RzCn9R4SEz13KF$8>_ZF#C1Cs3-%@kIwNt zj{B^=-Iqoe%j^C79_wjgQkkW|?v#|4o}L%J_~P+-HqsBXyRJ;TxN1{o-y)-PKa8Y$ z=jQetkv$mLa?z~r(JOwt%4_Nuq^`XU=FynTw)95*dz-BtTRGV#u6Q_!S(DF8uioH- z;SIIh88Tk^r*o5;KIQz}Qx~=FV`ZDK+SBRVw)kn4*ztGISFdSU**^Vz`S8yXb{;MlY z1J2p4`J$x{iXARsdSYOR1(r)-29)3i(!j)-oROPYlwGVpIiBm0JS-6-$}a{6VW@gW z28GE9+)64iHRuT)qztGANIJ1k_GcHLyqB8;t{9Q5A-Mvf_%QqA`|RSAcsP_{1|yOX x0|O{uA=J*Atj#0o%g7|cfZIzD^#VZ38>k4$g8|;GY#>QaAe3QZU?>5b0RSD{RX_j$ delta 1319 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 delta 1829 zcmY+E4>%KO9LMMXYBA1emRcJX@+T*MqinQXi-t_Hu%ZzrMiN=tMkZuKI`Vf&TBL6B zC!@Qg$!WMkP7)RQJ8oQ9ySclbtM`50=Y8Ji{XWn8`#zuV`Rd z!)(w{zud6Qtu?qOJi!Z9=c3kZ^}OcCp429fE8T6{z@NxRk}Z#Q;Z{qL8fR6|F@lF0 zECmZ-!C|BCjup4*HIBv{pUtGXb~0>J!x8 z&UYk+r{4~ke$H+Z2QEZL(cxF_(U@s#u1+q_4$xNHkh?Hn1y9}R(@oMpChD~O^r*+V zJ5Ytun2caA&o@t5yUr+LcYHd(C;I0uHNm+PNkHS5yqv+bO(LE6H}AcC`fU$lI3(Lu zUZF6K?}i^~N}D1Oi1^_7GvT0_?63}(`Q3BZA6LAM@5IdS$Ur1BaPfOpT1}q;=NHk>GPb5Y828$lRdqF>ZNPu{h@VZ0C{r?y zNS(9p8$=>zDSD59pOL`17Sjm0UU3%6JAbLUbSwHr9b-!0?{#-&b;rbSIdx`Si5w2A z0(@}EXIHlz0DxBn0ItK>&sE$E8YRty{e^CA8}YpDXM$@(am{@8=Br@9y4*wH1@~bdK=rGxOvdwkzh=%lL-ek`*0WBdGbW<#XY)}&DxD^cDFSYPmlv= zq{33vod3>2MA7e15o{BTs|d3S*;8A?T%}-;BXXbQ*R8NLFZeafY*fkI%dDU_?4f%8 z7w}dok$KCYq`+e$zlx^0OVyB0e_vvj9M!V#heI6SNce`&%RU0jiVARKD&4VbcDie3 zHoXJBdacgf)RTk9R0sCmJs4CV`W}|vYgN%|+2&5~u}XY94ep2Q2CGgrLKHZC#gG(f zuV>ov`~dY-m|Gm;SByZ3s=NZk3#?#fy}k`+kF*;2t|hKCTzK+9C)dZlAm!nSQVwPd z|Cj1?@pmQcPWmEiB7%dPn6W2F271A#`dV9B;u2I=;n5DlRq`J$UbKc+7t4^JEMGy8 zdMEquj(SqNS!?g7UwQ$v?QdL8$BmcPS3_K(K`ISJZ-wOay0QkUyCs7E%5Kv83{y~_ zu(@fh#DNmV9Qsv$&0{DscclE-VU&GB((M-X+S?uUfZ{M$VBPnn=J%N5Yh&3*-`g%6 zcqgSLvo*JM^%NWFI#n)CMxq{!p^M(-6-0HI-z*wEb>QKsDsy>xZ5VBjZf?O+%M$MU zQ~FEhUJl|G8AEE&=o;En>wJ;&I-a~+A9=|#G;0d$c;q1f_8YMFdJn?tnL{p}FP4rP zb2E@SN+X^4J7Suab5F`8L*o!uw<0MjCBZ@;vo&p&|kE{k$WTigs_)C87jL}q70X$*rTeag07(S z@7!EC%uHv22-FF6V;0xaue?6WJ^wPwYISjKZ+yE*aq+H!8!Tj4H^K@}q2rA-H!|GB zqYLDpSFSocOnzJuQT2z}javv6Cap08Tu>GPLDPo_EwD4+r0 zLDP#(Eoq&e`Kb?b)wyFi&5f2zGzziYJ$TD{yLIO$;Pbc zSQ(SVf0(elH^s4QRj1)V01%Lki?#T=muSj<)_;TDq=wY{qWQXkXnj%qvsbae+eu$! zUw_VTWwt;703Ad=9UM-K3Zj3Tk<|UgA?EC8a u>}s$E`!g7*n<@F<733S?W{@m&j&edaLfr(Sq`ZE&Q8o+Z0RW=v`sr`=_$&JW diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip index eb52f1cd66ca18fcbebd988c2cebd84185ef32b7..d2ab430ac8bc009aad039ba9013e36f2f417fa8c 100644 GIT binary patch delta 1994 zcmZ`)3pms3AO9^(+cHZliDnbIEg`jJp)pG4a$It0|3sV1Ot}0KXC zWdgujz|zadDjgJ=RJ;ZNV5$JH0RR93B`PG0emsU2yOVyLMxlmBQtG|wCriu`U-0^0 zx=A&c%QrTVTN(BO@4SIl0}RwLkauuB$Z(br8R5$Nvb@!bf(&apB+263mWn>%FmGfzBR7+HkzhiQ)csa;9 z>%3N|NxY~hh|3yh8ILY9u{idDx&w6MDm@N{gn{T6h&A-PaGeRSk5aH~bS_fQ_2H#~ z0+#@x3_)7BEwBhAx^^^YJ~_EXU|4>waX0_dfXzhCw5})!emlhrA{X+qjT!{~!oJ%0Wt8!8Ao!48sTILfvw;_s55*v6=rOjSYmyFFA zbv?)Z%I)&B=v3?J#i?1!RrDa^Kd*Knz;!v#oCnwp9A@1_8Lgrrl=Qub_4Ysz) z?~-?J!#nLo_I7eCGtrtQJo(941mcAW=2ESvE?>Zes!R!KiD(@1_D`|Ynj~E3OCM89f(Pk-nlEln zel-l=6-xW%%-ONH>7*|lzi7>IO?#MC1{P+z!kHbpJNJZxUFQ0b|oHlk->?S!y zP)`fXSCTi9x!E|V@AW1X3kMdN^=5^8$NmEFeGo*T->3`%0KpoL2~3BXN1}C`uS@%o z_FvWfQqAY{d!AyV$IT3CNwz_(1AXZ?w+w-GLMy)}x)oYz`rdR<0Ut^%)5N@M8&ylc z^-8^MtT14NGKM<&awbVI{Is(+a*%bM<-iAN*MvGTB&RYQQk*@jAf(qaln$Z3G%JI)V9AF7g*Xgt~X`63tMNR+Ic(nBtAOZXf!f*=iph3dw8+q)f}%26sC*r7t<=~ zJ)h?Jx8eOkvB^Jcca3a_XWuY%lJ~0zp8=^AWh}}Yuv_i!j#|<`hNjIzpV|nveROzo z@W&RJ>nvs-z7*xL`zpI4ePw`Fjo30pGcb+SxA6|c%F)?*oH5we+5Xr*!|#6xC5zV# zRFsL!U{2IJ9p+fnb9)4XZSb|*+rG3qz#$KZ)Vs$sx@5FgdtT+C<-$^4F`3rBUGl+( z7V=1+?k(^m)P;)sORYoO>qn%vZ6hhYN9VYvA!1UV62!RjUjA@8+N~P00iJ!hJP~^r zy~NQan{NJWdmsCl0ydK;OPl;uQ$E-`SyiH~-4RVpDM~|v?M`~0Oh*~oPLbE&9!sT` z(-z+T(&!rk>wpJU7EzB3xfTy?EI;?m>ruy~HBL0O{Je1!o3L|aA%=eO;#Z$w+%1dt znCSCIvkh+wU+{<(58ewi-_>;P(R1@c%C5v|EPKgkyLJ2Ua}&=(J{Q^ox~biKcO$d z48N{N11~yNOlPM|6#u|iS37%pI{09FMt8M~kCd-Iy?jmzSy|4sVfgJDa`lwu9s@;Y zFRb)O)CaPvHc(ozr;zzXmFPZ-#Px2ZdaJPEz71_7*3l5vi8I4J zT9y6IBV_T%&t}AIbB6*PH1(?LiD;O<@|=?0PV{HgR9Jx!V*sI4WP|sk&!ctHb)&M= zz*7B?Yn~Y@g@x~zh=W}7b!4?=z5{&U&rG`gGE@vSr;pCefCP2E=0)OJoKh20d2Z?A z9Tz8cU8}v~z&ekBVQgGMV1dh;4o26n$6iIadcxOw=GQ#+dh^!cN=5UG=*nFOnzo30 zm@y#9avx**-ZsQ*tXTMYsMXwEi-p8j8$zsrNdw{aDqXbOzN=0iDGp_-f| z#M-~X-^#*2!JA+lGnl5S$6?SKB=D{Hd}9gl$LY7*NgNqMi?oXV|1Vob0{}uXp2NQr VVvoZr;8hn?(ft)9R8n8v{SHPLM@#?! delta 1843 zcmZ9Nc{Cg78i!*Ekwl~!vBefkr#h%*6s5#k`HMw9Y>h)8YoWx z0RRA)`-fg6QwR~kmrqa#!TzMc5dTK(L}(!fo{*)w--*p4-bzIh+{7zE<5@EDZs?L_J%)pO zr;0{k{#_gPg`Rta zveyFJcJ=KXqZL)_HL0vPW!j?G%k;C)CA*_C`mWXbFt7Qm0-492Kb##`p=107kLzu3 z+WqEjtxE9CMSxcW?~Lu|n-U%`+BWM}-*-gH zi=R+1x$x{S2?>ll!RBtSKCgHODBYWjo*$t9%s@ssLwdAEz^>*k#Vv9;1s z;DDaQQo*S+4jz?6%MFG%J^M|Z5b~5q6qjozZQod0a3)WE^4J1QXXyMr#}ZUx-c;uY z4eO~t9|$N*KsIviX$E4mcKC&tZu1K?fz80$OTG+I*lXV4Vrij>3-YO1GZg1;GS($V zY8rcB#1o?VyTTfJ1on4wL7Ghtj7A6B=-zgiMIA#_(@OBObGRS2A#W0G{_K%hr$siAN z?G2LKeW;LdWl;roWdJl9tqELmxhgL%L*>`!XTy_cZ>x_s<*bZXG*T`WZfjs8`U-qnclo!!Xf~_8{pzB+Pg;c2QY1*m%=0DPMPt3O zKH4P5<~wf?kbnWYS9H_c(W9vLxmJAc62+BNCHv2+-k4iA)t++hjHm4*Ixqiu{Oy-M zaotyVmo${q?~E0^ysHWNi)E+MW^#&;miBnc>HS6C?j2K+ZWxD#J+qL;MuJfqgRAIu zSgc{Ckn`CEg6XRG?>-0BRVj4Kp|A=LHY(yNoq!|X^7ChX`f;9CKA0Gfv$$z*; zy7>Rfewpe=42;mE1Xp7z!4q2WJ$&+hXXa6Ae>UUsAJ5%JTh$w~Rl8tcbwH2R+an(n ziH6>LyG~JWrOTv6f3=|vPpwTB-(Ol9-p%jUGtRRkme^J1l?NlVhwfK+00=ocs8s$Z zF3*xI6U^2t*3N;G=m11X-b27mVMV*M)fQ?xF4{jy9YedNR0&#@B}tMw@~izSqP}x| zU2E>RtAS63*OUT5Z>8qzunfeVC%LPjs0j@{` z*+E!e6qM@OQ`|m4x;OLSesLC<`PG<5hFX0PPA6hTnp3OP#XWh(-pT4zVGHz9%~9hd z^W2=f+O8O2kLM0zB2b2{FK0lm3B+$mWdc2RDODyWa^(0&pPx#~PKT{ieLF;~KYGWS zymJP<6r$7FwX^L%8msv&zsF76Ua5;Lj`fk_ARH~0ykbYQnoHod7Zv8{Q>%L2&b0su!<7M=Zo1dt??Wg zlTNa)$S_<)%ayYueX_CyX4+@;DzoFTw-KO`*ZFvD#PmfE-{cwc&k8BtxcsN9)bMD_ z6V-u=Ti0!w7p#i|ZkBP4l1A;AKgdFims%~`0(XFi*`vZf={p`MTqFcIaFmZ<9Pmg) zOqx#t1ONf-qr!B*D-Hl0{zCsLh8bK*_h5%cd@mdWdPG_rcrY*kAaZaN55}K^9d`c$LO3a3 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/test30_2.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/test30_2.zip index d4f2235c22532736a1c86479a6d3bacc8652c540..fb92eee703a6b71e5cbee28305b58c66a4661e23 100644 GIT binary patch delta 1061 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 delta 1318 zcmdlb{YGkoFx%vGMv;191_lPF)V$=3+{B{nV*T92?9{Z(oYb{J@3U_k2>gv{{@*Um zd86&-?>q^U!aHk~bG;@V`nB@JHOq@i-t$zZzuo`-r@KegHOGbjlwQAkd2e^Q`OKO( z&#Q%JZ1uZ-rgM_#PxE^Voes+st!O#IA|^GZtRZHHf6Kpuy8GR&TB)Z6>nA<&KFfFG zGnZ=2^qBh&zeIg_H?G`eeR8T$32R<|LTR?wmJ0^XpIn`NSIBZ)Rqqb-;5(yGptW+v zLR%@D#nSQWUmx1s5Q~{H-7xmgp-a3Dftr7KADV1A*TJ^zq0;`_E*GD_;IU_`={nl~dsLgA-zZCim){e*N>nuYcmrleDAccQ2nP z{y$cf=U~E#t~Dl$lb^V0PFy)9;iE~+eHZt0g=;Pw{GXZr{r1h8nZn;s-s=A0dh^M< z-><$YvPv<05zXY6zQqwD>%Qsa=Bsa$w$*vuj}a&r`N9+6&CW5&aLJmjj0_Clm?y_G z$}ovCOg_&eKG~VWRBhMaJu!Ck{0?%3ZBt0g*pMBtXa8jJ4t@rZF5L^In!doq@R|Xn zYw~IiwffiW9CE)-I0jBR*2M03t7L2Aw#JmjU*7jFZLfNN=+GI1HwMzKr}@$akIeH4 zpA?pQoA0&ww+!z?QuB5l-ucL16DqY5cQchR>mEb+wEdYfMZZ^lazSIlhn2>OF^6i`3jrySVBz zE+n1MpOiDd|N6Te;c1)oL5_ALCWm89;+VQ zE=abr4-jybuMu40y~*sxv%VUQ-{0?T>w7rQB}b#B_}$*;PgMT?`(L+rN&jbw73Z2K zR)(&1UAVTa@&cE4@JpWQEZ&S!GdG;S`hVShs{pQJ>ykd4Sj%+u!n^5xSuH`;y$&IT zC)qvCysjBvFoJn)h?X`!l_T#`BxSuWGNWFS|8>gCoUi*XRy*qbDtt5BNM^*dFzCWxvmEPuktZc-Q>xFyb1v@^N<}Sf?{3+CrVjYT$+@US)`Yn9pKH%22#ig NggQ(N3|ibE9srzhGNb?i diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/testMacroSupportInBuildDefinitions.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testMacroSupportInBuildDefinitions/testMacroSupportInBuildDefinitions.zip index 18205095c1832441d098cadf4c61f0dfd45e0956..1e8c53bf5f82cc0afd4e747198ffffaa1411c231 100644 GIT binary patch delta 1443 zcmaDV_C{<&GD|%J0|!HDSg1)@q;Wt$BLl;2W(Edf1_lPF)V$=3+{B{nV*T92?9{Z( zoYb{JzWz*x0=BzP{%bd!z`%a(x0+f*hRVeL163bVcD-eonz#Gqxk*3X&(&SA;9|vw z)nc2a5ss0;tcSD;Oj|47 z#$G(JO5lX$;R$;uuepA+OSoRW>HDGViPB|XGtGtTn)h(o`Ej*~`nG<_3!T37v&qKA z%L?zzxRRLQbVz>IX8n-DFWcXV+`4pK%a7&lu{XtKNBZ=FPhHxq*9D zU%(-6UkRs0i5FQkMCbnbe(+(><~16(R_zHb*vXV$81gT0+WpJ2uVrs9S}E_lH@;rz zrSw^@YhQyTMV8psi1a3GHD)pw=ia=T#kR>syXV#3#~o~zt7lo9Je~XYq*MI4eW;$& zQO#u!PY3$QfO+y=cA5IX>_Y|ub#V*-KWvk(mAG79_+XB33$NpMjTRHz+-+vzlTOe1 zUpKw$(7n`!TOR)2_iW#Lz2<|Z;q!POSQ>4ewf3TKam}5@&g&($Z`@>SH&8D)(lGUD zbYOht)5!M=Rvp--SH$pEYr%=Xbyk`o+v)vvQ`>ermR!$Ngi9)IH^bEYUZ=f1tViz`lS z{_j^jKdHyjs&;oW@l^^Ul&csgy~?~luyI{a(@vVtOk3z&u&7}f$y6fgr!2r@8m0~ts~ z%H%Z87xJ)li(d4A^e{3gOwQ#}f)`Klv<;L4B~uUpssWO+Y$zt@CuOB3mw*y&fHxzP z2m>N}pr>?%5%W-uK&1PC$$Z@GDlm5fQx!B(F@TLl7*NDM`60WQKg33CApi*gkOl?@ e0U+k)L~(S0H!IKy3=Et=sKms;U;>n8U;qH#;XMQZ delta 1333 zcmaDO_Ec;`GRs6Z5hh`V$qrni^=pH?vu`^H*d2fH-{2^lcfjg$M}@Mt0nW10(Uwm{ z!gecHzrMO|m$lKC`{gRy5t*JR6sx74eYH(e@aQ_ zmDZ#81$q}d#DyF5iJg9H*SG)J-hX`OdI#o{~pd zT*VKg-(*i@cbLa5_apzS_0rS#s+WoN)qMFATQMWXCI5!c{mNrqOC1w~^Je!gzH3#t zGebU0CN=iY9>>Zv+xl(S z?Yv9o`-S!j{O1nvX6JaW)>O5Qk%2*mg@Iv$6q6{!$pLJp8oU1PiLsmKcaSS= zn?hQ~hU|bn`zMQc@H2pP>0T(+^kraRcn!o8r0PY1lv8S6az<`qQFgI@aeir0a%!<& zZuZ)KU#?~Y0k`jscM`i^e`9FX+oHw6dUSrQqsh!`4N@Lzy7%_2-0^{d@64mxnlm4o z9^81S({N$pJgcBZ(#N0vIVS1ruJLfG+a8BCiPu;(MCaE0{_ua!(#m^bPxm&x=C$ZP zRODV5^d{hwNwtdfHR)}Y!Q#Gqm)6gH(wxTlx@sj4*Cn}qU2Gd}Nj9#Y+IljwNzQSR zsN2_jWe&}ALVZQjpH{s+saI$Dn-S!tw&qLG%YgnU1_s6ismVR;QuPP3m<$DM%MaGi zNIL4g^4?O`ty&zqP2VCoZoYZ3?Cx2elP<6Cmv2g9J%346XSR91@%z1=+pBLcpIn+K zG&Ae$wHK?b?A~5jc)f=;C%2V(hM+~#fkU76Zpgp4KQurjAy(M3p^P=)$+zm)E7|l6 z6$}DZr`Spgdg*aY(3;>LExO@){k>Ov4l&Hl*%-C*?5|She*F(KdD#v-m~IQ(<}%@z zuX^^@h<#_zPf?t1rV$xs$QITs{;%IELXUOT){jfJJ(>DtvQ+KD#HS^_TJClVR-ucI zf4lzu$lW8$6wiB```$_`nzngun(Do%ck>s;{0<8|m9Wm2Q}J2r*Gmn51Yb!+Ojx$E zzVAVDk-C;&-`d-b3tsd#OglIsIsdbUl-14p-7i(8l_xBz)_mkwX6_a&^ksSa(vz<_ zuHC=iG3!4xF0|!HLVW>%rN-OU}Mh1o`mdRpl>h(808pB@kt_=F)7`0u|WrCcN zYnND=LG=3ayQ!X6>hCjJi&*&O!6k-^+@Y zvcxv6709|fgDJcIhN1J*ZducX*AzmgpOIFyG-y8185HO&DkXD5_8;H2*@+uY?ld@V zIQRd7L+={bDSNfrCtA%rwmJWzQe2&1TKLTJIFFQ5(o3?lkMJG4eDtuF6S%nUE8S1w`=3w^2{&Wa(BCJi1Kc-c~#%^=fbLG2M$bd zPh&Z)y7SxdbJ1znJjyOJwJ5me&HtjhGR<>>>P@+_YNuCL%Xdte<@GGyxc}Yz$SHOu z{MRjaA6RtBAph#^k2m~!E{NCWx$coZ)hcj)bH6;3<`p*I4Pm|kUlx=GHpGXU1n}+K zH-FBn`~Lr;7;M*teXdnJE}}2-uipQHXp!gc$Z(g5{}(Ui^!av7HD#}*h0nUuY$2gD z^8S}^RENF!zEIdZ{iT-D)9H&XKKH+9o~?iKYb=L}#fur4*UPtfu83Nz&@FcIYtgiO zt?Tus)#|-55AbGY5n+Hux$cEhO+O&-H4uveu~TYZaz<`qQFgKZWDO2`L!$>zA3go_ zv4ksZ!zNZk=jPbvM}Oz;aj0QHHKu;)`PU19+EW=PFXxc0_vJcdAkg}qdFNq|>s1T~ zUH^-TI(inWPcf6sU689VQ)BPmjU^8me}gaz)6>~^ zdhAMWSp?-I|CD%l@wUYS5nVaC;}0aQoqXdgFT3uaC&RhoePrOtr?;8;KC;v>qB>sp zDD&=OV6qotp4`PLT|eoz*I@^Nw)MPEWa~1sMNU@j($?DgwZUoSjoVF2cHb^BysKHg z;>+8)OSWZvyws|C_>8&n|1-<3{<=R|P4~`Ghi)Z_$dId6`dhEAvi2mMDQnW*We=Lv&+-WE*;%qzt2j1l9+ee9F5#RfeWSx{d^%)S=l=0 ztZ31!l(+X(nCsW6NBaI_HJseo$>Z*B^VKm}cl#Twccqc9eBD<}=6RbuPx|dW&b;r= zv-d3fR&e4w=TGfV=lA-}mfQaO=59v0UemgB{~wms@85Pn$o%~WR#1d+0n-lygP~kW zs0o+_CAfh!QmWi6!!5!n4@DFdnjk^&r)r}D@v z!xSPCF(fY_6i%Fcoksy-AUwS=Fo1FrLR~87^G`zEGO9#6aIt=bUD;;3vYx$5F0&bwdA@4WHvu2o!88)tmf|H(UsDNB#VZCGhf#F%%{6%rHTAEVLhn0XUe1P!KbFkgr6vJ z+K{pDMA<`U;pbbplq0vD*(ROz@3)cOqV&U$Z|lE2Tgy~ZYH)5TZ(io~0DhmseLv^i zTQmJ;?Wb2+JJlom1H9Qe;v3!^J;2DoV8Ajto>gYD7KfkOuD^R??B@9$JUS3?SvY7fLmK85kH|Gk}yci84%n&m&&Hw%?KKkb!{f_r^PkOR}pO4!T}0 z3lyBfQr@)XWCn9C^GTPNZ+n+=^IvG>e}DKxdfl{K>p7_bE=9@SVcQQIypOk7n9s>; z^R~e`eLGSsc@+B^ext>CtLhx0y+Kh?@yB# z0G*yZIgV9!ay_SHeUPs|lc9j^ZqEM?B@axUv37;|B9@QZvjjS0e9v5(wzTl>~+u z-_PkOOl(%4ZBjY&d)l+JTh2cFKhN#bkzAfFCz>Z#My}iJ6#e$o0@1W(SD3!Dcr!-L zEI9M3{(Zc40M{|St?UNmf{@y{(+ zRjwy_*Lo2T=v?puF&`rJig7sO(XR{i+h{!u^f?}t^-w9oVJ zoOAg2N+ZA14tc$+iu^pmN?m$M7$H_+*u~ite;EMT<5Bp4hu#g3!%u@yNo~ zo`+nLOV>Jfl|;YuXY}){c(r&}P?}|l)r*Z+XKxFbE3!6tp7dHr_P@?qlf$pe_5QF^ zlve(2^ 0) { - if (i == 0) { - String configName = info.getDefaultConfiguration().getName(); - IPath buildDir = Path.fromOSString(configName); - if (compareBenchmark) - succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files); - else - succeeded = ManagedBuildTestHelper.verifyFilesDoNotExist(curProject, buildDir, files); - } - } - } - } - - if (succeeded) { // Otherwise leave the projects around for comparison - for (int i = 0; i < projects.length; i++) - ManagedBuildTestHelper.removeProject(projects[i].getName()); - } - } - - // Build projects and compare benchmarks - private void buildProjects(IProject projects[], IPath[] files) { - buildProjectsWorker(projects, files, true); - } - - // Build projects but don't compare benchmarks because there should be not build files generated - private void buildDegenerativeProjects(IProject projects[], IPath[] files) { - buildProjectsWorker(projects, files, false); - } - - private void createPathVariable(IPath tmpDir) { - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - workspace = ResourcesPlugin.getWorkspace(); - IPathVariableManager pathMan = workspace.getPathVariableManager(); - String name = MBS_TEMP_DIR; - try { - if (pathMan.validateName(name).isOK() && pathMan.validateValue(tmpDir).isOK()) { - pathMan.setValue(name, tmpDir); - assertTrue(pathMan.isDefined(name)); - } else { - fail("could not create the path variable " + name); - } - } catch (Exception e) {fail("could not create the path variable " + name);} - } - - private void createFileLink(IProject project, IPath tmpDir, String linkName, String fileName) { - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - String name = MBS_TEMP_DIR; - if (!pathVariableCreated) { - createPathVariable(tmpDir); - pathVariableCreated = true; - } - - try { - // Now we can create a linked resource relative to the defined path variable: - IFile linkF1 = project.getFile(linkName); - IPath location = new Path("MBSTemp/" + fileName); - if (workspace.validateLinkLocation(linkF1, location).isOK()) { - linkF1.createLink(location, IResource.NONE, null); - } else { - fail("could not create the link to " + name); - } - } catch (Exception e) {fail("could not create the link to " + name);} - } - - /* (non-Javadoc) - * tests 3.0 style tool integration for a single file executable - */ - public void test30SingleFileExe(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk")}; - IProject[] projects = createProjects("singleFileExe", null, null, true); - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 style tool integration for a two file SO - */ - public void test30TwoFileSO(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk")}; - IProject[] projects = createProjects("twoFileSO", null, null, true); - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 style tool integration for multiple source files & a resource configuration - */ - public void test30MultiResConfig(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("source1/subdir.mk"), - Path.fromOSString("source2/subdir.mk"), - Path.fromOSString("source2/source21/subdir.mk")}; - IProject[] projects = createProjects("multiResConfig", null, null, true); - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 style tool integration for linked files - */ - public void test30LinkedLib(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - //Path.fromOSString("subdir.mk") // Can't compare this yet since it contains absolute paths! - Path.fromOSString("sources.mk")}; - IPath[] linkedFiles = { - Path.fromOSString("f1.c"), - Path.fromOSString("f2.c"), - Path.fromOSString("test_ar.h")}; - File srcDirFile = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/linkedLib/")); - IPath srcDir = Path.fromOSString(srcDirFile.toString()); - IPath tmpSubDir = Path.fromOSString("CDTMBSTest"); - IPath tmpDir = ManagedBuildTestHelper.copyFilesToTempDir(srcDir, tmpSubDir, linkedFiles); - try { - IProject[] projects = createProjects("linkedLib", null, "cdt.managedbuild.target.gnu30.lib", true); - // There should be only one project. Add our linked files to it. - IProject project = projects[0]; - createFileLink(project, tmpDir, "f1.c", "f1.c"); - createFileLink(project, tmpDir, "f2link.c", "f2.c"); - createFileLink(project, tmpDir, "test_ar.h", "test_ar.h"); - // Build the project - buildProjects(projects, makefiles); - } finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);} - } - - /* (non-Javadoc) - * tests 3.0 style tool integration for a linked folder - */ - public void test30LinkedFolder(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("sources.mk")}; - IPath[] linkedFiles = { - Path.fromOSString("f1.c"), - Path.fromOSString("f2.c"), - Path.fromOSString("test_ar.h"), - Path.fromOSString("Benchmarks/makefile"), - Path.fromOSString("Benchmarks/objects.mk"), - Path.fromOSString("Benchmarks/subdir.mk"), - Path.fromOSString("Benchmarks/sources.mk")}; - File srcDirFile = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/linkedFolder/")); - IPath srcDir = Path.fromOSString(srcDirFile.toString()); - IPath tmpSubDir = Path.fromOSString("CDTMBSTest"); - IPath tmpDir = ManagedBuildTestHelper.copyFilesToTempDir(srcDir, tmpSubDir, linkedFiles); - if (!pathVariableCreated) { - createPathVariable(tmpDir); - pathVariableCreated = true; - } - try { - IPath location = Path.fromOSString(MBS_TEMP_DIR); - IProject[] projects = createProjects("linkedFolder", location, "cdt.managedbuild.target.gnu30.lib", false); - // Build the project - buildProjects(projects, makefiles); - } finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);} - } - - /* (non-Javadoc) - * tests 3.0 style tool integration with pre and post process steps added to typical compile & link - */ - public void test30CopyandDeploy(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("Functions/subdir.mk")}; - IProject[] projects = createProjects("copyandDeploy", null, null, true); - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 style tool integration in the context of deleting a file, to see if the proper behavior - * occurs in the managedbuild system - */ - public void test30DeleteFile(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("sources.mk")}; - - IProject[] projects = createProjects("deleteFile", null, null, true); - final IWorkspace workspace = ResourcesPlugin.getWorkspace(); - ArrayList resourceList = new ArrayList(1); - IProject project = projects[0]; - IFile projfile = project.getFile("filetobedeleted.cxx"); - resourceList.add(projfile); - final IResource[] fileResource = (IResource[])resourceList.toArray(new IResource[resourceList.size()]); - IWorkspaceRunnable runnable = new IWorkspaceRunnable() { - public void run(IProgressMonitor monitor) throws CoreException { - workspace.delete(fileResource, false, null); - } - }; - try { - NullProgressMonitor monitor = new NullProgressMonitor(); - workspace.run(runnable, workspace.getRoot(), IWorkspace.AVOID_UPDATE, monitor); - } catch (Exception e) { - fail("could not delete file in project " + project.getName()); - } - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 managed build system with a project which has only a single source file that is marked as - * "excluded from build" to see that this degenerative case is handled gracefully - */ - public void test30NoFilesToBuild(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("sources.mk")}; - - IProject[] projects = createProjects("noFilesToBuild", null, null, true); - IProject project = projects[0]; - IFile projfile = project.getFile("filetobeexcluded.cxx"); - IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); - IConfiguration config = info.getDefaultConfiguration(); - IResourceConfiguration rconfig = config.createResourceConfiguration(projfile); - rconfig.setExclude(true); - buildDegenerativeProjects(projects, makefiles); - } - - /** - * (non-Javadoc) - * tests 3.0 managed build system with a project which has a file with no file extesnion - */ - public void testFileWithNoExtension() - { - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk")}; - IProject[] projects = createProjects("testFileWithNoExtension", null, null, true); - buildProjects(projects, makefiles); - } - - - /* (non-Javadoc) - * tests 3.0 style tool integration: create pre-build and post-build steps and verify that - * the proper commands are generated in the makefile which is created by the managedbuild system - */ - public void testPreAndPostProcessBuildSteps(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("sources.mk")}; - - IProject[] projects = createProjects("preAndPostBuildSteps", null, null, true); - IProject project = projects[0]; - IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); - IConfiguration config = info.getDefaultConfiguration(); - IFile projfile = project.getFile("main.cxx"); - config.setPreannouncebuildStep("Pre-announce Build Step"); - config.setPrebuildStep("echo 'executing Pre-Build Step' "); - config.setPostannouncebuildStep("Post-announce Build Step"); - config.setPostbuildStep("echo 'executing Post-Build Step' "); - buildProjects(projects, makefiles); - } - - - /* (non-Javadoc) - * tests 3.0 style tool integration: create resource custom build step and verify that - * the proper commands are generated in the makefile which is created by the managedbuild system - */ - public void testResourceCustomBuildStep(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("subdir.mk"), - Path.fromOSString("sources.mk")}; - ITool rcbsTool; - IInputType rcbsToolInputType; - IAdditionalInput rcbsToolInputTypeAdditionalInput; - IOutputType rcbsToolOutputType; - - IProject[] projects = createProjects("rcbsBasicTest", null, null, true); - IProject project = projects[0]; - IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); - IConfiguration config = info.getDefaultConfiguration(); - IFile projfile = project.getFile("rcbsBasicTest.c"); - IResourceConfiguration rconfig = config.createResourceConfiguration(projfile); - rcbsTool = rconfig.createTool(null,"rcbsBasicTestTool","rcbs Basic Test Tool",false); - rcbsToolInputType = rcbsTool.createInputType(null,"rcbsToolInputTypeId","rcbsToolInputTypeName",false); - rcbsToolInputTypeAdditionalInput = rcbsToolInputType.createAdditionalInput(""); - rcbsToolInputTypeAdditionalInput.setKind(IAdditionalInput.KIND_ADDITIONAL_INPUT_DEPENDENCY); - rcbsToolOutputType = rcbsTool.createOutputType(null,"rcbsToolOutputTypeId","rcbsToolOutputTypeName",false); - rcbsToolOutputType.setOutputNames("rcbsBasicTest.o"); - rcbsTool.setCustomBuildStep(true); - rcbsTool.setToolCommand("gcc -g -c ../rcbsBasicTest.c -o ./rcbsBasicTest.o"); - rcbsTool.setAnnouncement("Now executing custom build step for rcbsBasicTest debug config"); - rconfig.setRcbsApplicability(IResourceConfiguration.KIND_APPLY_RCBS_TOOL_AS_OVERRIDE); - buildProjects(projects, makefiles); - } - - - /* (non-Javadoc) - * tests 3.0 style tool integration with pre and post process steps added to typical compile & link - */ - public void test30_1(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk")}; - IProject[] projects = createProjects("test30_1", null, null, true); - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 style tool integration with multiple input types use Eclipse content types - */ - public void test30_2(){ - IPath[] makefiles = { - Path.fromOSString("makefile"), - Path.fromOSString("objects.mk"), - Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk")}; - IProject[] projects = createProjects("test30_2", null, null, true); - buildProjects(projects, makefiles); - } - - /* (non-Javadoc) - * tests 3.0 top-level tool-chain definition - */ - public void testTopTC(){ - IProject[] projects = createProjects("TopTC", null, "TopTC.target.exe", false); - // There should be only one project. - assertNotNull(projects); - assertEquals(1, projects.length); - IProject project = projects[0]; - // Verify a number of other attributes - IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); - assertNotNull(info); - IManagedProject managedProj = info.getManagedProject(); - assertNotNull(managedProj); - IConfiguration[] configs = managedProj.getConfigurations(); - assertNotNull(configs); - assertEquals(2, configs.length); - // Make sure that each configuration has a tool-chain with all 5 tools - for (int i=0; i 0) { + if (i == 0) { + String configName = info.getDefaultConfiguration().getName(); + IPath buildDir = Path.fromOSString(configName); + if (compareBenchmark) + succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files); + else + succeeded = ManagedBuildTestHelper.verifyFilesDoNotExist(curProject, buildDir, files); + } + } + } + } + + if (succeeded) { // Otherwise leave the projects around for comparison + for (int i = 0; i < projects.length; i++) + ManagedBuildTestHelper.removeProject(projects[i].getName()); + } + } + + // Build projects and compare benchmarks + private void buildProjects(IProject projects[], IPath[] files) { + buildProjectsWorker(projects, files, true); + } + + // Build projects but don't compare benchmarks because there should be not build files generated + private void buildDegenerativeProjects(IProject projects[], IPath[] files) { + buildProjectsWorker(projects, files, false); + } + + private void createPathVariable(IPath tmpDir) { + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + workspace = ResourcesPlugin.getWorkspace(); + IPathVariableManager pathMan = workspace.getPathVariableManager(); + String name = MBS_TEMP_DIR; + try { + if (pathMan.validateName(name).isOK() && pathMan.validateValue(tmpDir).isOK()) { + pathMan.setValue(name, tmpDir); + assertTrue(pathMan.isDefined(name)); + } else { + fail("could not create the path variable " + name); + } + } catch (Exception e) {fail("could not create the path variable " + name);} + } + + private void createFileLink(IProject project, IPath tmpDir, String linkName, String fileName) { + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + String name = MBS_TEMP_DIR; + if (!pathVariableCreated) { + createPathVariable(tmpDir); + pathVariableCreated = true; + } + + try { + // Now we can create a linked resource relative to the defined path variable: + IFile linkF1 = project.getFile(linkName); + IPath location = new Path("MBSTemp/" + fileName); + if (workspace.validateLinkLocation(linkF1, location).isOK()) { + linkF1.createLink(location, IResource.NONE, null); + } else { + fail("could not create the link to " + name); + } + } catch (Exception e) {fail("could not create the link to " + name);} + } + + /* (non-Javadoc) + * tests 3.0 style tool integration for a single file executable + */ + public void test30SingleFileExe(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk")}; + IProject[] projects = createProjects("singleFileExe", null, null, true); + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 style tool integration for a two file SO + */ + public void test30TwoFileSO(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk")}; + IProject[] projects = createProjects("twoFileSO", null, null, true); + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 style tool integration for multiple source files & a resource configuration + */ + public void test30MultiResConfig(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("main.d"), + Path.fromOSString("source1/subdir.mk"), + Path.fromOSString("source1/Class1.d"), + Path.fromOSString("source2/subdir.mk"), + Path.fromOSString("source2/Class2.d"), + Path.fromOSString("source2/source21/Class21.d"), + Path.fromOSString("source2/source21/subdir.mk")}; + IProject[] projects = createProjects("multiResConfig", null, null, true); + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 style tool integration for linked files + */ + public void test30LinkedLib(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + //Path.fromOSString("subdir.mk") // Can't compare this yet since it contains absolute paths! + Path.fromOSString("sources.mk")}; + IPath[] linkedFiles = { + Path.fromOSString("f1.c"), + Path.fromOSString("f2.c"), + Path.fromOSString("test_ar.h")}; + File srcDirFile = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/linkedLib/")); + IPath srcDir = Path.fromOSString(srcDirFile.toString()); + IPath tmpSubDir = Path.fromOSString("CDTMBSTest"); + IPath tmpDir = ManagedBuildTestHelper.copyFilesToTempDir(srcDir, tmpSubDir, linkedFiles); + try { + IProject[] projects = createProjects("linkedLib", null, "cdt.managedbuild.target.gnu30.lib", true); + // There should be only one project. Add our linked files to it. + IProject project = projects[0]; + createFileLink(project, tmpDir, "f1.c", "f1.c"); + createFileLink(project, tmpDir, "f2link.c", "f2.c"); + createFileLink(project, tmpDir, "test_ar.h", "test_ar.h"); + // Build the project + buildProjects(projects, makefiles); + } finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);} + } + + /* (non-Javadoc) + * tests 3.0 style tool integration for a linked folder + */ + public void test30LinkedFolder(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("sources.mk")}; + IPath[] linkedFiles = { + Path.fromOSString("f1.c"), + Path.fromOSString("f2.c"), + Path.fromOSString("test_ar.h"), + Path.fromOSString("Benchmarks/makefile"), + Path.fromOSString("Benchmarks/objects.mk"), + Path.fromOSString("Benchmarks/subdir.mk"), + Path.fromOSString("Benchmarks/sources.mk")}; + File srcDirFile = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/linkedFolder/")); + IPath srcDir = Path.fromOSString(srcDirFile.toString()); + IPath tmpSubDir = Path.fromOSString("CDTMBSTest"); + IPath tmpDir = ManagedBuildTestHelper.copyFilesToTempDir(srcDir, tmpSubDir, linkedFiles); + if (!pathVariableCreated) { + createPathVariable(tmpDir); + pathVariableCreated = true; + } + try { + IPath location = Path.fromOSString(MBS_TEMP_DIR); + IProject[] projects = createProjects("linkedFolder", location, "cdt.managedbuild.target.gnu30.lib", false); + // Build the project + buildProjects(projects, makefiles); + } finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);} + } + + /* (non-Javadoc) + * tests 3.0 style tool integration with pre and post process steps added to typical compile & link + */ + public void test30CopyandDeploy(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("main.d"), + Path.fromOSString("Functions/subdir.mk"), + Path.fromOSString("Functions/Func1.d")}; + IProject[] projects = createProjects("copyandDeploy", null, null, true); + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 style tool integration in the context of deleting a file, to see if the proper behavior + * occurs in the managedbuild system + */ + public void test30DeleteFile(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("sources.mk")}; + + IProject[] projects = createProjects("deleteFile", null, null, true); + final IWorkspace workspace = ResourcesPlugin.getWorkspace(); + ArrayList resourceList = new ArrayList(1); + IProject project = projects[0]; + IFile projfile = project.getFile("filetobedeleted.cxx"); + resourceList.add(projfile); + final IResource[] fileResource = (IResource[])resourceList.toArray(new IResource[resourceList.size()]); + IWorkspaceRunnable runnable = new IWorkspaceRunnable() { + public void run(IProgressMonitor monitor) throws CoreException { + workspace.delete(fileResource, false, null); + } + }; + try { + NullProgressMonitor monitor = new NullProgressMonitor(); + workspace.run(runnable, workspace.getRoot(), IWorkspace.AVOID_UPDATE, monitor); + } catch (Exception e) { + fail("could not delete file in project " + project.getName()); + } + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 managed build system with a project which has only a single source file that is marked as + * "excluded from build" to see that this degenerative case is handled gracefully + */ + public void test30NoFilesToBuild(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("sources.mk")}; + + IProject[] projects = createProjects("noFilesToBuild", null, null, true); + IProject project = projects[0]; + IFile projfile = project.getFile("filetobeexcluded.cxx"); + IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); + IConfiguration config = info.getDefaultConfiguration(); + IResourceConfiguration rconfig = config.createResourceConfiguration(projfile); + rconfig.setExclude(true); + buildDegenerativeProjects(projects, makefiles); + } + + /** + * (non-Javadoc) + * tests 3.0 managed build system with a project which has a file with no file extesnion + */ + public void testFileWithNoExtension() + { + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk")}; + IProject[] projects = createProjects("testFileWithNoExtension", null, null, true); + buildProjects(projects, makefiles); + } + + + /* (non-Javadoc) + * tests 3.0 style tool integration: create pre-build and post-build steps and verify that + * the proper commands are generated in the makefile which is created by the managedbuild system + */ + public void testPreAndPostProcessBuildSteps(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("sources.mk")}; + + IProject[] projects = createProjects("preAndPostBuildSteps", null, null, true); + IProject project = projects[0]; + IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); + IConfiguration config = info.getDefaultConfiguration(); + IFile projfile = project.getFile("main.cxx"); + config.setPreannouncebuildStep("Pre-announce Build Step"); + config.setPrebuildStep("echo 'executing Pre-Build Step' "); + config.setPostannouncebuildStep("Post-announce Build Step"); + config.setPostbuildStep("echo 'executing Post-Build Step' "); + buildProjects(projects, makefiles); + } + + + /* (non-Javadoc) + * tests 3.0 style tool integration: create resource custom build step and verify that + * the proper commands are generated in the makefile which is created by the managedbuild system + */ + public void testResourceCustomBuildStep(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("subdir.mk"), + Path.fromOSString("sources.mk")}; + ITool rcbsTool; + IInputType rcbsToolInputType; + IAdditionalInput rcbsToolInputTypeAdditionalInput; + IOutputType rcbsToolOutputType; + + IProject[] projects = createProjects("rcbsBasicTest", null, null, true); + IProject project = projects[0]; + IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); + IConfiguration config = info.getDefaultConfiguration(); + IFile projfile = project.getFile("rcbsBasicTest.c"); + IResourceConfiguration rconfig = config.createResourceConfiguration(projfile); + rcbsTool = rconfig.createTool(null,"rcbsBasicTestTool","rcbs Basic Test Tool",false); + rcbsToolInputType = rcbsTool.createInputType(null,"rcbsToolInputTypeId","rcbsToolInputTypeName",false); + rcbsToolInputTypeAdditionalInput = rcbsToolInputType.createAdditionalInput(""); + rcbsToolInputTypeAdditionalInput.setKind(IAdditionalInput.KIND_ADDITIONAL_INPUT_DEPENDENCY); + rcbsToolOutputType = rcbsTool.createOutputType(null,"rcbsToolOutputTypeId","rcbsToolOutputTypeName",false); + rcbsToolOutputType.setOutputNames("rcbsBasicTest.o"); + rcbsTool.setCustomBuildStep(true); + rcbsTool.setToolCommand("gcc -g -c ../rcbsBasicTest.c -o ./rcbsBasicTest.o"); + rcbsTool.setAnnouncement("Now executing custom build step for rcbsBasicTest debug config"); + rconfig.setRcbsApplicability(IResourceConfiguration.KIND_APPLY_RCBS_TOOL_AS_OVERRIDE); + buildProjects(projects, makefiles); + } + + + /* (non-Javadoc) + * tests 3.0 style tool integration with pre and post process steps added to typical compile & link + */ + public void test30_1(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk")}; + IProject[] projects = createProjects("test30_1", null, null, true); + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 style tool integration with multiple input types use Eclipse content types + */ + public void test30_2(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk")}; + IProject[] projects = createProjects("test30_2", null, null, true); + buildProjects(projects, makefiles); + } + + /* (non-Javadoc) + * tests 3.0 top-level tool-chain definition + */ + public void testTopTC(){ + IProject[] projects = createProjects("TopTC", null, "TopTC.target.exe", false); + // There should be only one project. + assertNotNull(projects); + assertEquals(1, projects.length); + IProject project = projects[0]; + // Verify a number of other attributes + IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project); + assertNotNull(info); + IManagedProject managedProj = info.getManagedProject(); + assertNotNull(managedProj); + IConfiguration[] configs = managedProj.getConfigurations(); + assertNotNull(configs); + assertEquals(2, configs.length); + // Make sure that each configuration has a tool-chain with all 5 tools + for (int i=0; i