From 7a8325de37eba1a005e371b362230dd30582aead Mon Sep 17 00:00:00 2001 From: underscorediscovery Date: Wed, 11 Sep 2013 17:36:22 -0230 Subject: [PATCH] Renaming project files and updating changes file. Temporarily keeping luxe specific build file in here. --- .../{project.nmml => project.lime.xml} | 0 .../{project.nmml => project.lime.xml} | 0 lime/LiME.hx | 20 ++++++-- run.n | Bin 73903 -> 74235 bytes script/CHANGES.md | 1 + script/{build.hxml => build.lime.hxml} | 0 script/build.luxe.hxml | 6 +++ script/src/RunScript.hx | 47 ++++++++++++++++-- 8 files changed, 68 insertions(+), 6 deletions(-) rename examples/HerokuShaders/{project.nmml => project.lime.xml} (100%) rename examples/SimpleOpenGL/{project.nmml => project.lime.xml} (100%) rename script/{build.hxml => build.lime.hxml} (100%) create mode 100644 script/build.luxe.hxml diff --git a/examples/HerokuShaders/project.nmml b/examples/HerokuShaders/project.lime.xml similarity index 100% rename from examples/HerokuShaders/project.nmml rename to examples/HerokuShaders/project.lime.xml diff --git a/examples/SimpleOpenGL/project.nmml b/examples/SimpleOpenGL/project.lime.xml similarity index 100% rename from examples/SimpleOpenGL/project.nmml rename to examples/SimpleOpenGL/project.lime.xml diff --git a/lime/LiME.hx b/lime/LiME.hx index f7792b1e6..121c0b143 100644 --- a/lime/LiME.hx +++ b/lime/LiME.hx @@ -126,7 +126,7 @@ class LiME { //if any post ready things that need //to happen, do it here. - window.post_ready(); + window.post_ready(); } //on_window_ready @@ -181,12 +181,27 @@ class LiME { //keyboard case SystemEvents.char: + _event.result = 1; input.lime_onchar(_event); case SystemEvents.keydown: + + #if android + if(_event.value == 27) { + _event.result = 1; + } + #end //android + input.lime_onkeydown(_event); case SystemEvents.keyup: + + #if android + if(_event.value == 27) { + _event.result = 1; + } + #end //android + input.lime_onkeyup(_event); case SystemEvents.gotinputfocus: @@ -269,8 +284,7 @@ class LiME { } - result = __updateNextWake(); - return result; + return __updateNextWake(); } //on_lime_event diff --git a/run.n b/run.n index 60c56005308bf8c3cb2f7128ec845ea8a52d4f62..e7b278f1bbf1a7ed3eab4712ff6e0d34908cacc1 100644 GIT binary patch delta 12851 zcmbta2UHYS)Sfp>7naV#4rP}G6qVi-l~J)fc142)sfr>XqOoHaqsH(owsW^< zEW$`9q&aWts@HNdqE9^v0=Xj!0J)6WQL^YC#7ePF`(4X)7V33z3m0H z{Vf;pg^UmIWr?>`T*L16hKe107>2a$JuWw$A(Dj1!R#a-D7zE{Xt7W%R>N-c!FIF{ zW$1lt=YCoZ*vy%3xsW(kK*bW2F3G8RIqc^ecu;1bcFbUlG>k%F4Y*xSUV3usQ1%KM zEr4h{HaCwo(;7;)&dNz0&W31d51VM0L}cqRNlB@r^YYTO^OKU;Cv>?@0K49w9=8dz z7+D`Wb(y}l;n>(fs;bx7_V++&ueveNtsB$qdI<%m5MM!YAH@q47C|7~Pz0ceM$ryM z0*VY2V^GXOu?)rfAPgG{A|w>lXcR3_v_a7u4K`uWAHvjU6T(2-fZ|*jQ^2q{!oY0Go~4D->6nfOt!Jy9WN z!7&V*){M@x3t%Ig(_*^-pKZ+8zHA2(Std9b(iI#W!p64;T`Cg~gEZf? z%zzG1=4wX}4{29>FL$p_P=z@YoSl}H1w%O~Ej?xQ5cY5H!cmX%L9eB&lS74U}xGVFx5p zXD2`MCvD=CYH2nY@*J2#zjtb_PDp_Vo|6J07NFRTYH13z`8|E_G?HzQN=G^m_w1Dl zA-@Izd4eRe7f=sL1JNOk{_E`9Dj9JeiWw-DfPf_;8sadYr$945XZdspKNZC~5Wwdl zpU3`;lwAhx@8aXwAOmnl29&y%0quw%Lg%^!xeXrz5l5p~J_Jn95p@_!FSz)+uDm*k(k!Olsj8;?N}%a3+dHnPB=r+q#B2Mht@r`kJESL%P(>|k3KDwyx$X2mVpy=iepT-?r`anX(Az6fp{cO|YX{JS9k zUGrVYGPC01+9k$q%Z^(TmlqtV^ow)zQwOE#SL=SYcNnW+lnWU~J%yEilC^NIu(#LkoU^25|i_6z{ZB<3|?c)V2{j$!* z3U=;refMtdoV~Nk1@!_!*X*A!kM0u6&t)W5O8WZe^ZY@l8&U>Xne}9g2CY-)QEjR# z)uh@fHwo%UK{xnPFJ_leSx8%@rjqTFac!zwSRPxXEh{Ru60|~~?*3PnJ_6gaQm8zU zFl5;A(MI8QNXm;_Q>;OA&@hFzc#^2D|~ zvsDN}V;5kLQ?DVBjwgyUECY3&zu9ndMv4;HlQd<>Kyrp28PbKErOKgG$WQtOLzU*F zgnn44p@&Aek-Ic^j-Q>Nt`u~=5B=~II#x+7vb&N>dM4YGj?7Mw&?@n@JF%ttInm@f z-JH{wyr)$;Wm*e3b=B$}XKA8a(3iPdVnIDdwkFnez{veXNmY4~#E}Yl?!<|v=fy+2 zHs*P0-`5Hg64Y<*8O%!_%eg_s8-l>8=z}~TZx_&X-;X?3Dulc{HrYLaEiWqj=;A?3 z=V|_T7mlWk^7W}BO0Al_=$cUt>hw{3tjdR0{AV03ZIu5XE!NSY`5NLv=j8Vyd+5#l zP_jp_934ko{EhP{jV1lyF}n%4sm6vw&N_h%pp(XOZR(r&nimS{Gd0;PglQ&l4UC)$ zVLsFvhw7i`jj_LxhIHq+1*9=;J-!{tIpepIAnGv1g?66c3Kb?#XbbH63CSR>CwA}- zH;O30V5=F}Tm;RTIEjSNM-$s9L%vNm4U zddgb1to4$$6j|#nYYDQ}N7g#YT7s;_$y#4o3zxNivKAm~pLxovT2>QfO(|>rY1K?G zGJx98awh|6gISx%V0w9$P6^|2qFdgTT~z|~E18A14 z6u4B{cJ@*dO8=a#wyiamGxTPKZ4_h-4g~$cxe)v z^RE-KkiJ~t;|yaYNZ!T#=k3jK3KY17bnSwkl65Xo>ZdR4NL;^$M$}AJ!3}0FOp?+? zi7*PAFRmaWtxxNdrL-I6$TuKWbQc zcPr^^ByhjdbL+Cn720flQ}R0TO|RGK4*8WGl`H;;uq46`iuf zjCS2HhFqg3H;jPYK6#A`ZND+H9yIFC3dQ+d0(YIx+UO14E!tS0+@R+-x|5qY>Z}HJ zET54P$^A(kHtEPMkQ&;1(<)L*pKlT!?-^Bxz4&%>s@B?=FaH0U5bXUQ z^^Yq4w0@iF`t_l^U{!iYckB+KU+&hzu-UPDHVgNirh7)Qgr(c|G?BGv>bys z?Qn4E_Nc#cg*h%O-``HW42toZ2ItCJN4_#RhSR{Kom48L9u$Tv206ib!CL>tQBOjA z==x(V95qHRuy@c|#{(>+EksAP#~Zo&nL3mUoIg!I-hd5&0dhi1Lyp_hy~mZV4eD?V zgb-@KnN}T@{QhTF=LfBT!VT;2YsAtsOMR(wsk>|AI?O>BhW>cMMnCVwR^nQ{*>?h0 zJ~6Q$9Q2%68am2_bfl@LN?jdHLTI4Y1pQ~H&l6g4wly7kcA8U$k;@=kZixQv*=-i& zOa10cZApPE%4UaSVfbXGB;wdCDJ`a;0MmnKVpDR%U$9O5L*X+ zjnNN<5SL~6%{Bav0yCbf_|Vy%A;;=s9^WR=30K<}?Bm<}J01t_0RJ%YSs;KP`HbOPod6t?+6v$>pPhdW z&LZklyzS4M{Q#WiL%-Ai1K?-A*X@Vb)e7C>OW&9a@Y{38KaKb%%WhTlWZ`~N9(@j+ z%%wn*x(C#AJl-_{oaajl;LZ-{0*_}(02g^YNdmaUSM-NBEazZ0Na3OoOdrfMhPWl* z^9vsn`mPCp%lwv0*$95+6NEGbzwteuJ-7ql3Xg9n0Q}BhtH>sp1bhVo#2>u#yJ0b| zfUfdqI~=|Z;2Qtpe(xv%*ZItGqhkQv;O#f8cn#ntKQnWW8Gt`|(ktK@4ZG*6DUXf> zqNKVzxA?8G&6)!bi!M(W4;m)75XB?b(FiFk=S$18R0d+qk?C-^PSEcgXoe(9Ij-e<_ib zS_ys+tE;b&tG`Qo+;A`W%edxBQ2(l~`4Nvt5nvwkcu)fHgvWOn0G{%Z9U3$OP{ntR z@AMYHGk(Z`y{7^E%})%i^aAjLzuvkVqy7s{A=MAAk{@udf+H=t>0ZFWt51f1+1wNE zCY%}K*duDh=7_ytdcpkStR&nw!5gp*;?5&Sz;NX1A;vXF{ZddDRi~_of0R}|)?;kJ z1*)w{S`6+WP!XboOqyE(6Nwto5O1|Ec{t*Vd zH|mpB^CJzq2KA2PPoFgCzNovcu|8_h{pfeMduWwkGMc-R*3+MMLj?7KSJ@{Zarx0Y=r9df66$2?>lCIrIZ;zl9feCXCMfb$VgdXNE2 zE;kynts)Wm&k@gd{{1ZAv50SFeRc`(I9hop(_?%s&k40WCqfHaC?_Ff=+9(AAHCt| zuXlTsDKzk2E4!(+jMM1n_Zroo4h)Qt`>+@b94h>VW_>LrR5L=ROC!Y5z~YXE<7OtI z7#@r2y^R{<9xZnXH&zkv53E{RNpb%xuE__-5-p~vk*{ANBq^Pm$sK%L8V zc0VGM-Q>VYupXlE<=s6FBXju8W7vPVBZ$9vRSDZMca&}^?_O{WnUK@EXTY37JbrK$ zEb-iF#JvOko&r9Lc+UJ(*hjga5NB5TSOGqd_@`U(xQbjvyj{>+1HOd#%7y9J!V<(& zZ?}m9{2St!FSfb>{sVC*|JHv*fN~p^ht2Q&4)_k@DfRmN4frl%`rAoZe7Q2jiI4MO zrRMNGA3rtz+BLxC^x(tpu6Pc@aa4g8JOhE{FX~(2Ygbi^c}aUz3=VsPOj`Kq>)`Vi zaZ6GGn;iE6@yUZxIRD`*6~kw2et8eD6}?l@udNL-wyq_XIP=w;ZP2S8a(9}2hikJl z;=~qq#{jz^j!F9x`{0WBkNFdDn7Pw}zcy<yCE zJxV3sG^EOdDjvJq1!D^h13iTLKh|nP4Q1av)Asw=L=@*+$ znwVQjX_n17>tY!bb89KhviVot(`P2;cq!MidF#d))6#9ETuWx#VS|@7t}abuPjPhB z-*$4dGz&+JH!ax?Ghn!|S<|p*F0!lbioegrevI<&pZYRQyZ>WuX~+s~^W4A&+2@S) zgiB0E%xbvqr|qjf;q^NPc9`{{sf21$+YwW%F_4|nX(qewy+N(>2n?FjuxtZp(H&d6bGoMu#e?*Nh*ffP33O4{fZ+P8?ivc$far-S+D!_vfAB)_GM}Z_7^HLiy7#PT*yi23P zr(F!U=MdH8a4_UBrA;bY4d;b4#1jvwa7{}`{Mf!Nc4H{wgwE@K2AqjF-uY^IO>>7q zzujo;ze>u!a-)O(wIo?I`>TWt8;4x>B8{ioK7JPjhxu$zvIAsaL3q_=~}Oex6RC;?8j)j?(f=Vb@4^FDUF5W2m>bq+Ga z4;11y^abL*s?;-d$4fW*?46d(mAc&Uy^_q6GTQaM1DOxVg^qgfWVfJJw1sr>`<{-A zfT{I{j$8b7DtzS&`A{$H6N`!GS0?(`wB$oWC}|$kK-WwKXDAc;%1gOiQlrsfwU8q3ew2&J0nklTP22B zf^(LFSds6 zC#_l|wF+8-#~^IU;p&#e$c&d!B!TlZ(bXn82SdhNY-UdENRb$20lie{QVI_~h2ylC zYe6C{`Oo&<6}S!JeN?>QYY8e^OL%6DEr^xl29tQ3CGJi<6j;_4Bq z+xpwE0N_lDY?U*8v#xO4BpVcMcy{{rPm69xbBN;(lZcDOz1AdFRT0s-MBqL(THBB) zPh8G*c-^YYqmzwc+_k}1e}*fX!FvvzdTUSjnI`%y6MZ%jz0F}Ht+yg}zMnM4q~!%f z9BxDW#Mf4&ULD;^gqDk)tw}xYe+Alw^P^$?&7*u@)X_ncT6as%s?K9iUaG@cbgM^# z#iy3UQe0p|Y`!Jk8I!AxfhyD1(pno=X^x=R>oFAn*F1D#hoKjRKS=E~8 zUM9MSiLNuzeN1$Yh=LjM^$5|W*~Y@YZkpeN*lw+r{CR;pB(}08TC*a7J1nD0xGKts zhl`?&A_eZ4jP?lJaS3_I?{HyqnRNApG|t5^JK|4H%7tda{ZdBL;dUvmwj+Mzj7$uH zE2fMF!Ua=C&ERXTgrE+8OYDMa9p|Jjhzpgl=$#i=D@hQ!AYN3Gwq_ThHR50u@f0KN ziArqXKB<=)1G1(nTlwpZi7~D&A_W=Ax zF5MaNYcbh_G$fVyX)i$8K4!;dSU3~czA_iMN61Bx$C61@t6{f!BIB-zpUQZen#?3U z@quW>1{_h7{xVKQ+!e7_T*(m+(nIF2BHv4X(ypF>yUBca#NA~)7jdGDPkF*HSnmZ< zEWC&h877x(k9eeb#0SS4;#}GL4B|W)TX~z{akBp$Ye*ionw1)ry delta 12145 zcmb7~2UrwW_we`5(tBNChqADUAktApkx{`umL!S>6{RYQfQY>iti)Jzj1v=MG)CVT zHI}s`R*YcR#3Yueu|`0}-eUisv$M#u;d$Thd-8bpcgj7t-?=m786Kr;YGK2muVvTB<}M1R zG*={qhleL}F|G;)m*k2TM@3S4e$!&j=2531!L_#D9%!Fom3dypTt}en^X#pJVm+rLlxY971q+s14RUh&pj~N za}qjFj5YH@8bjiU7piAT2x=55Br-_w6HqGc6r=SC2ahhy%Pr=Xk*8b@U^US4ni}&y zRKrs%-_CA4+CzBE*M(>euTXNkh#b9VYGtV=?w#{W1LQSW4%ma!~KQ8J@SU-)*dBqh&4V~V~mg99iZeC0|U7BvZmpl z`e5a~eH9AUuFr(RYz5Ox%oEP-@x`*|P@vWti?!Bpw|uGA&XEdM&^m@htODn!S7Aze z5tr_Vk)+^Ia&t+sR3!H*?2(>XRKV@*X2vuh4_!%v}9S|fKVD9TRH9LA|M=(IpX z$MJZR!Gkl$6cuIX7Y`oHMZnKCL0okp+_H(X z*c^m?bOnD~o|_m9iMHMCJVLPfsiA0|77Cx)rj%GTM^=#tBGHmWClVFn%t3vdD$be|JhmGc$@)l zE{U@-Sm+{!M#iF=9E)mi5?LseN=3(l9Bz&+89pcRRV+NVi)w!WV{wl3!;II+LVFLp)$s~5v&ir`1@~=h z(AfuZ#ckk%eURVXHVR9nvqBT5Nh&CufLlzHlbe@~OX+X|b}t?@4vVu#wN;pL{sQV> z3;LzeFTE%qLov#^9X9GvI~-3-MaQC|f+Do}wMW|t5`8;hnL{L+C1D%Q75Q0tc@g+K zYEJNoiS!8_qHp1?>LG3yc;xi z3iSJ4#5!B{z|L@rsS#XW4=jTFPQ#r;;(}qgQy$l^7o2nI&2{Sy&74CmcfO~v2SoQgL+9iPVUBZOz{her=H+=Fy(0!I8a%+MVvz>>IEdqGQrO+pkyWS77`UC&Y-~4p(W-~jLX1gj^j%3 zyyf&&gKYo#ncRnoV3# z?DE7}iA%PB|65|>mMw`b0~5O?_SFA(5+(loEg)=@QlY!1{ln3^j8ix)R45Wvx`Q$4 zHte{rS>k(2SkT^Ax4Zp)W|^Cxl|8;!j&5C24=an@e0;bS>z;MrrsR$d*Zt6|ldDTc zji_EAYTG=Xzki!pb3CVaEx2S3G*_-(owfvgvs5rA(*c@iS#j#`L6hYMn=(HHzbuvG z4gVXfuh#r3x>)>}AbB>j0hUE&~XFK-s&6bZ8}X(B4a8HyMB9Doca<|T9MD=03x^G22jK3o z9;^ZqazA2~x;?oL=Il6xeX4=ld=xi26 zn^DKFiV?4Wp6Z#x)vUhpF2oHS=WG6Zhzb@K2lzFT#i%AvI8_|nXpHh*Rci1Y^S|jd~$$Eta+KJK2SfRIOaIq+6F;oVuMAft^}Kjr&$xYGI0TG3Wbw8q1-WP0}F=i z$st(Tg2^4xa(Z$)%D5?Ae8U=K6LFQ*uV_9TzM3+HH3NQXvO_Zr#2E}pEUXcE2AdbT zLFrTho%^RwaSJucg3W9W@0WzK2$)(D>k-w!y*0zRCZJH{qv1$N0E^MpmN3Rzz}=5} zv6hfn>cyg&?8Q~#D1GzOri=9Yp*s9EG)X^-!r5T-AB{Z2Cg|gpF-;j0<12gtgl!6Q4wh!wEZD)J3{*W^Jdo}=AnbrZ<DBZZZof(@5 z`{s4Ft~;Hk(b2=E;zkAxsF;6&u}@&d!YGu#Eqq_kevrHuwmP?wtecmud2xeG{83G_{ zNtN4|4V_`=Tn1@UThmf>EG&hM(rCBkjhBdrg3m{?mGIzmSN4rwuF}hI^>Q^y7+L8C z_dl-y&o2VpH#bb9GNYPxy}q!dQ>)*XF(^OzayZJT2KI$6%Tm}j_0rYh6b!I1vF8?5@)2j^@5 zx326Uoc=b49fE|_!M^`J2TWUC!0h1RYFZnCYuaIg>^1r92>h{Tsvp)cuKbthsa%Gt zM&wNsRl}(Ni0lNUuk|obPgC(HiLBE--n@PLR^)$y7yrp;ry%#cc=j8t`ffo)!{@H3 z;Y_;TY~KtSM~t>wv^#T2z%<46Br`$j~b?+9n0YA78S+}+^vSb+d}>EvRGkU%j1Sc zu*Ye-S?*67T2;1~N#6VX)?fa=Y7F=NAJwhg_V4O!>Z;SFZO7y2AGow50(S54haNgd zsNFGvy~I)RgPA|}vtL~i=0qMKq zxVH?x*fr|^xkJHBp_{pT8Een*lbF#csw}X<4cF4Y45G?H)ZU88K8W{mo`a0NF|K9} zvZUh$=Q(`0HxTc_C-z35e7(0H&isOXUd$2-_IWcan2XXHSq1y{Suh(oxGx;#lYOBm z{mXq^Z5m|UidPa_c(1$#vycoHx_`__H@-YB+tMZCk!U$kq(U8j<&I#OBk8%@=xAgu44R;?cl@ zieLz;(88b!JE*E~aMv~x6^P~4fitbTItV)-TAfH+hIKb-Brb@9@TEcWgA0yTI9lji z8BC>hn<{rO<_yOk^U$=|o+ZPgLs#8xO_FFZ@q4=2hfgq9GwPz zj&{(c9-C^xKGywtsv|3L!Xf5Kh(hVQXJG~`U*oGa-~$*OuecaT_XhpTgeVM}S6psD zmoMEC4VaqRA8*ZZO(~9qn3!kyEj0X&MmJrpc@kn`A^m0{kiCTLBt$`9w~YGqG8)qV zO>rbdA#2;&-wassTgva48F(Vui=t75ZRG@1d!ZG320EI$*2$!_b z>Wj;_S`bVhA}HSH^m&eB%n2bb@^veOlfwF6^9g*4MQe+Wmq?7M<+T6kL3rv<_pA$P)l_jtq;-z;X;RA3Uw7;7V7G*7KUHQR2u4jh%rWWuSWG@UEPm_^XH~L zLyMuikD<#Y4SNE)D4)U{l+R$@B`?o^gdf~8?_t~v;ogN98vK_6eMx{7mwe#uC3{Z& z8k{eCc2K_&o+WtWi=6tc(7IerZ*&UW1A^}}A6&gWen>;^m*R_TPTYOeNL&ZJ1u^Yb z^+OnS*|Vo5>X@Ux)p2y%VjwvTZRc(DjOQ=fZHeh%)!>OfjNNN75^am zJfV)z{`BR76CzKFu#sC8rYBK zZ$ON}??w7lk9n~MohQBP#6y(^-G_A5D(n3Q-H&wfar+y%mDCYpt?;Mh-+Pj;PT-^i0>TG+9O92TlK0qiX2O<-u>4l-UCmXReJ z#$W5ia$w)Jo?b)AKIU8S$7I8dVsatqdIB2`TmRO=tm|s~5k|f|*l<0e>qxRVO$rIZ zlKI5z_Fn!Cxqx^|bq*e9d?B%&GL`H_#Is$`9zh;Wd^zvKUy+NUXSFZ%{=2)^7^CR1 zM$zN26>S~Hlf}@d3GCBXJg9HECY01DyYg_~5D;c)asp6Hh8^`X}-V;?Pg`{)4=Q_*85vKJ<7U@e>yo ziM*Bg*^O<74{vJicaSB&)vikP{sbT2?CrIaEc;&GjYZ2Y;yKT2@tMc(hKDzM zm+T=+#33yng8Y8si9;ULBL7U>CnOM0S-yh!<9V5+)TK37WpsYk8JxsLcT-{ zrz^dXuMnr+Evi7iMqHY7{yg$^P~PtCP8SK9^c&=%O9XnVVA$;d`&uK*Ly&F{iF!(w ztms1*Fyh`bkWA41(Qtp8>(;-0^MC|an4^ecR?nfAM$>N^;!?;v^WJJ=j9-P7QwuDAC* z9UFSW;N>GtFxgDI-g^8Ab3^L7u7^YZeM+<7zG<2W8k9!U&>h|+O(YFBrty2=>C~__ zQSxv#)|_9Ol!lw+iI#^e6gE6)$zpK0yx{c%cl%fx7{idY0KbQQ@vAZU=09||k2CVM zf=v(o{o~O>!%4rw@A>QY>#2S?<7qezwz_d>O|f*ht`S`<;k^fL!BpCG05i9AsWB5PY?Pt-xlI6CTR z?a_@Zz41#pjknXRxAA(apBsFoyA$9+Ui=D9F*CU}ZwxUdFyKkk5b~MM%g`%dUakwm zqlb>NE^^h$u;poQ))fk#xr6632i8qb2}s@bGz3XR(y|_U{X5iq!j5M?$-SudKdukJ z_Yb}|aa^8`E}VGn#iRYIHQti>4~VsEEAJxr(Z}a!(+wj z-fSqWf1cnqjDidg|6F3j!+$ui7oFJ%eHYVSIIuj}{8Hr@FKxL~pKT<0-Nr<>rsrTj z6*g?*0vPp13zuH>@G2y$;np>Z*l_DA!t_Bf{G~q|4Rc=xvSLgh$QmRZW0Y_#ynQ*w zcbrkO@%70R`afVzfKOk&hhP7(negJ31Kq}OQTV>Lw4ZF0XbL9MLf_Zv_EX7f=y(Yn zc%8;R(wA-Z#(|aUY0w)>`)NjHr(>^{+0P)$h+Sp$kednkrov`H>f1mz8%o|bVP&xT zZIJyOqf(#1xwr3|%|(l}-=FauKVRBp%e0^6Gnaa+3%>vZj6RL=3qRY;TKu4z&>v;dF%l_E{<|ys4WhzW>X>&5k^O~`1#oVP!9J5D5e=^`7KK-R;O6DRRP_l5U-dUQYME_E$J0}-#vW@(3 zpM^R~OXs!3%veB4JChCzCVHZY-qu7UTR`q zE@9OH(miv13qDq|*f_cuiM*#tpofX>ZlbGjjrcn3UOV%&TB)s>@}UD>oTXi6*kh$O zqioN8QlFZ!Fv-`7SxRp#m<3xU{bO!0c=%jh6d>}eOp>mq)&*LwEH}49r?kL=MN1nj z(Y8uDYQbVXHk=+F^zTyNQK@DaV{XY}r6E@Os@hp%*()|!_X;$at;3oOn`Aw0k|t6+ z8)j~EE2jG?k$>lu-df6Q)>C%V%apMjKeX!ifU`8)nz=;Hz$b?By7gwq=1-n{B;a8e^!(&PGtqrbbhU}Dl3v@fP^@>Mt=tedEBRA4|C4mep81=t7WthrRpSel zOai`65e2e6dIQ@c4Mt5$a9~!>D@<0`K6&krb6`zaxg0)II*H+C)A7AaPFN!H2V@$G z?_W}sBc`sDW7|mk95D4V$3{{gqSXG<8As;C4olUJEX?)@)_zAwYuf+#YWVfDW>Qxt z=FA=Cq|08+SDNU=Jh)@B(qyghydyrXXW~m6wOB6~3t!G?qqm)qZPFPh7S2ver5dJ@ znm98zDb)!V;{pwyjj5=zUuD+<;!{#PA8bw~@o%#I1r;%KMr(u%Qan)>Q9jX9Bz8uQ zJW19+$*Ocka&SRvMU+G|l4v~9H$)qV&LXjka-H^WOeJ}^Vj~^hnV*#5#+pjvJM}QB zr3SU7HGOHOE7w&TVU0u0>Xy6pU!Tc#?VW88PamPl_BYwQUFg8a*uC#!Z@i1$_0CqM zw{^m}eTs`M%kh+Yf79bo?X0ga-xBejv0M11A`b8D>OI2b78UpnK)qM!h5-n>gu#b$ zlnDC-&zhO|wyG}Qk*8u;8UE2q>gCA-*afNF17~reCv#_4q^n-IU=I*qm+jApugM(h zg?v?N@5N%+WofeuhJNaW1LvZ~(K(ESUnnUZ?Se3EA~Sr2)(i@lkerO3RI zxU0;!kR?%Bx5S$GpnAj`)t)|hh7VLS2MPc02UlqsI#_qP%vs{TGQ0RPKb9l&`^4Gu z`T%6JJe*JIfeMH44^*WnUtC0Pei$@TF3`t>&5GX@I8Cn6axRqy_wK}Zu7RksNt7X3 w`Uw9QE9sRA8(2+2rSF2m{INn?f4q3~^1-c>k1Crj*ZKo-8L^jC?a$o)4~qu=!2kdN diff --git a/script/CHANGES.md b/script/CHANGES.md index cdc37a456..af5f382d5 100644 --- a/script/CHANGES.md +++ b/script/CHANGES.md @@ -1,5 +1,6 @@ ### lime build tools version changes +_1.0.2_ Added code to handle injecting default project names, adding separate luxe/lime build files. _1.0.1_ Added helpers for `create` and `copy` _1.0.0_ Initial tools to forward commands to openfl-tools \ No newline at end of file diff --git a/script/build.hxml b/script/build.lime.hxml similarity index 100% rename from script/build.hxml rename to script/build.lime.hxml diff --git a/script/build.luxe.hxml b/script/build.luxe.hxml new file mode 100644 index 000000000..00d382889 --- /dev/null +++ b/script/build.luxe.hxml @@ -0,0 +1,6 @@ +-main RunScript +-neko ../../luxe/run.n +-lib openfl-tools +-D pathtools +-D luxe +-cp src \ No newline at end of file diff --git a/script/src/RunScript.hx b/script/src/RunScript.hx index cb41957fd..2634e1aff 100644 --- a/script/src/RunScript.hx +++ b/script/src/RunScript.hx @@ -77,6 +77,36 @@ class RunScript { return false; } + public static function append_project_file(args:Array) : Array { + + var explicit_project = false; + + for(i in 0...args.length) { + var arg = args[i]; + if( arg.indexOf('.xml') != -1 ) { + + var prevarg = ''; + if(i > 0) { prevarg = args[i-1]; } + + if(prevarg.substr(0,2) != '--') { + explicit_project = true; + } + + } //if there is an xml mentioned + } //for each argument + + if(!explicit_project) { + #if luxe + args.insert(1,'project.luxe.xml'); + #else + args.insert(1,'project.lime.xml'); + #end + } + + return args; + + } //append_project_file + public static var cwd : String = './'; public static function main() { //take all args and forward them to build tools @@ -91,18 +121,29 @@ class RunScript { var local_command = process_command(args); if(!local_command) { - + //check if they specify a project file, if not, append our default + var args = append_project_file(args); + //make a full command line var full_args = [ "run", "openfl-tools" ].concat(args); //enforce the folder to the current on Sys.setCwd(cwd); //and then execute return Sys.command("haxelib", full_args); - } + + } //!local command } else { Sys.println(""); - Sys.println(" lime build tools 1.0.1"); + + var version = "1.0.2"; + + #if luxe + Sys.println(" luxe build tools " + version); + #else + Sys.println(" lime build tools " + version); + #end + Sys.println(" commands : "); Sys.println("\ttest \n\t Build and run"); Sys.println("\tbuild \n\t Build");