From 43af83af294d07d11d1a586830009a7ab76ff7af Mon Sep 17 00:00:00 2001 From: Jens Fischer Date: Sun, 17 May 2020 15:17:33 +0200 Subject: [PATCH] [cli] clean up --help a bit - add "dot paths" to usage - more consistent wording for target descriptions, e.g. by always using "compile" instead of inconsistent mix of "compile" and "generate" - spell out "HashLink" and note .hl vs .c difference - move --run to the end of the target list so it's more visible --- src/compiler/haxe.ml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/compiler/haxe.ml b/src/compiler/haxe.ml index b28284f1b91..0467fe4e04e 100644 --- a/src/compiler/haxe.ml +++ b/src/compiler/haxe.ml @@ -677,7 +677,7 @@ let rec process_params create pl = and init ctx = let usage = Printf.sprintf - "Haxe Compiler %s - (C)2005-2020 Haxe Foundation\nUsage: haxe%s [options] [hxml files...]\n" + "Haxe Compiler %s - (C)2005-2020 Haxe Foundation\nUsage: haxe%s [options] [hxml files and dot paths...]\n" (s_version true) (if Sys.os_type = "Win32" then ".exe" else "") in let com = ctx.com in @@ -715,41 +715,41 @@ try in (* category, official names, deprecated names, arg spec, usage hint, doc *) let basic_args_spec = [ - ("Target",["--js"],["-js"],Arg.String (Initialize.set_platform com Js),"","compile code to JavaScript file"); - ("Target",["--lua"],["-lua"],Arg.String (Initialize.set_platform com Lua),"","compile code to Lua file"); - ("Target",["--swf"],["-swf"],Arg.String (Initialize.set_platform com Flash),"","compile code to Flash SWF file"); - ("Target",["--neko"],["-neko"],Arg.String (Initialize.set_platform com Neko),"","compile code to Neko Binary"); + ("Target",["--js"],["-js"],Arg.String (Initialize.set_platform com Js),"","compile JavaScript code into target file"); + ("Target",["--lua"],["-lua"],Arg.String (Initialize.set_platform com Lua),"","compile Lua code into target file"); + ("Target",["--swf"],["-swf"],Arg.String (Initialize.set_platform com Flash),"","compile Flash SWF bytecode into target file"); + ("Target",["--neko"],["-neko"],Arg.String (Initialize.set_platform com Neko),"","compile Neko bytecode into target file"); ("Target",["--php"],["-php"],Arg.String (fun dir -> classes := (["php"],"Boot") :: !classes; Initialize.set_platform com Php dir; - ),"","generate PHP code into target directory"); + ),"","compile PHP code into target directory"); ("Target",["--cpp"],["-cpp"],Arg.String (fun dir -> Initialize.set_platform com Cpp dir; - ),"","generate C++ code into target directory"); + ),"","compile C++ code into target directory"); ("Target",["--cppia"],["-cppia"],Arg.String (fun file -> Common.define com Define.Cppia; Initialize.set_platform com Cpp file; - ),"","generate Cppia code into target file"); + ),"","compile Cppia bytecode into target file"); ("Target",["--cs"],["-cs"],Arg.String (fun dir -> cp_libs := "hxcs" :: !cp_libs; Initialize.set_platform com Cs dir; - ),"","generate C# code into target directory"); + ),"","compile C# code into target directory"); ("Target",["--java"],["-java"],Arg.String (fun dir -> cp_libs := "hxjava" :: !cp_libs; Initialize.set_platform com Java dir; - ),"","generate Java code into target directory"); + ),"","compile Java code into target directory"); ("Target",["--jvm"],[],Arg.String (fun dir -> cp_libs := "hxjava" :: !cp_libs; Common.define com Define.Jvm; jvm_flag := true; Initialize.set_platform com Java dir; - ),"","generate JVM bytecode into target file"); + ),"","compile JVM bytecode into target file"); ("Target",["--python"],["-python"],Arg.String (fun dir -> Initialize.set_platform com Python dir; - ),"","generate Python code as target file"); + ),"","compile Python code into target file"); ("Target",["--hl"],["-hl"],Arg.String (fun file -> Initialize.set_platform com Hl file; - ),"","compile HL code as target file"); + ),"","compile HashLink .hl bytecode or .c code into target file"); ("Target",[],["-x"], Arg.String (fun cl -> let cpath = Path.parse_type_path cl in (match com.main_class with @@ -765,6 +765,7 @@ try Initialize.set_platform com (!Globals.macro_platform) ""; interp := true; ),"","interpret the program using internal macro system"); + ("Target",["--run"],[], Arg.Unit (fun() -> die "" __LOC__), " [args...]","interpret a Haxe module with command line arguments"); ("Compilation",["-p";"--class-path"],["-cp"],Arg.String (fun path -> process_libs(); @@ -817,7 +818,6 @@ try List.iter (fun msg -> ctx.com.print (msg ^ "\n")) all; did_something := true ),"","print help for all compiler metadatas"); - ("Misc",["--run"],[], Arg.Unit (fun() -> die "" __LOC__), " [args...]","compile and execute a Haxe module with command line arguments"); ] in let adv_args_spec = [ ("Optimization",["--dce"],["-dce"],Arg.String (fun mode ->