From c6ea894f102b5d99815baa52fae4d76f2ce4c339 Mon Sep 17 00:00:00 2001 From: daboe01 Date: Wed, 23 Mar 2022 19:54:35 +0100 Subject: [PATCH] fixed: old style Jakefile --- AppKit/CPSearchField.j | 4 ++-- AppKit/Jakefile | 8 ++++---- dist/cappuccino/bin/flatten | 2 +- dist/cappuccino/bin/fontinfo | Bin 69888 -> 69936 bytes dist/cappuccino/bin/imagesize | Bin 69536 -> 69584 bytes 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index 2084ab717..73dd3805f 100644 --- a/AppKit/CPSearchField.j +++ b/AppKit/CPSearchField.j @@ -122,8 +122,8 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat [self setContinuous:YES]; var bounds = [self bounds], - cancelButton = [[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]], - searchButton = [[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]]; + cancelButton = nil, //[[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]], + searchButton = nil //[[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]]; [self setCancelButton:cancelButton]; [self resetCancelButton]; diff --git a/AppKit/Jakefile b/AppKit/Jakefile index 069654f80..75949255c 100644 --- a/AppKit/Jakefile +++ b/AppKit/Jakefile @@ -59,11 +59,11 @@ task ("Theme", [$BUILD_CJS_CAPPUCCINO_APPKIT], function() utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo.blend')); utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo.blend")); - cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo2.blend')); - cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend")); + utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo2.blend')); + utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend")); - cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo3.blend')); - cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo3.blend")); + utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo3.blend')); + utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo3.blend")); }); task ("build", ["AppKit", $BUILD_CJS_CAPPUCCINO_APPKIT, "Theme"]); diff --git a/dist/cappuccino/bin/flatten b/dist/cappuccino/bin/flatten index 1df033252..80b9ecf8e 100755 --- a/dist/cappuccino/bin/flatten +++ b/dist/cappuccino/bin/flatten @@ -233,7 +233,7 @@ ObjectiveJFlattener.prototype.serializeFunctions = function() { var functionString = executable._function.toString().replace(", require, exports, module, system, print, window", ""); // HACK var relative = this.rootPath.relative(path).toString(); - this.functionsBuffer.push("ObjectiveJ.StaticResource._cacheFunction(new CFURL("+JSON.stringify(relative)+", baseURL),\n"+functionString+");"); + this.functionsBuffer.push("ObjectiveJ.FileExecutable._cacheFunction(new CFURL("+JSON.stringify(relative)+", baseURL),\n"+functionString+");"); } var bundle = this.context.global.CFBundle.bundleContainingURL(path); diff --git a/dist/cappuccino/bin/fontinfo b/dist/cappuccino/bin/fontinfo index f1ff06158a2525d34541aff240713c0067bd8633..8442353e810d07013a6eab19ed131fd134b6d6bf 100755 GIT binary patch delta 1266 zcmZux4Qx|Y6uz%(*A_S0krgnT(uJXQwOh+<*8$D;vX;EgR~*TZzf9cLPBA!eKS6QW zx-sDHt-!dGhzVp&f=e`7Ety0~sFbxGi4i5ZkdYx#;21trG-PQ5R;WU)X$(Xib{&Ws#AX2=n(QP1~);bGj~eS)=D|qChrIK5|W`X zOSk8;3bIO3tDp!%M-bT|&m%!aU1m)Lp&zP)1%B-9EVxibF^pI zU5TpqID}5&c}34W_AE{M{xIx!jkRmj6yGkUS=GG@I2?9_fTw29(r=ARY0L?>Dv)&e zI|><2Fn?}GNYwO6K@g9y<=1x`?0D8Gtcpx-PWALs{U+7=(I!>#SDfGosrD97pzDIf zfq#iBW>jifKW!!05+DVN&G6#!Z=%KqqFi^VZP^259dJegOf|@j0CgoqqDBL}cs6^E z&iHEx`k6v7Xbf<@9eEKi*lxq_czlZ$$DH^A2A>eIy>9l=H$PA&s^zy=>`&v5uE$WsRFqzIscDd@VWSqMt;eAW7Kdrv#` zS38ElxB_6-o$BC7Dn?-rL%~g0Rf=cFKk|ZS;2%18b+9>GFK8#j63#DM0OGtq zI}Rl-9OG5?P%_NGi|%(Joxrd81TY@o2uMXuFSsxw>$`7gTLg@I1lyiwL^5pCGPA)k z+n)@R2wthscjhG8;pc*9Cw%AQa1tcv{F58M0MDHUQg#I5rVIv^p0YO31ca!VvL9T+ z3g}n(ubAS6a2{Sx8m|E}9qc=QPm;5))zi{i;;wJl?lGE5T3Z^)p%LBxX7kARBb(r= zA~ZLV6+%e5hgc(erh~X6OJy}$3Cbb`$|uNYk^D-d$89Vtw=|Y|o+&k#HkG@L?(+KO zR*SX4Vli3WXfC;Q`b+Z*HA54fj>}zZpX=;l^S(R%;^B`v-@*GWA5?>omJ~+^v`2~i z&KApM@%CeV+g=&(_m!=l-MvXZ_VdbT`|K|rdwVUp8LiY_E8g%Q>nVTB o>8Zthuz7SoBQM)wkT6Vuyme8h6z3)$q03UF{yl<5<-Xj%03ybyUH||9 delta 1216 zcmYjQe{54#6uz&&_7=AOaJ(slu}-$RFiYBv)-h?;x|O_YHxp&dp+In3(I}HY_9JnQ z4mKcfZ#9^!#)M!N<{y|4Q&S^o(yR<=y9ErJ1B0S~2CQjdIAe{v@%(PLp)a}To^!tM ze&^hicS9#M{UFPYLcgm8qAdny=w=}&LYYB)ltv@dd2YSHz2zlq%#EKNVOiDk@-tsIU)Uzz)#cPbUm8(?pYmuJ?mYywk?OM zdAsJl$8TrR&HPrLA%wh7=)SDgG|cbNS!0A;dOBR3J!7NR>>T<>&8k4qLrC&F^y-eV zngjo+48z9}dgX0=e~qQ9bTQxmCf8v&GzdVHJW+r~_ZYiih?6`sDHBV&$CyCeGXqOR z+4&@tJ;66PQMQNb2~mV04P>RS+?#&rv(!sTue>>y3~YT++HYu{@EbOq6=hGlf(M7DdyE00<=@_+-l+%-bjZ;#Mwur8v?8OJ`yPMg*c12k4fVDE|PQGnhOl zk-1;DOlO%8+VFvsJc3f9bPj}DAV30LLxpk9h|=|dBJ4+9aiA|jI(OobnH7??Ei5VX zICeUt%g$tEoLNk@jH$}@(M3s7Zc2#K)kR8!G|%Q?0X&?6uPZ_x)KW!249(xy%Y8GL zr{^S0Lnr{-bSAYP!;i9_5)4LPijc&l{^Mn6Fgp_HF$i6EI;IkX+J~U*3+ARkZjcf_ zLwytghaEh-!0HEuPXPL)n<0%N$Z&BD&!E!vFbMNc(IICAcZYuNG;_)Dx6TEQONTGl zRva{?yV!3;NDpqh7As9nR1rm?o@{@PVv zUVOqeGPZxyXZ-Ku#dZ4TDhQcrV|>JX?BlULd)p!wa%I{$-Tpzqq#r1}dL)=1zmT`E za^j^cRG)B}g>BE@STmA;dv3}V>HNBO>aSP-{OH=Lyt21yZ*~9db&Za8BsjC;Sm^FO zcc8HAxxn^{<0~FLaINFngOg2l#Wi<#79E`}2){j{=Twz8Iyza-ap4P-EnEHtTCS8W diff --git a/dist/cappuccino/bin/imagesize b/dist/cappuccino/bin/imagesize index 5d67a1ce0a9a1e20577f82ccdfe0d3b3e94143b4..6c41722413436bb6f485fb5a57af43315a7b5c3a 100755 GIT binary patch delta 1568 zcmZuxdrVtZ96q;eY0J}Yq8MHmR+PbbRJc6mpxh3&3mRbqHWnDJ?Jdv=rE5zh$i`y~ zxO5f9L5Z0Wmaw3paas4rl$kYB#&kY_sXIy@wt84~u*$Re@;zyJWJxCM=f(=MfKEZakF_HbYfDlnz&GS4RR>}A-7DItzY ze9!UBt!y}lWy^Y%p7JQ3?zKk=ss&gXWQ2PlE|N%bUNAzJP$}zc_1Gmm+Xoe*LTm=M ziOR8g_`T@m{E`=y^WFDS!bj_Z4=#*UFi#^Vj;6b3%pV2*?s$`XhiO3^!bjY(XNd)% zH3Wq!c-ALUQvWE49+dzfE)IpuK7AL`+ti-$ufak0U?+XAR*{>*O5=n9-t?orlBHe*> zikYUE1tgPKkPT2L9YGzJxWG!h?UB8u#Mysy&eab<3ul9f&Qq`yb5k+5;qBb;<}*%Y zI_}PIa=JCky|I-rahxqUUVyq}T=|Sc;qcVwb*xz)M@0uchB#zEyR*S}J#80oG?%+@ zj<98Qall+vI95AR=ef*%>V#8LPF9eIU~~2pf+Q6j%uZIphb&9Fo4G-9PyCY&)}X>% zW{I;_k}n*ZWMhhu#K!D%uO*z#7XBFmvY3s@!k|=Hm}k-%O**sAU{PE2^#(K0);Aa| zpk8xCr?rrld;_g()X~Ka8nf1M z^p2QX`WWy9F=qIlGCY900jcO+xH%5LQHJ`VTXFs zjn%7<+sT|O%DPYai}E#(OFZ7<5%BjTgvVGO6M3X~EatJ2M z_B$k4C6qd%uts~lBOGgavuOk!CjdXA8G+u(d)M#rxr*=SZ&O0*y zljotlY7+*&t$9Ync~A-x(c;~I62<5@RBaHPLC#GsK!bzlJ*JJE+rZnt|e?Qq* z7VIb26unOr-D*rdpf`ocq}p~lYwVgHGU@)U&z2=11e3-xm`HVkDF#TTu{3rd_{crhFqV7(giaq|eEIQbyeD z2PD_b9^Kc-i+2PuBzVm3T7(3Tkq4;vmWHX8u;7;g>HBV-g z-d|(>M?Su0%JNjA)MF1ysF5(%l{FG?matXAS0wC{@HoY-3--C$xP*87EPj@#{Q0=q zSK`mXM<;t1G5v;LVdg>aMjjwYmlD2p3*=xzWmz(+Jx8*h7sUxNd_RpF8$C8^2P)S2J=DeDV zr&5M0!zq`_zZ>-=1e(+-qc@klSH$(uv5{{!vo7x^KV)Dhj zb-h8yIw!6OO{3=yEw@<37YDRY&#Yd5-}GkPxh(D4dp|qX7l+Wm%N~EIb2F`y?7HxR zW@5i`&zh{#c>B}VvX!&bW0|*7KK{zAxVpfeZ?~NpoZ3nX_nv)yI?~rNZmp=um~zG2 lp6MU?d|A8X(A96ZTW1gZb}b}hM$eJD#T^*?x)z%s{}+V!X1D+V