-
-
Notifications
You must be signed in to change notification settings - Fork 906
Add msvc midl support #6279
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add msvc midl support #6279
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| --!A cross-platform build utility based on Lua | ||
| -- | ||
| -- Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -- you may not use this file except in compliance with the License. | ||
| -- You may obtain a copy of the License at | ||
| -- | ||
| -- http://www.apache.org/licenses/LICENSE-2.0 | ||
| -- | ||
| -- Unless required by applicable law or agreed to in writing, software | ||
| -- distributed under the License is distributed on an "AS IS" BASIS, | ||
| -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -- See the License for the specific language governing permissions and | ||
| -- limitations under the License. | ||
| -- | ||
| -- Copyright (C) 2015-present, TBOOX Open Source Group. | ||
| -- | ||
| -- @author ruki | ||
| -- @file find_midl.lua | ||
| -- | ||
|
|
||
| -- imports | ||
| import("core.project.config") | ||
| import("lib.detect.find_program") | ||
| import("lib.detect.find_programver") | ||
|
|
||
| -- find midl | ||
| -- | ||
| -- @param opt the argument options, e.g. {version = true} | ||
| -- | ||
| -- @return program, version | ||
| -- | ||
| -- @code | ||
| -- | ||
| -- local midl = find_midl() | ||
| -- | ||
| -- @endcode | ||
| -- | ||
| function main(opt) | ||
| opt = opt or {} | ||
| opt.check = opt.check or "/confirm" | ||
| opt.command = opt.command or "/confirm" | ||
| opt.parse = opt.parse or function (output) return output:match("Version (%d+%.%d+%.%d+)%s") end | ||
|
|
||
| local envs = opt.envs | ||
| if envs and envs.WindowsSdkDir and envs.WindowsSDKVersion then | ||
| local toolchain = opt.toolchain | ||
| local arch = toolchain and toolchain:arch() or config.arch() | ||
| local bindir = path.join(envs.WindowsSdkDir, "bin", envs.WindowsSDKVersion, arch) | ||
| if os.isdir(bindir) then | ||
| opt.paths = opt.paths or {} | ||
| table.insert(opt.paths, bindir) | ||
| end | ||
| end | ||
|
|
||
| local program = find_program(opt.program or "midl", opt) | ||
|
|
||
| local version = nil | ||
| if program and opt and opt.version then | ||
| version = find_programver(program, opt) | ||
| end | ||
| return program, version | ||
| end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| --!A cross-platform build utility based on Lua | ||
| -- | ||
| -- Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -- you may not use this file except in compliance with the License. | ||
| -- You may obtain a copy of the License at | ||
| -- | ||
| -- http://www.apache.org/licenses/LICENSE-2.0 | ||
| -- | ||
| -- Unless required by applicable law or agreed to in writing, software | ||
| -- distributed under the License is distributed on an "AS IS" BASIS, | ||
| -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -- See the License for the specific language governing permissions and | ||
| -- limitations under the License. | ||
| -- | ||
| -- Copyright (C) 2015-present, TBOOX Open Source Group. | ||
| -- | ||
| -- @author ruki | ||
| -- @file xmake.lua | ||
| -- | ||
|
|
||
| -- add *.idl for rc file | ||
| rule("platform.windows.idl") | ||
| set_extensions(".idl") | ||
|
|
||
| on_config(function (target) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这里也应该限制到 windows 平台 |
||
| local autogendir = path.join(target:autogendir(), "platform/windows/idl") | ||
| os.mkdir(autogendir) | ||
| -- compile rc file maybe require .tlb dir | ||
| target:add("includedirs", autogendir, {public = true}) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这会导致所有工程都默认加上这个 includedir
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. rule 里生成的头文件,如果下游 target 想用怎么办,粗粒度一点应该也不会撞吧
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 目前是所有工程 不管是否带 idl,都会带上这个 includedirs,即使没头文件冲突,但是 xmake -v 里莫名带上这个 includedirs 也很怪。 我稍微改了下,其实可以参考 windows.def 那个 rule,只有当前 target 带有 idl files ,才加上。 |
||
| end) | ||
|
|
||
| before_buildcmd_file(function (target, batchcmds, sourcefile, opt) | ||
| import("lib.detect.find_tool") | ||
| import("core.tool.toolchain") | ||
|
|
||
| local msvc = toolchain.load("msvc", {plat = os.host(), arch = os.arch()}) | ||
star-hengxing marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| local midl = assert(find_tool("midl", {envs = msvc:runenvs(), toolchain = msvc}), "midl not found!") | ||
|
|
||
| local name = path.basename(sourcefile) | ||
| local autogendir = path.join(target:autogendir(), "platform/windows/idl") | ||
|
|
||
| local flags = {"/nologo"} | ||
| table.join2(flags, table.wrap(target:values("idl.flags"))) | ||
| table.join2(flags, { | ||
| "/out", autogendir, | ||
star-hengxing marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| "/header", name .. ".h", | ||
| "/iid", name .. "_i.c", | ||
| "/proxy", name .. "_p.c", | ||
| "/tlb", name .. ".tlb", | ||
| sourcefile | ||
| }) | ||
|
|
||
| batchcmds:show_progress(opt.progress, "${color.build.object}compiling.idl %s", sourcefile) | ||
| batchcmds:vrunv(midl.program, flags, {envs = msvc:runenvs()}) | ||
|
|
||
| local iid_file = path.join(autogendir, name .. "_i.c") | ||
| local objectfile = target:objectfile(iid_file) | ||
| table.insert(target:objectfiles(), objectfile) | ||
|
|
||
| batchcmds:show_progress(opt.progress, "${color.build.object}compiling.$(mode) %s", iid_file) | ||
| batchcmds:compile(iid_file, objectfile) | ||
|
|
||
| batchcmds:add_depfiles(sourcefile, iid_file) | ||
| batchcmds:set_depmtime(os.mtime(objectfile)) | ||
| batchcmds:set_depcache(target:dependfile(objectfile)) | ||
| end) | ||
Uh oh!
There was an error while loading. Please reload this page.