@@ -376,38 +376,18 @@ class HXProject extends Script
376
376
377
377
var tempDirectory = System .getTemporaryDirectory ();
378
378
var classFile = Path .combine (tempDirectory , name + " .hx" );
379
- var nekoOutput = Path .combine (tempDirectory , name + " .n" );
380
379
381
380
System .copyFile (path , classFile );
382
381
383
- #if lime
384
- var args = [
385
- name ,
386
- " -main" ,
387
- " lime.tools.HXProject" ,
388
- " -cp" ,
389
- tempDirectory ,
390
- " -neko" ,
391
- nekoOutput ,
392
- " -cp" ,
393
- Path .combine (Haxelib .getPath (new Haxelib (" hxp" )), " src" ),
394
- " -lib" ,
395
- " lime" ,
396
- " -lib" ,
397
- " hxp"
398
- ];
399
- #else
400
382
var args = [
401
383
name ,
402
- " --interp" ,
403
- " -main" ,
404
- " lime.tools.HXProject" ,
405
- " -cp" ,
406
- tempDirectory ,
407
- " -cp" ,
408
- Path .combine (Haxelib .getPath (new Haxelib (" hxp" )), " src" )
384
+ #if lime
385
+ " -lib" , " lime" ,
386
+ " -lib" , " hxp" ,
387
+ #end
388
+ " -cp" , tempDirectory ,
389
+ " -cp" , Path .combine (Haxelib .getPath (new Haxelib (" hxp" )), " src" )
409
390
];
410
- #end
411
391
var input = File .read (classFile , false );
412
392
var tag = " @:compiler(" ;
413
393
@@ -430,10 +410,6 @@ class HXProject extends Script
430
410
var cacheDryRun = System .dryRun ;
431
411
System .dryRun = false ;
432
412
433
- #if lime
434
- System .runCommand (" " , " haxe" , args );
435
- #end
436
-
437
413
var inputFile = Path .combine (tempDirectory , " input.dat" );
438
414
var outputFile = Path .combine (tempDirectory , " output.dat" );
439
415
@@ -457,10 +433,12 @@ class HXProject extends Script
457
433
458
434
try
459
435
{
460
- #if lime
461
- System .runCommand (" " , " neko" , [FileSystem .fullPath (nekoOutput ), inputFile , outputFile ]);
436
+ #if (lime && !eval)
437
+ var nekoOutput = FileSystem .fullPath (Path .combine (tempDirectory , name + " .n" ));
438
+ System .runCommand (" " , " haxe" , args .concat ([" --main" , " lime.tools.HXProject" , " -neko" , nekoOutput ]));
439
+ System .runCommand (" " , " neko" , [nekoOutput , inputFile , outputFile ]);
462
440
#else
463
- System .runCommand (" " , " haxe" , args .concat ([" --" , inputFile , outputFile ]));
441
+ System .runCommand (" " , " haxe" , args .concat ([" --run " , " lime.tools.HXProject " , inputFile , outputFile ]));
464
442
#end
465
443
}
466
444
catch (e : Dynamic )
0 commit comments