From e99c28e5f851fb8156502e2b93800313f93bf401 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Fri, 12 May 2023 08:54:09 -0400 Subject: [PATCH] Fixed zip distribution generation, using the actual wrapper jar of the current repo state --- lib/bld/bld-wrapper.jar | Bin 27279 -> 27267 bytes src/bld/java/rife/BldBuild.java | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 0313f36498038539725136691a7c13e2f5dabd37..86a8e271a706e2541c6b8f796a77ff3c38d45cd3 100644 GIT binary patch delta 13355 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 delta 13405 zcmZ9zWl$VU&@GG;AUMI@CAho0E$$NBAxLl*hv4qExGnAu3GVK$3&GvL=Y8*wd+VF3 zuIcJIbEf*&^i1^$S%i*XghmA@!ouM|efjbQ%AmF?5j6nT@V_aJ57=|OVL_XW5*o@( zj;}{;@eN}EZYC5C$*P|k1DYFc6e`hzc0x(luu99`$ZpZjsIn!%-WKfm&EpH8q-t%+ zsYU;MYi)2%|GX5e_3Xdpb~&*jPb-oCc{@Dpd%3#hHr3gC$)D`p>v<(lsqeITNHxgC zyw*yi+1=jT>Z8NO2js(#()Q%PgwjjdFEY&bJFsSKV{7Bo-6Z?!40c-g`%z9emC{+w zx`AiXU#y5%{iqf=%9Hy-xmfk`A{o$-`6gKpXsT>Q-x->RBm1_(m59vQ=kf3Npd_r) zvw`Gw^X!+>xXT{`^-ZhuG^FP!&R`?94n{F=F8MUROk39$3gFpoq-~}0d^x_x-B;-% zkV_Ycb#0QXXSH)fpKQ`J%c3%T&;Nb#LjOgg9!j~4IEZt+biX3BVrEdQ1Eo*dc8aG( zduX!7Hf}=Ha)B?ieO>mpZs_jhsORbdaCvI#U?59RTF^dqP{PApz)|{hcE*%?2`^qM z*PG7kNE*ob0~n^9I>#&8BuI)p{6e{_+q$5$?vBN5!FUn-5BX6xxI1?AA#McFG~Blz zJLgufOlN)Bj?j27(@qcBhSKt1gsUu7fT$F+{B zsi6mLm$-698~juLEH5BU+YZ~EMp1tF#%%FVr*ND%y0wD4|}eMEv8LW zP3H7C7f6;awVYjp1eyk4O8kB+r$_zD5y03W)h9rDgxfdrzjl0r=?&ipNTtss`niWG z19h^T%=zizgr2^)G1e zEH}Rrm(CnJ#Py?dm%ayvx{}pHXkX~vr)z9Xgi@$ya=!oLPU`e`N6{#WSOaYegTygS z(RYc8X62gLS9glyX%@fka5a|@!niYS0$Cg$ey;FcZse{PCK~lm*6?j2`4gfH?(3>l zpAP6!8_GqoT+h=LR8xqj)(q4TD#^FxUr1+vcU99;=jD+VV^BIRQw=tfzL9BxE04Zt zg?ygO?_j6%DWRI*jH*3ZQ=0&XO1mX8_e1;a*VmVLT0EUjjJH>|W*3&SN*jKa1K$di z^V7E)i3Q>ow^dC{edao|6M0OZ(@cTiaYoh#x#`FEXDP~L*KnA5Eo%u3w$xjD>YIHn z&F!syjoiZYbjXQFb3yE|MB2osn*`34p5cWsz~_zV&00m+fETRdehui{+eqct6E%8h zK4On-^TZF3m)r_UC09jVk`TitkgSzK{1sHVhbe2M!a$;dL|O+axSPZ_p{1`0kMH>^ znYK!TOtscZ(3mBEnp6TMEFa;2_bt0e!9>y3!!E%+Y$^LB18I8ehlD~S*jnS3eKO0a zXk5SN$2>2D;Yq$5^Z^iBXeyaqoYiQYYBep2&x8IorvMo+#bIRls)pGJ{Ny?u*%#yy zR@@$x2`o%AHQ{TiFjO;r|j8A7C@@c1Km3Y3`A;PDqTQ-?Gpg94jD@ z>@ey6meDtvp)V?o4%<|BS`76bYJ4}V$n%~Ofbh<~#CAtY988|8FR-RcFzSvzlM^JOSdjb+vW#0G(kNbo;gKXW#!nV`0`MY|E6j7z>?K>MT`<8iMO6zH5d z-`snahS}Qx3j?g@Q-T5f)xFS3Xm>9$f)(qv4qyQ!bq7FrOdp zUc@nI@pvW8u9mpKeYGztoy7^RCs=G)cx#4#lXC#o!Us01P0p#4s9y)GmYaEDm1@M= zQfcA62=QLMIwm=v+AO3_euXdweM9||izFDpKYur;BnN3(gPPvk_ct`VMG_LM(2?=@ zgHyMCW(GUP&V&u}5Jx^fFpTUYZYs+TWwx&>BwQAkDL zmH4M(+9xw>U61mx?v|_+we^_B%qibvm39r3t@#ly7YscaV)!(1ar4JCPaGW%$Uy&* zxp1oFqwBKr!wb#1Npx10vM6wEtc%=&eQ(v3}2M zlZ=ATKD}+rH1ON7b0eZM6`-)>_t{wvbl)jAZR5p1H-eydqNZ1Tp=M=>WuMV0y$ zPF*pRBJKQ#b?4Uc0++W?49A^~80qmI?o}H5i7&FbY`6(MY~LRi)MP(~H**dH(&>Vi zW4Oi5ZjE|DgIe+#)=E4T$!6usM3rxfiDEC2?VW^eh@|8#cI=Cb`RPg_qOW$%uMoz6Qj-SedxreVj(BB+oOBSe|}^c-@PSy(gl`}x`KPAui@7@a}@TzPXF5p!&yeUEUG)?F%rEYt+~q4L6J%<#ma6;? zgycEg-NM${e4{k*b^Q1aL_3HFo z-9GpQgg!n$sb!NTm&A^bm;~LhnKj&nPQH5MlLF-2(`>UccF7f56irE*o-zJRK1e=F zhpe;@%kq+BZ}{8=B%!}PG4TMka5edW9VpuE%=p-oEdIStx4ci;D+>7EsIUoHw*21Q zWlF1P`1qD>R{a8^dM$5T;l)@i;4|=s(F{=^Jq=~#sC8d@CPjD1Bs3{TX1$bPKG|Kf zh~RJH9X{&Ca6euA>wsTe?_q>a9-{}}-U^@aXsuuafOhjzAFE$3xv98B^>0#v!2aI5 z>sp78=I?%H9g@O^6#ziYZGp{?)|2DyxMm67g1g(xf-j7M`e#eOs-4bon%?@4M3LQH z#B0T)>R$650v2~FS(h-;(1u#1_X0jp=7);qhE?=+zx^J>Uo9fbBI@@AYTj=D!4u=33tzQ){e$>N&R^(U8I)Ns>2!1~ z+v*f-w7X5;hfW%eH9!}b*y%E=lpcFarZ?$*edbcR@f{YAKZ#=1o*c2{XV0SQ9Hk_A>iZRwUQ>L^Py!eJKp zH#=mF)k^X^YiD^Obu3h9B2X>}Yx$b>C$BmdDd9@Y$Y5mOX6*^QU}W#`nD`^LsYxbA*y_T-s!_8Q@-QxDkt|ToWW$;#`s;@&{W4oxPVa7 zMqV5Xi;kNkw<=dka|!DP)3;kktx8-mzg8J4$&jMAq?8v+EvG8vU8#CcGXV8d@(ZJZ zmSQ(sXcb1%WY|HO;v4csnUk$97J#mbMx=Q`yR2LzInVz40w)}B+f~&AMIw4<2_U(> zl)$I@Jk*(XR~(9rGHf;X52|i2K+C*Jzj?w7s^56o^E+|o%%&#mnf{Ne`9%VZXps2K z_k)+dvyzG}ZKgq_$#d=m%kkJ2{gSEBuJ8fj#I2drnTw;5ngn)q{M1FC3R(j&W>pH& z8atdaQiLq`dgUOHx*}I9Qni^qH>15`Np2W0-O}*^1~6Vb!jb}iFRr%Or8fr4%ZHD- z&uwuG3)lYTV*Z#eHE{MDzXa!^HeJL$q6;obdM%axbihr@DxmG z9KUL|f>{9l6EoGLBuheex}2uHB|fH=TFx(0l!FIn(tE(x6}zg$rx8F`!VU3g&y4oE zbhTRyR8cqxcYtwEBcx>wR49+PdcTS}P4Q$52@q?HknG&RnvY@+EL`qxz|FdE=Ynd2>%#5=Rh91oh0dR=gDEl7BfeTtShE_=$^g!FL_! zBv9|6Fqn+Baxi0vfU)-Tl+fG#vKp?F)K0b;=z!zS73&TjoiA-UmO(+AN{d}Zx_or4 z`x>5B#Pg-9&o@tar%nd`5}UA^9!|RJUjio6ST!D3Pm@nIRIK`Pz)}%DF=wrO`+c*M zG~RZFAZ8AoW@`Z0L|hMt@07lIF+=G#5G+#kATYX<2Jkb0gK-~HQ&}C#n-7A5SxK_} z0lX(4K=Z+2$?%bje1=!EBkG1VDnl{*q`9wC6*jB#Kb@tnjcF#KcmHCn51Iz%Q?0}V z>I&Cji8OC(|2Y-o_?=<-4k+~B%}qRq^4G_W6KomvJH^m=K4Hj$TK(B95TZsd3=Ufq zzYhiHX+~`N*}2f;-cSe25PvqI__ID#Rsrr!3UBZ()lKhYUQ2DZbu8sqr25Vk0c;a0!>3n`7x;@qbdKeKOnsj}#xl_62y|0b*LymIQC z6rN!-auT~Ri1-`<{$Los!X_rV1lo>kIIo>Dn|~s|tbD>`b}q32W+g>A+8w3 zKtG0wmvUjEf(@w?o8=;+mi0EUzrBYu+L_08G%Aml37m%Gl=N3xPmxMj0E|eVQ2Bus0iJI~E8~e?3?E37J z#qt1wwB&)}VT0nJiHYqUfGm0to0beOgbQ(#Oda8@e}9iK9|_e{MTDavPye1=q(!h$ zPcl>Xm+9Cl#*EpD^UO6`^P)4JGtg>3B4An2w?k&=)_i(cJf=VbA@%1<@nzlZEb=;? zO*gKAc;~}1CrUBI_M0n80?W@XV0j0@2ldi%|BivB)Q+f%J6%KxAb-f~i!5VDipP=3 zNwPyX;4Zp*wSo&mJfq0kaz7fr9@u#|WnQR)_HxH?VLNEEad1}B#4on*5ev4bF(X|@ z7oNi;{F+6qLlHYa?%0t6MCkcueM93P4nA`i)|7S@@YmzvfFm-ffAxS(Gg$@bYX!Un zAC_oYqU>0nYPE;}H5#}s2Jx$3X3j1#>OWtbT{09DIyamL3h=(In+|EG{_` zvM1LLi=Vw7i8dIoL6*;3E@pC7A{mKX8s5*%>3TWEV^$NCyU*@hF6NH=Wd3ga9gO+P zx%1ymGe@?6FJs_5=fdW?L;ZLuf9VX@GI_#$MH8A|snbpd+!?y{X#MZudseWO^Anri zoOWd>Xvb7wkQbq;UWf7aZcTvNFoP(b5AR9Wx%r;Q?cdG{`|f87(ye{n%|Z1t7Yvut zKH$p%h!jTYtgwXL$1P*yrCwRkr5w_~p*q>cQPI zUNW2t{Snc#anyQ``1i?@-|pV($Q3Svtm$6s#cpS2^a_l2?sT%ghUdwN!zo+)9SMZA zl`pf9Zhf)j6#X^yjSw@BrXO$Po4@b|Pq%EEUlCXoNcmg9Antm}gR4a`ZmL$45kyT7 zS#A{@OQ+#1aAI+k)>?&(D;c&Gy3aq4PcfO)Rj)BbnFc7q-SU)He$TKcG$4H^>^GLa zZ`V?B(z5cLt4__H$~W>K@IEXlV-@W82*=H_Pf8&CX$*Odk+b@~x#b!1SIe?=xP8<- zuact|*fShNiG%|yIhSWX?M)_B%i*PX z!n3@7Cc&iVI2q{JyBQe4dih!!m9_J7`fC~i?NriRrHBpA^f7*_-Wanh>BOg>zIZ5m z)zqBno-fDqi=<#{XgQ(`wSWq%x}DDTT_9@@Lt4tmPxk?I(V1N?!OCU68G`o8u_Px+ z)u9wW@z`z@h%`ncJDv1e_?gTt($JDMV$Wmk*9Ec!*4HLsqBQPfkKK7%1UyeBaLG4; zMeAZ^wE~@w8^1&5`Fu{f`0$EkAvBfsAXH**s>N{vde`kXj`pptxE}D%ZxH>8jmnYt zTElF0E6jv7IOZ<=ppt(hQaf4V66aH1SIh70zTYN4WmAEv2h2)4{Agan0>2l?AC;$` zbskr5=qdvz$_1sJ8gla8pUq<^%yt=QpSOVWzJ(+}Lw%#&g-TxxSU zo;M*D?~v%y&1{NeT5n{g0MG_Ap*PU+V3AUc(4|(BqLT2e;hSOHxyk@@86A+rf@c*D zn|2{1(^b4-L%kxEi8{}hcYdg&jjCPzSbJiGo7#E)OVq$oTApZDhZUCyXY)T{fiXkr zDJy=;tILbG7pO@-i30-@ph`0I10X7 z+3aYH_!Au7tUXJ`S)D_Z8+V5l zeDLTcEH;}#Kj_2Dvo{;?=PhrV`Jz3soeo>Fcj5i{`$g0Vtea0B9i8K*>q6RjhyM+! zUlhtP9~+ik$1(jTY`3BXc+^Z`b{GnU zvcj=fYH@m`o@S78QX5eiXn;eKdy3dgyq_s%XJk(EZtuUOc{#ZM7-EIil)K^Q8DB(r z&><&4=l7=Ox&!b~f$8$?o4ipW6AU>=?w&}4oVIR%$N$L3^B|nJ@)c*x44*3)+_ZZzmp?JXRw`w&TnRu zWRCvbj?`Vx`Q6DsQ~13?qZEF%lt5A(-bX_(q_~GPSG7FV_ZZS7^9X30#;{6f)8uO$WB8PMa}FQyU6Ychvf0`Yf)4pVx_bPd3 z8>Z0ey!)R%r4{e}L6hD6?U_iBc9cvNffrT`PQkwKr9qZCb`!!#a7Ih>mmfR433*6F z5QTSQQ@ZcI;{I@n7Q`NLJ@LvT%~L44#|E1sXE50;&A=IJCm)(A+k#H=V>;)mU>5Dm zt0Vl4IJB8X42xAuH|hp|8@BPOAwqgm!?X)oeouGt>aP!vo_B+i%>gK5uIe6ES%J#N zeK0a{M5{?Z+sA@k4!jZW+S8$vdyUO{;laoIj74s5xEn}Xv14EECdWnqKxeOjE~y&$ zRBHd@B;d2qw)6Q&8}uQZER8X58TDWtjp1P{HPjAc8z8{`OB%Je0qRLP!){V#WhGW` zGm2a34_Xp1)~+5btP~?zV|TG9J@umUq9cue{R-d#&Q(Sv?SC-hz`{VcEgte1lBd-RDsW^&sk8h^7ae7IfkhN}80k|HWG_>@P> z%R1@HGdQ_1uhb6sU<+cH{yC0P{&m0C7C0mt=4vUUH@XeY_O8lvDe+9wn{tRnxHW(1 z*>~h0^7_&B8rObVwfSg#%aXRiw^dTm7XOw3u}!&vx+l0?YIrXmM^oDhA9(vg*qR?j zTE;-Hx?Pta=bK}dcD?ToGv=lya{V(a|KmIBe7r`g5N@h+)5-Y9uVg}YC(E}_CziDf7RD!Wmlj9R&9K8s1KK5QbC~DpD!$V1(JX6 zr0`BjiArldOE9y|!;knPwPtJ_F$S_Bj0HDCIKc)LBPS((9oWJJj}YvgVP6}DO-1FI zeMfgu8UG{!h=#j}f0oY)N>gl)RQk-HK)8>xVd!(Ugnf3g73atqH0T_evXguQO83%8 zm*m$}*e@ve)5=VBX_UYTBZh&ELoC{SryC3_Bt2OuA(S6+fYi6JRCn&Y(nH5FYJJ4C zeGD*cG*02BOJrVn(yKNK;Pu@9u6uxt?j($*?CQ1w?wwJbRdJHS$MO$_k4K2)esAE= zE2Q?@Dmj1=A$E>X;+{#6il{qcowx9TLHqmT?hP4SS{p27QgnakArRjq-hHRM zrlJZxG!LMTfcW?fB@}x17KZyZ`w7F)QpX2aa@QX+-=r?e?51z7w$=3D#mp)(n zQWn(9G7cM`Ut&9~|N6;hkf3P&ht}}xg0X_m+@jYu+G-cxYYyz_yXe1j@sS;ol+SolHp>WQme5b} zJ4v>2w*=r38FUD%>EGx&eAa%%Cx+q|>npebm8z5UjNN6N;_W~!;~~S|5b!gN=_fR2 zcW}G$9|vIYMlZq%u+O2^v}c)ZKcD=#Rua%>k$aYYX3Bf2+F2U3GtBU*j=-2Q>jE}cR ze}=SbV(^lU}SL%?8tI z^b;OOjs#!92Kc9H&;2cR=8jbqGSA~CvO|2z;EUArXuJ!A&xXCm7{X3eTwq z<&gvLB0Pukqc3Bo%%>nfBa}ra^b_$!Cl1M9hUes_DyV4Zpz=R^a^OqcChK$=ghEa{ zj?=y8Mqnv8PKihIjSCVUB*-^QYJb_rLK{Dg7Z}%K*oYAxe=C}BrHE+&ni~$FT@JKdV7Kv>08kE4$L=gYlMAzBAnNGV)!|V ze#QA!c27|H%^|qgla5<)(akA!;(Nf~WJR}o^=*sogN@gUEt)!yXUvo+cKv2@qpBCj~yR2!t z*-<}^#T%^3;}Un;dZYwenn0Aqys!nm44pBI?g;^DTSo{8AIuVdT$+;;-` zgHhS-F$P`~tv9wCL$UPvgCz9e{mHI8Pgfnri5Hm3nNMin16P8ct)X|FAeybWrfF{SH@NEaCp`rJ;rMOzgKxcOp; zG~7n?nU{Zetx<}i2ElacIdr7*5u6uH*&gjcc;q@U#auvQ85d|dC`rVsAElbdHqmF%CTe<_98uVKXL09b2PqGzr zUq-CHuN5Ae?Pqo66O{W=lLeH~*N1RM`|{nA@O}RTxugpjX+#lzEqCIbrFQknH!Sg* z)_hVNy_j580;8XlP4`$DqM2`>o&T16n_}v}EY@+@z>W+2jZnWvVtPP7xyzS&ouGF< ziuSf(r|PN`&8nEWcx1L|)vPH-lh*P*J@e-Gb_xH`XK+}m2~=maaa@f=R96FK0Pk;6 z*6s(dlhpJqepY$b=UEqAfNVoh$KAX5X#BATKQEnd8c@f$xQ!BYCkN2+lAuJVXBr-q z%_HJqdVZy=srg`$nv1VTebrP6CRHp&#`wi`sS!|d@FX4vU;quJlCdb34;*!Kf#4mb z?Kn;u(b5GS+RTn}o64)-FjUt8;qWTT<$Ld^ZJ}9u=I0tTw7wK$te~R}`Jg>wCXfo3 zF-d73&`T@aMvsG_B1)lR1bRl91J|yH3aRU>@32G^dSx<35x?63ZbjH1yZTU*!KFF@ zW>6a5F=dy!$Dc|HkhWwQOpHL4qPB~6dZ?NR>>~>!BU8(q7`7dAhunKp!ya*2&s;^i zc)JVd_FA2Zhfs~cIH^W1%w0~X056CK&j6hW*iN8|P4Rw9E}iN{CL?zjZg(h=H+c*A z<@NHb2^;t&>c2nZk!5uXAij`4N%0l!)jimSQB*<8k280mb;h=CtJzO*@p`x-@v=bK zk1p(qg>a{nVd|0M?v;9TD!=sg8Cqb%7h?PI{XIccws#j1694Ay6Wc52e1&&%*%iM9 zJd)+_i#O+ft%p!x(XE70qE=}9p^N$jy{7}@C;Gm)yOiMtH>kZu-Ao5! z5kU-zTKI;~>`0bEF0%aI&<_~+`DM=yooGepyyQrmihfxFaHS?vT_ad7VrEeRys4Xa zPi}=+$xdu=86EBt_QIC0IKzA}dgY(jndUYHO$}z-5S;^-GagY_I5L}vX3>29c99sb zE6t1jE(4wCL+AUWtbMG1G3Zd%dEP|YMxY+zd}e8=t>&VGE?$SswM5hNB2=g9VmOLA6@75g#J$A zDos^YjBN6DFjHAASNtkm6!D04nY7|U;NUy19i7Jy2=yE45*nsFM+b-ix7-J;M|`Bl zq)*dAUv%BPgD#O?HW7?65P9`U`ELRhI*QCgriH|ZI|X=f4#t>37mh)}U1XIHo=EqQ zC1e6e$CjCbQ9iX#1kv|$F|tp@(IT0w<42>^d|(I>1|ZbYJ{!0qE4{wDe3e0^aA3smw?rV z+_4^K^}g6e1pRiF?Ig?;dLpV7AL)DE&mtp=H@6zed)8$ELK|(MJn|Y6i-uA`4vbH< z$e9LWHs;7te+TM-;>?i6)=t($12S(aTZsf2z=T~sl=9xg93LjhRdd^Kq$|&x{!l3U zmNo!;9f;ELEK0hrpSCy8Vc#-dW=Tt}lb6sn5qdC1$*ewnNQiq2I{;oH?pXcZ2KF{> zEz>yjM+YaxtkMIIZC@8X^>=Cf$w7JNmF2|R+u-l&qA9^`?mutUiUU&gf|!N2J>RWt+pil5xT996_w!t#K!&+Lki zZ@SCzF|0*!lB92bg1^b$nd%n3s$Yyp{+KZ4_yO>GOgzywU~Yt~KUiu*U(&hW4e9^^ zV%;HmYX;H;b<=Xl-I6Nqz&ZvjBHKRD+S9TMR>t4@lM&>f8)) z{yunS+Pmz%SGuI+DDe!02Y$v-&AwRq1Kfc2IHgT#y5RCK3yPJ7MVzei(m5{f*f^be z+a7^9#ziIlN-MQ)fjoUJB#%GtkCpsf_$$oJKKa zTf}3}e{^;Ijca}+o-81rO4M5>K&o5d%rH^^7*gSpm#A+YmJ^%xEIl<*txaMkY8{Sz zLvVigW6U=qj#sZgglnoff!56?&qzeLzwC$dnZFM${%YCy##8$ZiC3MO_PaT%#9t@i zcekKyjcEkW1IUaVJVt`(+m6hU7ZIJWZ6;=V8nTYA0u!+wh^1Vqn*&62S^WDjHO@o1`^4x^iVr@Kj0Tg7-qr zR9S3gc1uy0WSC9-nnY_k_znpOhxvLHj#~KF$GXIAK;DRm8q*C}>efOnJENMo zogj)yxx_n9D9I7Tj40R{W}QlskZ;y-_#K~R1qzV zlzVMgWtrI=-@0}`9+*W3G@1;1E~@ zm-b5d50l;e@KDc~u7_?JQ3|hIy=Af{#4jz`!08$_9WWXu@{Pbn#0n)NX}VqCiVoTm z7%Ovr6790z4tA66dF9axjk?EQZ3!V8RC@;Fwxpl1s=H0V`D=LSc14JjX;^ehAd)@? zSAMCl*#+*TvEZ7Cw6Q!M&J znO`sc((Q-m~*j9v`Op6*kHHc;K`#^`#ggQw`^}?n>?HMBLbdj@!Oaz>kT2#tYfF! zt`Q;DdX_&zItI(SWWRcA{-if;*lbEoIrd%7t5(OWlZskyI&5ZTmyO@Sotd|LFF7s^ zg9R&|KA{1Mh+o{K{$FRu zlKp>|l5uS0VE>cnB%9bsqWuTe{=aO=bv7dZgH67+A%gBqMz!T5{~v%}d>oM<^M6O# zLO~Hi{l7z=Cs~h&7#*Mp4TA&qe}q5(vpvC<2pToH+E(KKkl7N!Y+EK@TGBH8|A5*< dYISiK{}H17XDI(KF%)*Pi5)3|q0RpU|3A?anuY)X diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java index ac14214..2309a54 100644 --- a/src/bld/java/rife/BldBuild.java +++ b/src/bld/java/rife/BldBuild.java @@ -5,11 +5,10 @@ package rife; import rife.bld.BuildCommand; -import rife.bld.dependencies.VersionNumber; +import rife.bld.Cli; import rife.bld.extension.ZipOperation; import rife.bld.operations.*; import rife.bld.publish.*; -import rife.bld.wrapper.Wrapper; import rife.tools.DirBuilder; import rife.tools.FileUtils; @@ -113,7 +112,14 @@ public class BldBuild extends AbstractRife2Build { jar(); var tmp = Files.createTempDirectory("bld").toFile(); try { - new Wrapper().createWrapperFiles(path(tmp, "lib").toFile(), VersionNumber.UNKNOWN.toString()); + new RunOperation() + .workDirectory(tmp) + .mainClass(Cli.class.getName()) + .classpath(runClasspath()) + .runOptions("upgrade") + .outputProcessor(s -> true) + .execute(); + new DirBuilder(tmp, t -> { t.dir("bld", b -> { b.dir("bin", i -> { @@ -127,7 +133,7 @@ public class BldBuild extends AbstractRife2Build { }); }); b.dir("lib", l -> { - l.file("bld-wrapper.jar", f -> f.move(path(tmp, "lib", "bld-wrapper.jar"))); + l.file("bld-wrapper.jar", f -> f.move(path(tmp, "lib", "bld", "bld-wrapper.jar"))); }); }); t.dir("lib", l -> l.delete());