From c8d424baeb7b93e2a1e900b271bcc09144fdce94 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Thu, 11 Dec 2025 23:01:24 +0800
Subject: improve binutils and add cli modules

---
 xmake/modules/utils/binary/bin2c.lua      | 22 +---------------------
 xmake/modules/utils/binary/bin2obj.lua    | 27 +--------------------------
 xmake/modules/utils/binary/extractlib.lua | 19 +------------------
 3 files changed, 3 insertions(+), 65 deletions(-)

(limited to 'xmake/modules/utils/binary')

diff --git a/xmake/modules/utils/binary/bin2c.lua b/xmake/modules/utils/binary/bin2c.lua
index 34d9c4e02..7bbc797a4 100644
--- a/xmake/modules/utils/binary/bin2c.lua
+++ b/xmake/modules/utils/binary/bin2c.lua
@@ -20,16 +20,8 @@
 
 -- imports
 import("core.base.bytes")
-import("core.base.option")
 import("core.base.binutils")
 
-local options = {
-    {'w', "linewidth",  "kv", nil,   "Set the line width"},
-    {nil, "nozeroend",  "k",  false, "Disable to patch zero terminating character"},
-    {'i', "binarypath", "kv", nil,   "Set the binary file path."},
-    {'o', "outputpath", "kv", nil,   "Set the output file path."}
-}
-
 function _do_dump(binarydata, outputfile, opt)
     local i = 0
     local n = 147
@@ -71,7 +63,7 @@ function _do_dump(binarydata, outputfile, opt)
     end
 end
 
-function _do_bin2c(binarypath, outputpath, opt)
+function main(binarypath, outputpath, opt)
 
     -- init source directory and options
     opt = opt or {}
@@ -117,15 +109,3 @@ function _do_bin2c(binarypath, outputpath, opt)
     cprint("${bright}%s generated!", outputpath)
 end
 
-function main(...)
-
-    -- parse arguments
-    local argv = {...}
-    local opt  = option.parse(argv, options, "Print c/c++ code files from the given binary file."
-                                           , ""
-                                           , "Usage: xmake l utils.binary.bin2c [options]")
-
-    -- do bin2c
-    _do_bin2c(opt.binarypath, opt.outputpath, opt)
-end
-
diff --git a/xmake/modules/utils/binary/bin2obj.lua b/xmake/modules/utils/binary/bin2obj.lua
index 95e705ca6..13ff633e1 100644
--- a/xmake/modules/utils/binary/bin2obj.lua
+++ b/xmake/modules/utils/binary/bin2obj.lua
@@ -19,22 +19,9 @@
 --
 
 -- imports
-import("core.base.option")
 import("core.base.binutils")
 
-local options = {
-    {'i', "binarypath",    "kv", nil,   "Set the binary file path."},
-    {'o', "outputpath",    "kv", nil,   "Set the output object file path."},
-    {'f', "format",        "kv", nil,   "Set the object file format (coff, elf, macho)."},
-    {nil, "symbol_prefix", "kv", nil,   "Set the symbol prefix (default: _binary_)."},
-    {'a', "arch",          "kv", nil,   "Set the target architecture."},
-    {'p', "plat",          "kv", nil,   "Set the target platform (macosx, iphoneos, etc.)."},
-    {nil, "target_minver", "kv", nil,   "Set the target minimum version (e.g., 10.0, 18.2)."},
-    {nil, "xcode_sdkver",  "kv", nil,   "Set the Xcode SDK version (e.g., 10.0, 18.2)."},
-    {nil, "zeroend",       "k",  nil,   "Append a null terminator ('\\0') at the end of data."}
-}
-
-function _do_bin2obj(binarypath, outputpath, opt)
+function main(binarypath, outputpath, opt)
     -- init source directory and options
     opt = opt or {}
     binarypath = path.absolute(binarypath)
@@ -66,15 +53,3 @@ function _do_bin2obj(binarypath, outputpath, opt)
     cprint("${bright}%s generated!", outputpath)
 end
 
-function main(...)
-
-    -- parse arguments
-    local argv = {...}
-    local opt  = option.parse(argv, options, "Convert binary file to object file for direct linking."
-                                                   , ""
-                                                   , "Usage: xmake l utils.binary.bin2obj [options]")
-
-    -- do bin2obj
-    _do_bin2obj(opt.binarypath, opt.outputpath, opt)
-end
-
diff --git a/xmake/modules/utils/binary/extractlib.lua b/xmake/modules/utils/binary/extractlib.lua
index d707ac22f..9097db73a 100644
--- a/xmake/modules/utils/binary/extractlib.lua
+++ b/xmake/modules/utils/binary/extractlib.lua
@@ -19,15 +19,9 @@
 --
 
 -- imports
-import("core.base.option")
 import("core.base.binutils")
 
-local options = {
-    {'i', "libraryfile", "kv", nil,   "Set the static library file path (.a or .lib)."},
-    {'o', "outputdir",   "kv", nil,   "Set the output directory to extract object files."}
-}
-
-function _do_extractlib(libraryfile, outputdir)
+function main(libraryfile, outputdir)
     -- init paths
     libraryfile = path.absolute(libraryfile)
     outputdir = path.absolute(outputdir)
@@ -48,14 +42,3 @@ function _do_extractlib(libraryfile, outputdir)
     cprint("${bright}extraction completed!")
 end
 
-function main(...)
-    -- parse arguments
-    local argv = {...}
-    local opt  = option.parse(argv, options, "Extract object files from static library (AR or MSVC lib format)."
-                                                   , ""
-                                                   , "Usage: xmake l utils.binary.extractlib [options]")
-
-    -- do extractlib
-    _do_extractlib(opt.libraryfile, opt.outputdir)
-end
-
-- 
cgit v1.3.1