From 3f4d8acb4eb12b338978e2f42c0efa9a245a84b1 Mon Sep 17 00:00:00 2001 From: fernando Date: Thu, 26 Dec 2013 21:03:55 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20112=20-=20Arreglos=20en=20generaci?= =?UTF-8?q?=C3=B3n=20PJX=20(nueva=20propiedad=20HomeDir)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foxbin2prg.pj2 | 16 ++++++++------- foxbin2prg.pjt | Bin 275715 -> 276276 bytes foxbin2prg.pjx | Bin 1582 -> 1582 bytes foxbin2prg.prg | 53 ++++++++++++++++++++++++++++++++++++------------- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2 index e448b63..93c6094 100644 --- a/foxbin2prg.pj2 +++ b/foxbin2prg.pj2 @@ -2,7 +2,7 @@ * (ES) AUTOGENERADO - ¡¡ATENCIÓN!! - ¡¡NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!! * (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!! *-------------------------------------------------------------------------------------------------------------------------------------------------------- -*< FOXBIN2PRG: Version="1.16" SourceFile="C:\DESA\foxbin2prg\foxbin2prg.pjx" Generated="2013/12/26 19:21:19" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) +*< FOXBIN2PRG: Version="1.16" SourceFile="C:\DESA\foxbin2prg\foxbin2prg.pjx" Generated="2013/12/26 21:00:42" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries) * LPARAMETERS tcDir @@ -26,21 +26,23 @@ _LegalTrademark = "Open Source" _ProductName = " FOXBIN2PRG" _MajorVer = "1" _MinorVer = "16" -_Revision = " 127" +_Revision = " 130" _LanguageID = "1034" _AutoIncrement = "1" * * -FOR EACH loProj IN _VFP.Projects FOXOBJECT - loProj.Close() +*<.HomeDir = 'c:\desa\foxbin2prg' /> + +FOR EACH loProject IN _VFP.Projects FOXOBJECT + loProject.Close() ENDFOR STRTOFILE( '', '__newproject.f2b' ) BUILD PROJECT foxbin2prg.pjx FROM '__newproject.f2b' -FOR EACH loProj IN _VFP.Projects FOXOBJECT - loProj.Close() +FOR EACH loProject IN _VFP.Projects FOXOBJECT + loProject.Close() ENDFOR MODIFY PROJECT 'foxbin2prg.pjx' NOWAIT NOSHOW NOPROJECTHOOK @@ -49,7 +51,7 @@ loProject = _VFP.Projects('foxbin2prg.pjx') WITH loProject.FILES .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="1132857145" ID="1131721714" ObjRev="0" /> - .ADD('foxbin2prg.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="1134205420" ID="1130644423" ObjRev="544" /> + .ADD('foxbin2prg.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="1134208850" ID="1130644423" ObjRev="544" /> * .ITEM('__newproject.f2b').Remove() diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index f5e1a5017ba7cce413024bb86fc7becd7ef67515..ca98681eb95e181cfae2d1b031fcd3066fc8b768 100644 GIT binary patch delta 12954 zcmbW8cU)A*_xI1-xw{JsNbhX{v7mw|_KFLr2sTioi6ROrN)yo-6SJC_SQ5K&)Yvt) z*fm)-#vV)Ty%!X_CU!6?`F-x*WkdYt`RCEsxaa+uGjr$8ojEgecm48#%jQ2^?1&7T zi6~^#BE5sO$z96P>FU;|=-PE-rZc_Artj^mXr&1!H|=%qDOEDGj!#YN8k^K5KB04m z;Vv{|=c5hK}iciFSQ4H5&b@RX@DQrD@jo(4xxnKhtr z$cGw(OAmJ zfXu*mWv&$d79s?fcds?=smvQrfVW2EzhP7rDRkbuGCT5rtrZK1T}Meqi(yYm?UnqF9a1)(=r?ttb0oL6 z)sD8k)@&2`I#w_sfKp%J3RvC4S1oWS9Z9r6Ix{t&o=~c$1Pck z=xLE2H}#mxLag~l<7@evPN_~$)>=ih9rI&-M3NmVWaq?gJ64}*MX4QYBrlT6%%X!G z3lN>`SyQGHlkAx{vlq+kS$~Of;jCv~UOFlXqbGVQGL}@fbfY~k`FeWGr=BcGbkeiF zZg!N`rbBXkT-(kvrM79C;z!dXJ^aKuJ@XbNdiH|V7bjhrk9gFUxymo3vM9k4ndkHy z^L<2uBa4xqNa8a`=I`i4%ifl_5UPJ93D>&JGwGg$$Azx&DbbM+x`RqIbn}%v`oLT1 z169^S@=!_^V!UjQcbiF}O=5eY1YX zH+qU_8rdcG65J}!~{^%gD3CMZvjYOAuSgh49q{&4^5wK zZMqYc_*oGsG*^5oyAuV+i zqf=O<_MU6mT3S1O_xxZHc~f!{E6%bD_8nnt7uwf z^jo~#;icr`$(Ku>R>|uh$=fR7ftI;oj@Vh*7p$jR?r%%{U^yy-DaM2zdd$j{d5Ko| z!_#QQBn&8TKue{Ig36pN#R8Ss(aod0EQ-cSTXI6JCID6%ZLEVl_KEpP07_tYKWs3 z*gDUeU?uR?Kzs3z5s&RvEiv^X^Nn;@BjYR?V?!y82kK5Q9OzZ#`(>a-i3=B5WmZGH zyU6ONHf`Fx`9Jf<(9F=ZX?9-6g1mv5eG4PgtkbD^b3;_~vP$&Ej_mPADO1*f-b7m{ zp+jdwe5|pJ!B$QTyvzc;4fMv(=5GH_=A6r{s+fI=Ew5FBdLLtZ-0u7DFeL6|rzJ>l({Y zI^-H_8U3GioX}gBA^x$+q4E8o}I3;xKwgz?GaxAZFUJ>i9-q30ne|11m zr3#t;;_OWp?-HVB4YXxN++tnPA){}xQl&$phDyO=_HC8}TX%=`uOF>6d6=tZQ6_cl zS@#dct{Bj097ZDsY)Kt@aM-%>xZx^dpR($*qKcDuSgppNxmhBTvR`?@l%cPz@|IQ0 z?X@P^4O0rMmSmd{P$Dn^;aOKSyvqW^0|>!TiP@H=1@*>Q<8wV*d@gjG9{bcon(Zc- z#Joh$L(Bnd@x)Vz*2nL%384o1*S_sP_B7`1_t@|NHe)&);9U)ow}hj)#uu`(5I;C- zU51qvhp}dO43Wwz(_LJ8Eg9IS;>~NRo*1Z+>Q`6{#;(yw<~17LU&G?fo(}w)RM|lN zGYiwYre_b$Oeo09X+JbOJ2kT)Co4C-Ff+p<_ly^hop`9^mLOa!aZmkc3Cadiq978n zjd+mMso4`y^VP}IhnbI&fkf}t~|Vc zvze-!3uR>X%gW8nNb4AzY`J*2D9;&ESdf*U7KewDJ0vSFcSu(u-nsIi43}A|ha<%g z!;nCKDTNDXtEv-ayGi{^sA`m&I6?$J49=D z9>kuBeu~^+mly|>Qum7A-MOEgF+Q$K=Xg4xkbxZ$58ZjV{lMSVtNMxE&fHU6_uyJT z`IxFz7)0GqDUvLTT)3wnKWhQ1kU#RWB5Bn8uxl2mm|wG4k+hb4`z3cQKozbjB|H>& zJor^4P7jc)i#Bzf{cZJW&Wj47px9U?`(5qX|GOy8tTEgwK)XD7_7cqX=aqHL-x zu6Xile(iKjxmd;P57R4>PQAXt$pZhn{v%h>-3xuX+Cwbx!g$ZmPA}}IjA?I$gZ)1A zQ_EDi=Vif)WM`>UiU}2edht-d)an+o;<~}`=KUCS>8ncW^u_-BO$?>UeI>e>4?x|*a{VTI$=MEj?JEyjdPbo-O^IgjW zUVK8^_VIDb^m6Ji7W#5O>65lU-9vdC))g*jW`*c|~2Vf{xNNGSWIE#rL!bIPzKqOT0d3m7FPa zc-9c~E#hcl9(>zhSL*jf=P8A;T=dP%7+R27W|6%ymaTF=qVFf8Zz#^*q*v6g)?hrc zNEPiYu1dsxXHk6Kuk*{Bilgs)b#}j{s%kd`7K^Mv9{54uVny}GV?Y@1m|id>Gox*8 zzdWV(b=E8&%2)LN*f)H2TP^IYdcwjikE90K0A}Wac`gDAzWCgs}*ip|!?;u`9a(F4m1!1TUd@EKcpP%Z)!606v+5k5R zr2^6Oajme&QYK+@kAI{TRXXG+{DZlnii^LRrBRmEwsAWHRdledvUwSqO86)a6zRd- zUH3xG6rIAjza$5VS;0Ik*&|3T;iQyM7eHkgR<_FaO6Rr5P-`34*ihaI+ns)8mDG;! z5++6&Ft?wF34?+AhCi#O6bQnd*a|F(P^I#5H!f22GGKYo$5@Is9#K!p55@wa4)CE3 zRepa+pKh$^2Aki~X5s|uF*S%+_4oa!v{m#FoBx0$mDPrac2FqveRR_y^e|f^!h5Uyeq-17RrJa>zk+@iwmi3pM%ilS z`-P6@DtfrB(E7n5IFx&NHyWzwRc!j3k1cGetYMWAYUcZum0I-bwnB$SDt^_i!RyQ@ zu>e&^3?Hqi5jL+!U#VQ7dt#8uLYTlC$k zWJUeYh?rp2%SS}lU;o>0^lnA3ZM)>eeJa1-w8i@sJ({%LtpmRAAys(a@%%AGuVbt5 zr;{qb?-z4M(d*j$UY-+|EAznUMi&)5=D&jBSJo^`L{3Y|EWp{M;U!T$oL3Lta7iuZ zt_*KAD-MSoHBPj?ECz>j@5%!&t4=P86OK!&pAsw&Tvv0vNU#gsE5QEN|I2g#ZE-Ce zQLytpb6Ge)>?B`sI_MytcHr*j8+G}9SybuGJw*F<++Oa7lb*<#!GoM|xql9SV#*Be zV_w#fe`}|;d~Fb6j*R7F9L?L4`8Q0JQpCwF+)F&}z=t@b;+?Si{X&-tYFC@u&7zt| zcjVDrY)|27Y88D{xmGG4%*2W=yp}2tFr(%gOlZ4tXH^+wcJ0Q;N}k!a8gpz`t~C!Q zLTelHZPsA*0%;%dA05peSv=6%_Q@7qqz>f$?3}QC;){`)<_!b+945MC^Dyyc=W<_FSzwOOb>u5nmy z%UL1NuU_Wv6L_hk_)zc$>V?*sCkg(Y8z8c!U6to?J?W*rgsM|q$awUR$}IBHXmnTN09u3SuC z!^0|BI_I>Khc8|9!u2RlPw>}^i)(m)hcmW9XU*-_@>f#eIh%6cW?irrcd!+g#nxTi zMU36RKXJHd^SdM*HuBOyoUyDey<)SjTC0%ND(Y?G5e_(hS^ch?2X5jcb>iu^@`qP! zcKL;8Fo)YVpF3vLb}q|-cWuf&n{{8YaDUGKZs3m&4{RuksIz<56rC{8P%C5b|J z9iMjXL=)xHx1Gqlj<*95?ZkxZIJ`_q7AvpwfW~LqD;Lm`F-h53J1C#VE-7iPVpHNh zIxAUr76}Kke`jt>5r1FD?N93~3^#C=UXm%AE1#bX5+B__{fn~2r#EnD+W3iBa09XP zzzDJP2Il>=QI;EO87FzTJ1bRVPnu@zkYu^yXJdq>h*y@x7*Rv{JU2mfD#AscP7nn} zysETvlK8#|mF}A)b{6q!(nr(8eTBc7rm&|7y@_YAZMtZ56MNX*(?$AC9QqDU7hm5* z3vNvp%Wk5Qt8>NinpXn6}4D_tVeZ*fDIv_fgAquR!Vw1l?t zNpb(`pTHGj=`Flon7mdTPztVEEAHLG1(&QBPQ^SdEbwPr1=uJjqK5Z6_>ZmTlw!V2 zV!OJBZfq z!8gtja4w{-dxDQ6%_>lSIq$;wlDQ7o31_ zJr?h-T7a?Vr*OpNw}{4F!R^5F5Rb>)L_Ofal8H!vi|ElqqLmQl!C?-9+(Cr5H{j*q zLIk)=2v81MB5c}d#4DmT2u}^bd%-V27<|hF;oHB7+9Pz0gis284*M4^qa|Po-5!fKUES;%Z3OGVZg|Z#BZ|=h zumgIf5#B7#YQ*TYj;J2ESz|`~Ix+IHBboqC>&)mL(iZSk@Uz}H`1WP=5^S0Q;S?aP zKaQC8M61Du0gQGG!8RSNJcistMscGV^#wl%KY<Z28R;C@7yJyi-F!yZ!2aM>uY-02&96kZh!BC$2Goz*8G2l2eUNvrIv>iMJ{4?y`hXvS2OY;VMfw5!CpiBEqnQ^Otp@vJ9JIn4o?Z7CJqLFO=iFy><_X4)6P_{n zi>Hiy>?B$Qz5w0}`;A^AQ{zfR_aH2Bkm!h`MBTwpz(buRTIwuOHux>Ly^BN>yd?S( z?23U_*IS}dINC1*M}lhvOSCFnqVr%QxJwm@zQ%l&oiP)Xfr%sh`Y4IK!G++SwIy2J z1oJNq!fXhAn@Kd*DA5k^I&jT6iN>W#^cZ{?+$3G1Zv7=X>VoM5ehXXsr9^MRW#GVZ z63w0@QL!tLJ4SZ%$r6pk`Ow=9!3rEP8{gF|ljw7BFYqDQYu97`oq;d`LbnYPrT!#Q zs5^oRn0}TheH%3J9%3|;{aekc)tCQ%(vj0x}t*gX&+ z^1%1N@@t9Ky+gNyC5-g$WfC>E<8&EZ2YepEVxbGCCSF9X!SSw~&IEEA2%Z2Q9mL6$ z9M0(mgdZXFs?Mo*6sKC=M7zM6+MI^f;gkkG4i2l!X)yLUCNO@CL#53*6~}Qp0oGt- zkB{f{yfr7u2Xh>}unnh+9XN%8>w(kLIE_o^^c}b%IJyrvks*uIA_!d}9D{vgAgA-- z?%=NmaY`@XbPN0m*mDRPH-?k1FP;wgJnY=@oTh>IgPkUzL6bRc0{;OXIEB;0shl2z zu{oe+(>UG!j+31qkvI5@nI=wKmvO2AVK9Ud%Q^kNp3{%u#o(bEIGy~7(@XG1@WJSY1A%wY&uV6VA=pLc=Vg4DG{6t9(99LY%!;9;E%z7 zz2g z@M3V2Dl#3eDH9LEv;^nYlIdz~nW}=fg0I8=G+L&{;O*ee*cfy&%G4f=-zL!4aWXai zK&F%6c9_b8yUR5EGnw*(u}-)k{!jW`rf$s4q zBX}ZMo-Nb-1u{(quLf^iB2(+7G8KV0g9~8iBRvNH1YQXHn^iJB1)l}4hy52;IloXu zLKnpUz%?@MTPsr)2$z%s8)T}tQKkg&O>l46y^uPCZ-KvreRMN^CkVa+ega$kEK?uw zJ#edEWQyJ{(|GV>@HW^he}xbD8MxsNnG$!(^aJ>v2||O@5YC_r!!VB#z0SdQIVV#a zuswJV>_z8gN&!2Aqb|#IA87>G6Wr<+?ygv-&EP=r$lK_FJ2LGDR|dB!K@TGtD`N)* z4k?u>4++23B2xqee7{e%|H5;F5Cc94+xx9dy}>QO%V2krG?WMa2z(oM4i@s6N(Eq@ zUPE@3G_()=1GuY;hDzNuqz%U-0#|X@P&|?kcpdm5*6gXl8fqDi=YJZ)5y0h04Hd#6 z9O1Z9l!lhI($GWjX7EMW54vb*OcmTM!fOOJb3r{c6i}5Y1sn%Eq`!umfail-!(N`H zp_Sl;;483eW5f3|SP9piVGl%lR29#EFNA4;c}P#;@EiCy*e8%)fe(N+gEi!W^agwg z+y-_E5>>+-2akmPe29iL;2U7yLJbW-stPU!Pl6pcLPL?@H{jML4LwGhV1j@zRLEzP zhPI5?&~$Jl_zvu^@IJofn`7!PCKi zE!5DQWR~i#tfN%stqgNVQ`sr#)#99x|g?-mfOD(`5Sg;m5 zX{m>Ymga$5f=9xR4$#tR@Q2`ju%8*UR0bXdZWXGf&DFGIsD&Lj_&n??QP>-O0AT}! zf@m#8G}O`x@Ck4->>f?EbPZe#o($X63|pZ{Y{|gxEwwZ_0TqIsumaA2os)$6z;(dq zyK3pnZd$qoZU9~jdv9+o-2(Rk-+_I@l&hs`QABegX!Eqxus})v~*^UmU`93b_`qsJ7lSrz5^$MyTblqm6rB_ zdxB5@h#MM-Q^g$!pF>y(d&U+m1x2HK!G`TxD&B*;1n&mx_G)PkP94j^$`XAF_G6?Y z;EUkUgIa3&yOvIZl_h(}aV^z8p(V#UXfXIg*ag^qdVnioN&fDF)Xh$8b2cHC| z!p_BR^&a>cc&vwxn)~ahK@2vrSklw|O*)zqtfL$V)ggpd)loju4scB{tEQu?NWX#W zf%{k2QCftKPJtVPsfLbzN4f!y1^)#*tfr10fQ{gdus!SP=m~fr_y^bn8tbTPJ)&{o zG7})GxsFmGEP*frd*>#tbu=6NEBGYrA&ENL3BCX>iY4L`u@z%j39*S-1$*IC#0XC0 z1@1VF=oQX-*w^3}m)IqxFxu8cq62o=;(+L6<{|l`PaavBdLx|A7X#d2K#}?0L1^GI4rf;ARLAe4F`K{5We_Krh(WX z#DL>R$}|)E1A+ZP18{fj5A@g{Xt16)1|NleQD8L#Hv`X|CDRJ*5557n1b1F2(dOf`hb6rt7<9+6q>-QQzPQyzV?UA>diy zvT1r52LF5_-eh2#vk|%gPcwGwwEkr&)@FZ|VG9oDg*G%vx@J-mE z2vl1TsJ4L5!rp{HRKGT!|8WR|5Q!Ee@Z3NkIs@*qRZHy=NO~ZU6oJcNUq_rM20sH& zDMDCAT$qixfFBdnq(8K@3UR;@^V|jF=p)2|&oJ*-fjz-B-E=e`(>xf{Fa+G$prb~Z tb+ckH$QnR+3@~AujleW(4UTH3qr1sEDi-5n^ey(}Gzw?}P&-$EmX7X;n=REDUvkg(u zav};YU8=W}N?oNJpA=@Q3+Oif*FK*bf zR_qfItY`h0R!r10Pi7Dh4UrX;HM%)>)VRiSiWPZe=hb?7N0XIs4Oa&g%Vccu{? z?AQ>o&W^Rx+fYWAl;ni?#2(_h9eX6DaHX+gP9J8F9e8!5FqoKk@#39sqPYWWCfRZ^ z(t-Jgc~kl$nW|jTEL7E*s$5Xj+eehfmb|EPCcI0-i%s|4;~B5^RC>g#N=IJk6{^zE zl_zfK3QwggR9OqjUCHFls%2`7CjcdRb$OFXxc2gR`MMXX4Cx`Ot6k%w?>WdpLtOpAeF|I5e zW1Z=W37{1dTv-&8%eE-u{fPNVJ-9H`V}Z<1MAu^p=2;%hmx)-$ zeaydjvN^k@EEiFh%o@w<4Atw4qu%x|UccBzY&^xDncOjwdcu%lBp>Oh%0LU1S!xko zAS#-xW#U>Sw;Bnf_1ep$M)HK@Tr-!ITwY*3HFAAXg|Vo%S4O)T#^f@q4pNKvK}J(t zT$QiVfzKHQ#o;q(VTYHN@prOh^-~ghyVc6yUV5G1ANl_^drkQPYI@-RSG-9nKdW~6 zldR*_96N;w} zo-jP&RBZ}HU!b#mE$>pTH+!Rj>Jnmg3HfJ>@Z!37LcV-i?P3WpmhzUOCXKjtIavZ$ zYRzIKR84(XTMYh_x)>iH+EEWd>G+FBwp3M*p2?0j&M0AoQo?RLCM-xS<3|qkq(0m| zDY;%%gqZ6j`G{L**}VP@AO>UfBT!5H6Q`8hkhF16C5Is8Uwx4Fb@an@b5Wz;8X1#F zDb*r9vZE)B-Yf=MV{z^rtAll8n1{D{pT{g;d4V~J8L-^^={aHn{%g~wT|3+C+|>Ns z5n|_gcGM$+1|4PlUp$rg%O5QNRyU*Pjm44+%b zqe_nj7i{~w?QO3xACXgzH5y@_SI!zS)UexC7A9_9VnbmkUuGSm|Fw*H`kH+J0~Mn7 zM3Me=vAZv`amf8v1uJa)uelf6VVNNWA#<=2VptY<6O5M)KgMz{ahtZVHtMp%c4 z*_JtS`@}FzoG#BfbxQ5M4rQ&je_htyD{PS3pta6EY8?+a)JpUfVU;YwIY>>4bbOuk zekJRL4k@c-Pn8ad>MjL}Ti4kr*u8JC;Vq(+Dz`RRc12R>%1i8~zRxsY8!!n`Im{l+ zvZ`pheOTGI;J(rzjvQk3WknUiH(8^YSQksEkx;-Rrp#Am=TY{HQ-)_67Z|slgoOHmwQf&8)$^l}mB#JvV8fi-@&jJ~lFStmf3S zx!CiN`HR3?>{IjMTWp-4BuE5*#ys3TF!?#^gTBSis8RPr5%pYhXZ=N|=TZ=xB!)ki znv1hqsfB~(ywbBrTtcVBq=b*Xb&}az$A@c}(LBYTmrJ6|llyrONKg(m5;;(IR*o?< zVcd}HF;269 zUYXgs`F)a;{6(xYcgLBfw=<7c){-;#jVl}aIzvHjej!#;UO{ZmP-GcnENJ(xnr1^| z^Ro(#Nx8%2Tvf59xZIrgjQNFG`QviM4QC!HZOav22Hrv{94%4}JWR?g6j5&6Q_MDS zz4!HTN8amXNgPz4(3h^@I(2UgB zK) zxxahL5%rC=rpbyj9ALPQd$-?|B$;X@{d7(^dLSw1qLQSkoiz5UXp1D>y=zL6)>1kj zcbi0aPwrvYaZFaW(xD>;+!u>IP{a7gVvh%UVo{ay>F*eyS(q8~mnAEq^#SP^&CV}H zgeR{fbtjSP$%FKRI8%zIAQBUM@*wx#T9s>6aH_4?;K_ZYhW6sHCl8UHI*UI%d8mGy ztKzC7PZB}Bxu-PSLp1l|fj+~%RlQab-v%g>jriV+yX!gxt6=G?LG>(9yVac=h@D<& z^_fOWlC9dOVUZT7?PuRaIC;ZwK{F*uZ}Dq>uek+k`(13QNOt5w!!c!I4TZ| zPG3>(gE2|#FP{5g{3Z<&zP{YMf%h;quZtRZGU5?3yCr1ACB>$tiFegBUp1{b)7L|a z7$L^`^04S1M!c?)C17RL%;SWSs_a-(9GV>)ADbR~Vx&0Y%L5q~cYQJYXXOfeKMb!^ zfr#=$ZI%^?R6pn)riffWtoMr9Vm{Kn`!0I@mQGpYQnHOrI%OHNhZam*BFg-@w`u88 zHQAoh^T*^2!J<}t;+LsvtvRvKBH7m-sRiFCUJkXT6QzpeSX=t&Cq;6qEp{@Qw<0VS=EC{qMKL;nyPMXPE2Vgny(Nzl&k;SxM_p1?y;`;< zmNvYsYBm;4nYL>!iWmA`c^~o)F%BJ*Z){SbIC{TPq|FsoRh#{bg%Dpffd~RFS4BV| z_m&1;6|Dk!Q1h5d#n%_L&dba%Fvc6-%Nk-#%o&y&cuh@kR#s(?+_8VB6x|fF19?c) zdUAMe@U_X4Gs8iSZe+ad8Q0X_`O9+Z?P$e2em%nttM%d zS|-L9`l)EAU|jA{qh-IWE%wBgrHEhq3HxBI@$dXZ<6s_|e5l6BLCLA^XzAngjAv_P zTV*@zhAEX8|3|><+E|+%6R1jRhwDScSHavPVReY22B0(kIe#t{W69V4ML$IhwdOlF zP~|skVH~XJb*z4MjTW{P*5lp?HSx_%(?=Hp?-q`B5 zv{a;r@lf61trp$#66a4#(H(%ZR zfTBlR{k(n>!QtE^X66w^Z(`L)98>wt{I`xPdQ+?4Hz&pDaBPP6PK&wW+}k7OjFR4r z)To+f%*Sou?isNs9Os5%XT|Ms?(6&Ftm;z}`cx-N=sPEZ>T)k>Lb-^ki_o;Y!os=_ zDwPb)Mf6I@zG2ktcZ(x^QNl!dvDyV+;Ly3DK^V$jWFW{ zA4~2dtxC4l8dZ~)V^wg!swp8)t-_Fje2u+48nW4DBoAexc{caf&r#gaQq-YyHXml* zosIU%xNVR~%;ELT6LR=^7P!z_814);#eQkEzA`7~@e7i?SjiPwz}>})mE6UgTEHhb zxi7Q2DPPp9UA4koF_kl!trXD*xQF@KM?6krS7J?GW$rwaJ37d#mGV*+@V4gp3wV)a zx54VMQM_D=%Jo~s?KJWx#cj}1F3fBh&*t*?3J+h24n;KzybfA({iIlyw#I7O$?8nV z-N@s`<+VIO^qIlk&EJ*q1+qJCAT>4p*=ijY4!?4LF?|icYxj#)Jz}1)mK(Ty6pHwG z1FtXK4`FIdT*D3G;s!q4?u6C#H*?BH{zQ^bDz5EI(MtnMd5PT_tHW90w3$DZ&nf9_ z3(|wO@HjhMWoqhDZqC`lC+g%&io>;?yuLC+eMIgW9%yd8i??N7l~!Nea%!6DE_dYC zrp`CF+QYkX`MOfXlzn)|l70Lq_gmI{x2^fMi}uGbHpTn7iOIh!{`Lp(qUHzqLGJ#C zHN$f7pCUA$5H*J7kIKk=FEeL|QKn8QJ(8z73BPh& zvU|CRCFR^p^epG@(hor@OfSdn>v|&vnn>^C`#imT|{f;v!aX0RX!hd5zCcN zo+wT$pKgi5t^%K7iK0C|{aYj|1=&$tQbt_Qw2Y3iX$e|_m7bE^IZ@26K%iXpwpdre z{iHvW#Ni5D3!+n%EH;)bxW^>?BlGF*N}|1zi1V0w!TyKChD^l)mxmq^9&pS5s4xEH#^-g;X)*3c6_b2w}RyL)!j2R>@%T!lBaQ^^XE8$0_M(Qc?!e z|KYb`k|@7|AirR$u)T_V^yaA|Qu%!NiRgJ11L!zIymyt?m42Kl7GK3}s$!-vRAS1W zxyoIo@pHvpMO-~s5hJA2MWSsb&Z^}_!dQtL=(Qs8X(cuU`doZdi9-JRuQ*W&fA@u= zO5xj!MbI@K5~^9E)X&mi@f|y5q{ntl`e%o_FB8UVIEMt5h>x$KRxu@F^)-Amuy(CD ztnk6L;?6a^aPN9yxQ@@5&7#G1=yu!8y|42UiET7j-{i+6^OfKEO1;jN9j7KNR?L0E z+auB*7ssCPDN-znSyep1Jf@1zc4*k0MO*&I*b3T545^PSpMP7iRLP2@XlauqA~kX| zmomm!1(it#T`U!{SYF1=<27;&XPM^BHu4Eqd9M_^Rea_r4;6p<$(L*d1!8o9k_88F@cJTm>$J{r0Dfu7IC|@4&7<3*Q;&(Hr2? zunT76WC&*HRcB133MtWnMjmy<;!F!?eel4BYQ~q#wW)-vnV7gr|VwUl^rVU?lG0HyQ^_PH@5>jLvHi6TwHpA894pZ6i?w zN31gNFk6Y{=p{0Bg>W50OFM~%J4iGD`~YlllqlIvqC&6^6YUA?INZAhxDNOp>`|c- z{RD0W_NpUMVwgma!Li_{unTZowsFFG2M1xT=C+b36+8zV-dduru~>f_AgqM&N329| z50I!F{5`lDS5qG&YVC{(1l|Mt5bk()!T42*E`KOd|CthXzOlGt2viW#iFbBX} zV6R?|N`lkDX)7e!xK5(|;7Qqc=Y7O!B6vI4>0?xACa15!SHRh`P?_1B&VcbNF|D4%>Bi@r9)j(#Ql=N9^2<4S z_z)Sv6IPfw{j!eJdAb1n(=c{FsLa>Cv0bk2>;2W77!M`{o{x4l8Q;YTZb0P@8 z!66fN2A&x3N$_;oM>nEX;4|PqVgKh_nYx0{f#b|FHNmzy8hi=71NJxH;V&V;mEcy} zWqNxDS`GdK-11lOF_}U_F-esco(33>%M=CSId~!LWhZ264Q7aLQKx0Pjb|`e2adZW z(}T-0Edo1%Csp9(S1^QN4{##(=vjCg)FJW)hv0|iJUmUneqi=kCWj{&GO#He!b-p+ zY~-CGM1!Y2g)@Hk?gj1!-UquY_UVb>(cnth*K9Sk1}wl$?KO1LQA2mZUx7LH=ny=w zz)QhDxoarLS3`Bfhz@|ihP^F9L;b=q{+@`(zXPV>z;+xCCE%^F4|dnk$Z+i62(P*x z8hVZc9IuO=4IJD{L)C-v67XDbogo^UZq(3R@aN#~U^`@M=u2=ZI1+YeJSV_gz`3yB z$8)AG#@`HK8DJfri*Wc3d|;1M+yNg4KY^W)ry<9B zM5n+bVF$mbA$RayaGeh{^fR8(;0NHxu;+bwr4Nbwx z!!-iK2VMcYWUq!yi4Zi{K+Xd^51|mSA9%~p8VV@W&{yELU^DEj(;7Mr&IFITpds&z z8fw`9hY4^z>;cy`6bmi_Pli3?o`yaGo534kSNy4=J>cD7j|Uq1?1{!i#~>Vm@LiRL z>Q!s#9{3*kZP-7^S_*GS33R zwbZR6GBw7j7Cahu*Dfd!Tn9Vg<{nxal%}Qc!S%tP!Cul|OFx6t!TVwF8lfepNTS)` ztFYZoxCIP`Fb_gk*w5bAQUQ1y_{#}evY)1<67X5@O4xtS(9$I^{)~pI=4fftd@UtJ z;ZlMf^EcSli?uWX+y>lqiI%38XlV^N1-x;Umin&O(h+bTcp_}m=*?QvMB`Ko;iVb1 z->s!S;8JiU?6Lc`G#h*fyaD#lcuK*C!LMNZ|EQ&H;FI8mhqdJJi2d6k0HcC&|lNix?5V>3mya>gOg~(XIiS$6ypz0 zfju5S`1J)Z121MeaZ!s7<(zz5_P|UxdA?u8t0Zn}Scnrg}Om12+fH zf&Cy#N2kI4!BeAkl+Xf|Y>s;c_&jX;7#+oc=Ye~h+T+h%<8(9`!UhQIVW)P|Q3?2G za78R?K8q-nA;^HgfxV;%TPw$r3x|l*&#`iF*TXr6Qo!T8Gn$BF_BI=wDZw3LBaZ;1UAi|f)ns59E%M^dm$Wy-4%z*A~&3PzzJF$CU9u<#f(1% z?i0#s3eJSKn1JQr3HW;K7S4QYz}LZ-k~w|WSf*|me?J^Ly5W2)ryrj3)SCk_ZwzlitXAL+pltJN-34;9c;%v!6|--|9q!R zmv_mu6hbdJ%-k*0#uGA`!85>vev|1bw%;UduSMXMXHYq8w>jWd;D%RaT3spA4)9uV zuWLBWV0SzQz5rgW$KHY6@FI4@tKdtpBe6HwV6$T;9J9^>+9H;xAl7?;t6+CU?9M^# z_65I!9d-zN0k{SD9PF_O#R8$YHMs5>4J~-0AvZ+MRB(4h(&LDnH^Du@A8NF8(N9Z5 z5gFeF&-d4o0g><}*pvg|2fzqKx`~K%%Iu] ; + [] ; + [] ; + + [] ; + [] ; + [] ; + [] ; @@ -1586,6 +1587,20 @@ DEFINE CLASS c_conversor_base AS SESSION ENDPROC + ************************************************************************************************ + PROCEDURE get_ValueFromNullTerminatedValue + LPARAMETERS tcNullTerminatedValue + LOCAL lcValue, lnNullPos + lnNullPos = AT(CHR(0), tcNullTerminatedValue ) + IF lnNullPos = 0 + lcValue = CHRTRAN( tcNullTerminatedValue, ['], ["] ) + ELSE + lcValue = CHRTRAN( LEFT( tcNullTerminatedValue, lnNullPos - 1 ), ['], ["] ) + ENDIF + RETURN lcValue + ENDPROC + + ******************************************************************************************************************* PROCEDURE identificarBloquesDeCodigo LPARAMETERS taCodeLines, tnCodeLines, taBloquesExclusion, tnBloquesExclusion, toModulo @@ -4625,13 +4640,15 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin , loServerHead AS CL_PROJ_SRV_HEAD OF 'FOXBIN2PRG.PRG' ; , loFile AS CL_PROJ_FILE OF 'FOXBIN2PRG.PRG' + toProject._HomeDir = CHRTRAN( toProject._HomeDir, ['], [] ) + *-- Creo solo el registro de cabecera del proyecto THIS.createProject_RecordHeader( toProject ) lcMainProg = '' IF NOT EMPTY(toProject._MainProg) - lcMainProg = LOWER( SYS(2014, toProject._MainProg, ADDBS(JUSTPATH(toProject._HomeDir)) ) ) + lcMainProg = LOWER( SYS(2014, toProject._MainProg, ADDBS(toProject._HomeDir) ) ) ENDIF *-- Si hay ProjectHook de proyecto, lo inserto @@ -4742,7 +4759,7 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin IF tnCodeLines > 1 toProject = CREATEOBJECT('CL_PROJECT') - toProject._HomeDir = ADDBS(JUSTPATH(THIS.c_OutputFile)) + *toProject._HomeDir = ADDBS(JUSTPATH(THIS.c_OutputFile)) WITH THIS FOR I = 1 TO tnCodeLines @@ -4853,6 +4870,10 @@ DEFINE CLASS c_conversor_prg_a_pjx AS c_conversor_prg_a_bin loFile._ObjRev = .get_ValueByName_FromListNamesWithValues( 'ObjRev', 'I', @laPropsAndValues ) toProject.ADD( loFile, loFile._Name ) + + CASE UPPER( LEFT( tcLine, 10 ) ) == UPPER( '*<.HomeDir' ) + toProject._HomeDir = STREXTRACT( tcLine, "'", "'" ) + ENDCASE ENDFOR ENDWITH && THIS @@ -8048,7 +8069,8 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg *-- Obtengo los archivos del proyecto loProject = CREATEOBJECT('CL_PROJECT') SCATTER MEMO NAME loReg - loProject._HomeDir = ALLTRIM( loReg.HOMEDIR ) + loProject._HomeDir = ['] + ALLTRIM( THIS.get_ValueFromNullTerminatedValue( loReg.HOMEDIR ) ) + ['] + loProject._ServerInfo = loReg.RESERVED2 loProject._Debug = loReg.DEBUG loProject._Encrypted = loReg.ENCRYPT @@ -8059,7 +8081,7 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg LOCATE FOR MAINPROG IF FOUND() - loProject._MainProg = LOWER( ALLTRIM( NAME, 0, ' ', CHR(0) ) ) + loProject._MainProg = LOWER( ALLTRIM( THIS.get_ValueFromNullTerminatedValue( NAME ) ) ) ENDIF @@ -8067,8 +8089,8 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg LOCATE FOR TYPE == 'W' IF FOUND() - loProject._ProjectHookLibrary = LOWER( ALLTRIM( NAME, 0, ' ', CHR(0) ) ) - loProject._ProjectHookClass = LOWER( ALLTRIM( RESERVED1, 0, ' ', CHR(0) ) ) + loProject._ProjectHookLibrary = LOWER( ALLTRIM( THIS.get_ValueFromNullTerminatedValue( NAME ) ) ) + loProject._ProjectHookClass = LOWER( ALLTRIM( THIS.get_ValueFromNullTerminatedValue( RESERVED1 ) ) ) ENDIF @@ -8076,15 +8098,15 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg LOCATE FOR TYPE == 'i' IF FOUND() - loProject._Icon = LOWER( ALLTRIM( NAME, 0, ' ', CHR(0) ) ) + loProject._Icon = LOWER( ALLTRIM( THIS.get_ValueFromNullTerminatedValue( NAME ) ) ) ENDIF *-- Escaneo el proyecto SCAN ALL FOR NOT INLIST(TYPE, 'H','W','i' ) SCATTER FIELDS NAME,TYPE,EXCLUDE,COMMENTS,CPID,TIMESTAMP,ID,OBJREV MEMO NAME loReg - loReg.NAME = LOWER( ALLTRIM( loReg.NAME, 0, ' ', CHR(0) ) ) - loReg.COMMENTS = CHRTRAN( ALLTRIM( loReg.COMMENTS, 0, ' ', CHR(0) ), ['], ["] ) + loReg.NAME = LOWER( ALLTRIM( THIS.get_ValueFromNullTerminatedValue( loReg.NAME ) ) ) + loReg.COMMENTS = ALLTRIM( THIS.get_ValueFromNullTerminatedValue( loReg.COMMENTS ) ) *-- TIP: Si el "Name" del objeto está vacío, lo salteo IF EMPTY(loReg.NAME) @@ -8128,8 +8150,10 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg *-- Generación del proyecto TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 <> - FOR EACH loProj IN _VFP.Projects FOXOBJECT - <<>> loProj.Close() + <<>>*<.HomeDir = <> /> + <<>> + FOR EACH loProject IN _VFP.Projects FOXOBJECT + <<>> loProject.Close() ENDFOR <<>> STRTOFILE( '', '__newproject.f2b' ) @@ -8139,8 +8163,8 @@ DEFINE CLASS c_conversor_pjx_a_prg AS c_conversor_bin_a_prg *-- Abro el proyecto TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 - FOR EACH loProj IN _VFP.Projects FOXOBJECT - <<>> loProj.Close() + FOR EACH loProject IN _VFP.Projects FOXOBJECT + <<>> loProject.Close() ENDFOR <<>> MODIFY PROJECT '<>' NOWAIT NOSHOW NOPROJECTHOOK @@ -9273,7 +9297,8 @@ DEFINE CLASS CL_PROJECT AS CL_COL_BASE PROCEDURE setParsedInfoLine LPARAMETERS toObject, tcInfoLine LOCAL lcAsignacion, lcCurDir - lcCurDir = ADDBS(JUSTPATH(THIS._SourceFile)) + *lcCurDir = ADDBS(JUSTPATH(THIS._SourceFile)) + lcCurDir = ADDBS(THIS._HomeDir) IF LEFT(tcInfoLine,1) == '.' lcAsignacion = 'toObject' + tcInfoLine ELSE