add jar generate in swig mode #5536
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waruqi
reviewed
Aug 29, 2024
waruqi
reviewed
Sep 2, 2024
waruqi
reviewed
Sep 2, 2024
|
最近有点忙，等后两天我看下 |
I've been a little busy lately. I'll check it out in the next two days. |
waruqi
reviewed
Sep 5, 2024
xmake/rules/swig/xmake.lua
Outdated
| autogenfiles = os.files(path.join(autogendir, "*.java")) | ||
| local buildjar = target:extraconf("rules", "swig.c", "buildjar") or target:extraconf("rules", "swig.cpp", "buildjar") | ||
| if buildjar then | ||
| autogenfiles = path.join(autogendir , target:name()..".jar") |
There was a problem hiding this comment.
autogenfiles = path.join(autogendir, target:name() .. ".jar")
waruqi
reviewed
Sep 5, 2024
xmake/rules/swig/xmake.lua
Outdated
| @@ -76,12 +76,23 @@ rule("swig.base") | |||
| end | |||
| local autogenfiles | |||
| local autogendir = path.join(target:autogendir(), "rules", "swig") | |||
|
|
|||
| local user_outdir = import("build_module_file").find_user_outdir(fileconfig) | |||
waruqi
reviewed
Sep 5, 2024
| -- jar build | ||
| local buildjar = target:extraconf("rules", "swig.c", "buildjar") or target:extraconf("rules", "swig.cpp", "buildjar") | ||
| if moduletype == "java" and buildjar then | ||
| jar_build(target , fileconfig , opt) |
There was a problem hiding this comment.
, 两边空格不对
jar_build(target, fileconfig, opt)
waruqi
reviewed
Sep 5, 2024
| @@ -73,3 +148,50 @@ function main(target, batchcmds, sourcefile, opt) | |||
| batchcmds:set_depmtime(os.mtime(objectfile)) | |||
| batchcmds:set_depcache(target:dependfile(objectfile)) | |||
| end | |||
|
|
|||
|
|
|||
waruqi
reviewed
Sep 5, 2024
| end | ||
|
|
||
|
|
||
|
|
waruqi
reviewed
Sep 5, 2024
| -- user specified output path | ||
| if fileconfig and fileconfig.swigflags then | ||
| -- find -outdir path | ||
| for i , par in pairs(fileconfig.swigflags) do |
waruqi
reviewed
Sep 5, 2024
| end | ||
| end | ||
|
|
||
| function jar_build(target , fileconfig , opt) |
waruqi
reviewed
Sep 5, 2024
| local filelistname = os.tmpfile() | ||
| local file = io.open(filelistname, "w") | ||
| if file then | ||
| for _, sourcebatch in pairs(autogenfiles) do |
waruqi
reviewed
Sep 5, 2024
|
|
||
| -- compile to class file | ||
| progress.show(opt.progress, "${color.build.object}compiling.javac %s class file", target:name()) | ||
| os.vrunv(javac.program, {"--release", "17", "-d", jar_dst_dir , "@"..filelistname}) |
waruqi
reviewed
Sep 5, 2024
|
|
||
| -- generate jar file | ||
| progress.show(opt.progress, "${color.build.object}compiling.jar %s", target:name()..".jar") | ||
| os.vrunv(jar.program, {"-cf" , path.join(java_src_dir , target:name()..".jar") , jar_dst_dir}) |
waruqi
reviewed
Sep 5, 2024
| local autogenfiles = os.files(path.join(java_src_dir, "*.java")) | ||
|
|
||
| -- write file list | ||
| local filelistname = os.tmpfile() |
waruqi
reviewed
Sep 5, 2024
| @@ -63,6 +119,25 @@ function main(target, batchcmds, sourcefile, opt) | |||
| end | |||
|
|
|||
| table.insert(argv, sourcefile) | |||
| return { argv = argv | |||
| , objectfile = objectfile | |||
| , swig = swig | |||
waruqi
reviewed
Sep 5, 2024
|
|
||
| -- gen swig depend file , same with gcc .d | ||
| local swigdep = os.tmpfile() | ||
| local argv2 = {"-MMD" , "-MF" , swigdep} |
waruqi
reviewed
Sep 5, 2024
| compiler.compile(sourcefile_cx, objectfile, {target = target}) | ||
|
|
||
| -- update depend file | ||
| local deps = io.readfile(swigdep , {continuation = "\\"}) |
|
thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
在使用swig生成java文件的场景下，添加javac和jar打包文件 这样可以直接使用jar包
使用方法如下 添加buildjar = true参数