From 0f8efddcf808f4c1beceb7c7a1ca58e84fb539bc Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Sat, 31 Aug 2024 12:13:34 +0100 Subject: [PATCH] Remove references to old ndll builds This was removed in e431d92809a521444594010cbe0dce4b836f6f18 --- project/Build.xml | 83 --------------------------------------- run.n | Bin 41287 -> 41010 bytes tools/build/Build.hx | 39 ------------------ tools/build/compile.hxml | 5 --- tools/run/RunMain.hx | 11 ++---- 5 files changed, 3 insertions(+), 135 deletions(-) delete mode 100644 project/Build.xml mode change 100755 => 100644 run.n delete mode 100644 tools/build/Build.hx delete mode 100644 tools/build/compile.hxml diff --git a/project/Build.xml b/project/Build.xml deleted file mode 100644 index fbfb33b90..000000000 --- a/project/Build.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- - -
diff --git a/run.n b/run.n old mode 100755 new mode 100644 index 2153e3e7135eeb2894c20e308ab7cff87fe27781..3300b6dd1674f833b171f04c4147e5a780cd7ba2 GIT binary patch delta 5744 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 P#4wy8#Ro6>+kpQ7S!_sg delta 5681 zcmZ`-30M?I7Vhd9ZkT})80ZG3#{uNNR8)>>ycJtOa8ZeZC^O0-AmAz4aEh{v?q3lO1)P`6i)LEnUgEeZl zHppTqth7Og(iXJ=wrFmru-DcH#gkOLia_E9WR@5hVn&v=Lz$-#0v2qdX9lGOc8n$a z9s-FQm~5ED5HqqDVJh1@$jTnGjYc4G!!t`JGsKMS9DD4zjQVy{IBkz3Ux07e&xsGL zmHF62$@Gj69wH>er!sAMkWex?yI7c*nJ-K*2w4UB24Q-3$>bv5MfYavM^+H|D+_LZ_-d9M(Ex> zEJ`Ms`}CWZork$58-xkj`I$x8hGHSJuyAxyL19rgmH|f*N(-hH3B{$wC59<}#s2?y zX37_Hz?l^m733HumdKo5DEWrm0$~CjCnO(iiAf-4RZ?qxl~S{Wyd%6buw95M=gDaY>OD6J`__=4F?#Z&S}P zg!X~@O*1m=P4KshvvTEe9A6#^t@@H7u+J*mYq(cO;7Gc+413xO>v9cs_72!td#F_! zq}vcMVJZ5FfJy8H&|CNL(g-*ME2h{`k}+|578^`W!q~F0NZ1spvGz_(r?i6h0m`<} z5G!U>c79gD^kR08fD4p$#k$!rxZ4@Uc?LtFJS-#(&pWE@JKhMtQs8|MLVZAH6Cw4d zd=!N_J~*#}sBngDrRG6j93s6N=Ctrbrlioz4;?WS22mJ}8uo}_*it`S=(jM}MqSSM zV;4^ZdAOkuKBoQ{xShiD00bcr)A$79B;`#0w7fhvHV}K3Qh1xX?o*f_gpr#lGz6jf zF#-~e1*0Q?LQ*h}S5CE+)O4z&_<1lUyiCD11pI70?KB}6(4E2h&bRs;~a8_W0-i_wJ9+nNNg5v;u%VT>E}3HpQpM*?#M z4;fNeCHO^zv5Y=muh&n|EBshSMf3x5^b3tU|6b-ho@F>9GIGY~g`gsFSglCX_Z-|2 z!er-U40vj}9>--EG@ylH^kiU#j7j~wzD%E*??nc+uuN*2ky>lg+FJcpI>6vY$kn!#D`(cadQRkpU_* zu_Oa$w2PKx&_&vX23V58m)qG8EO9#@I>S`wKbEjp?M+Vu6s+$Sg0A)WFj$g0M;b;s zmLq^{%xiaSdS(g@PE?RZrt;{%#B?yGi-UT$#C4T)Rv zCaZXku-tTLj&~t5%vfs1nP!}Y=xl5Kv(zGSWp^cONLuF%;xJoM4)MccRTUkH_fJq_ z%v@MMte-CV3pe7r@n4lqburOhi)5cdKHo?6FJFg97^+0baT!)ou^U&N+c$Ps2x ztI_CzO#`e;){x!MnA}6PXTQ<%j&9ic9bYbJGPTXS(pOXLFKHW%&cPCA z>KIm+l0Af}ijd{F!PyiS%c=;Qy!2kMceHw#TZ_cdnX*sty*rR zJHyr-7jgr>&go0s!8!La5lr@ZcL*9!r$oB=Vy2GyrQ5s8>2Vs6zpq=TY2V;F84@G; zOS&$9D2PZaCDYY zCk06%($kF6Tq?~qohW)P52+O6zuwh~8@oiDvnTX7Bum9%KczBAmWh3OryfVLTwE|R znJSy1b-Gmkwm8_w=?gTsi}WBPc~>;%?p7h$As&9$ONZniVtz>zeXG4M+MjChM)H9e zw%POu$%kUf)ti^_Sy**$y+!*oA@<&Is&r1pNOea7A1$o5f6X5 zhU8N*{Jt%Rv8*goT9;_j&E7}OIb&ZkP^jzi|mF0i{)>2yN8kP%DM zo)qc*!X1RurEV6dP-uc%r5;YF+EcXkJPqoZ0yzV{XZn$|m_zM z*DunYlDI%~WjJK#FG~{lZ#X=2gzaUq)%1xocDM%oEFtVVvQE{eMZVrX@DCz=Zn^6c z*W6y?X2_j2-1bKMSUMfj0Zi;&%~(193_8HZYG9(#V#BJm79O5(7oQ}EpI zgz|CAN)BVdi-C9+CGad$liSdT*aE3$|SjGr6q;7auu4+pP?4RbTx@dK6-XHUO?XO`zW_2NM_&&P(ocMs+2p%2xlb$0?$(?Q7mBnNNmIhEgt?+o4t zmdqdR(5+J@KX@?zgo8g-mRvTMIRO5(AO^NnMnh~R2ftQ&LP=$iLl}+tWdVBvvxI}P zG6XJFat;xlGIa-bVGQX3;=)+>o>b30@!$zYM|O(o1*;cs0cDjZBrl32QLuQ?01^#n z7I_E6VASiU!;w+r`;3q6ltK?4RWpbPtE)2M&|(1;)n0IWu`84z$*vmFo z1r^o7uSH33i0TRts_nGHU-s|`FWcsPIPwx}k_gXmAsd#c)t@RdMTt*(EwW}wH>VMA zP_^oD7j8e5_~ci8tCn_iN_ka;nk8Cw=!3l55|96r)Tuo9$qR+p<8QC2HA^(K;&5iE zop~3e<&NN0t!Uo~b;k25-K)ix_)(z51-;l62d9^}LgGiadr3ZgzuenK&^26BpOpAC zv(7E=>h$ssN&H*p0%1ORv&4^u=H*&*5U4YaC(iN+qnR(U8e- zpk@fkhMKh+@LK5#k*k!jd99Q0Kg6d48NAxfpHDBaR;*hPO{H8qU9$tGuJnbitF+L# z(iy(R_Aa(|poOlhoFNXBu&lNVj7B~UwPo1u#P$fbSFnAIt#hpwg1{MuVw;I=S*;Qh zK?Q4&AE*`JB)EY0Y5|^O3)uFkbs?qD7X-+ubtW^RytWsag|-I1txX`a+n4}Zt3%10 zzpV4C1yTmP)&$x$n7?@Fd#VBpBPd$7NABY3XAhO;q2!?o8}peZ%DexHoZlX~^Dk)u zl?Gwd9_Di7-nP$o-NO1Sx9A^r4dU6Oy|7T+E^&6xqx3^zw-}G#_ege%8OMw=Bzr`+ zmdZ;=_5!yylvLtMw2-^j8~>E6Sv!C%GTW_aSJBm)qSqZ_$#Kwb@B($63*Pm6>pdYJ z**UXThU~1F?L&4N&aL!>8+B^3*jxgSjVnltSv#?j!#kOJ$tD-P=P2v3$(iL@Itole z@i%ko4VzqG&t@+;jmmwhtlI2?_bQF=j_iS%88^GY-c9!KQN0S*qx!_GHf`46wN$g# o9W3g7@tW!j?l2IUotahE`@+qo^o*&Xsa}IG)N)+7!xo?a0R`wHrvLx| diff --git a/tools/build/Build.hx b/tools/build/Build.hx deleted file mode 100644 index 965fa4ae3..000000000 --- a/tools/build/Build.hx +++ /dev/null @@ -1,39 +0,0 @@ -class Build extends hxcpp.Builder -{ - // Create a build in 'bin' directory, with the "stdlibc++" flags for compatibility - // This flasg should not make a difference because hxcpp does not use stdlibc++ - override public function wantLegacyIosBuild() { return true; } - - override public function wantWindows64() { return true; } - - - // Override to ensure this version if hxcpp is used, even if haxelib says otherwise - override public function runBuild(target:String, isStatic:Bool, arch:String, inFlags:Array) - { - var args = ["run.n", "Build.xml"].concat(inFlags); - var here = Sys.getCwd().split("\\").join("/"); - - var parts = here.split("/"); - if (parts.length>0 && parts[parts.length-1]=="") - parts.pop(); - if (parts.length>0) - parts.pop(); - var hxcppDir = parts.join("/"); - - // This is how haxelib calls a 'run.n' script... - Sys.setCwd(hxcppDir); - args.push(here); - Sys.println("neko " + args.join(" ")); - if (Sys.command("neko",args)!=0) - { - Sys.println("#### Error building neko " + inFlags.join(" ")); - Sys.exit(-1); - } - Sys.setCwd(here); - } - - public static function main() - { - new Build( Sys.args() ); - } -} diff --git a/tools/build/compile.hxml b/tools/build/compile.hxml deleted file mode 100644 index 11b8b732f..000000000 --- a/tools/build/compile.hxml +++ /dev/null @@ -1,5 +0,0 @@ --neko ../../project/build.n --main Build --D neko_v1 --lib hxcpp --debug diff --git a/tools/run/RunMain.hx b/tools/run/RunMain.hx index f5a4bb301..eccc1e6f7 100644 --- a/tools/run/RunMain.hx +++ b/tools/run/RunMain.hx @@ -21,14 +21,9 @@ class RunMain } log('This version of hxcpp ($dir) appears to be a source/developement version.'); - log("Before this can be used, you need to:"); - log(" 1. Rebuild the main command-line tool, this can be done with:"); - log(" cd tools/hxcpp"); - log(" haxe compile.hxml"); - log(" 2. FOR HXCPP API < 330:"); - log(" Build the binaries appropriate to your system(s), this can be done with:"); - log(" cd project"); - log(" neko build.n"); + log("Before this can be used, you need to rebuild the main command-line tool:"); + log(" cd tools/hxcpp"); + log(" haxe compile.hxml"); var gotUserResponse = false; sys.thread.Thread.create(function() {