Skip to content
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

Qt deploy for Windows #1145

Merged
merged 6 commits into from Dec 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 77 additions & 0 deletions xmake/rules/qt/install/windows.lua
@@ -0,0 +1,77 @@
--!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-2020, TBOOX Open Source Group.
--
-- @author ruki
-- @file macosx.lua
--

-- imports
import("core.base.option")
import("core.project.config")
import("core.tool.toolchain")
import("lib.detect.find_path")

-- install application package for windows
function main(target, opt)

local targetfile = target:targetfile()
local installfile = path.join(target:installdir(), "bin", path.filename(targetfile))

-- get qt sdk
local qt = target:data("qt")

-- get windeployqt
local windeployqt = path.join(qt.bindir, "windeployqt.exe")
assert(os.isexec(windeployqt), "windeployqt.exe not found!")

-- find qml directory
local qmldir = nil
for _, sourcebatch in pairs(target:sourcebatches()) do
if sourcebatch.rulename == "qt.qrc" then
for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
qmldir = find_path("*.qml", path.directory(sourcefile))
SirLynix marked this conversation as resolved.
Show resolved Hide resolved
if qmldir then
break
end
end
end
end

-- find msvc to set VCINSTALLDIR env
local envs = nil
local msvc = toolchain.load("msvc", {plat = target:plat(), arch = target:arch()})
if msvc then
local vcvars = msvc:config("vcvars")
if vcvars and vcvars.VSInstallDir then
envs = {VCINSTALLDIR = path.join(vcvars.VSInstallDir, "VC")}
end
end

local argv = {"--force"}
if option.get("diagnosis") then
table.insert(argv, "--verbose=2")
elseif option.get("verbose") then
table.insert(argv, "--verbose=1")
else
table.insert(argv, "--verbose=0")
end
if qmldir then
table.insert(argv, "--qmldir=" .. qmldir)
end
table.insert(argv, installfile)

os.vrunv(windeployqt, argv, {envs = envs})
end
6 changes: 6 additions & 0 deletions xmake/rules/qt/xmake.lua
Expand Up @@ -75,6 +75,8 @@ rule("qt.console")
import("load")(target, {frameworks = {"QtCore"}})
end)

after_install("windows", "install.windows")

-- define rule: qt widgetapp
rule("qt.widgetapp")
add_deps("qt.ui", "qt.moc", "qt._wasm_app", "qt.qrc")
Expand All @@ -94,6 +96,7 @@ rule("qt.widgetapp")

-- install application for android
on_install("android", "install.android")
after_install("windows", "install.windows")

-- define rule: qt static widgetapp
rule("qt.widgetapp_static")
Expand Down Expand Up @@ -143,6 +146,7 @@ rule("qt.widgetapp_static")

-- install application for android
on_install("android", "install.android")
after_install("windows", "install.windows")

-- define rule: qt quickapp
rule("qt.quickapp")
Expand All @@ -163,6 +167,7 @@ rule("qt.quickapp")

-- install application for android
on_install("android", "install.android")
after_install("windows", "install.windows")

-- define rule: qt static quickapp
rule("qt.quickapp_static")
Expand Down Expand Up @@ -212,6 +217,7 @@ rule("qt.quickapp_static")

-- install application for android
on_install("android", "install.android")
after_install("windows", "install.windows")

-- define rule: qt application (deprecated)
rule("qt.application")
Expand Down