Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Alderaan
pan-light
提交
4458b57c
P
pan-light
项目概览
Alderaan
/
pan-light
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
pan-light
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
4458b57c
编写于
6月 09, 2019
作者:
P
peterq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: build linux
上级
f484f3c3
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
12 addition
and
5 deletion
+12
-5
.gitignore
.gitignore
+2
-1
pan-light.go
pan-light.go
+6
-0
qt/tool-chain/cmd/deploy/bundle.go
qt/tool-chain/cmd/deploy/bundle.go
+1
-1
qt/tool-chain/cmd/deploy/deploy.go
qt/tool-chain/cmd/deploy/deploy.go
+1
-1
qt/tool-chain/utils/env.go
qt/tool-chain/utils/env.go
+1
-1
qt/tool-chain/utils/utils.go
qt/tool-chain/utils/utils.go
+1
-1
未找到文件。
.gitignore
浏览文件 @
4458b57c
...
...
@@ -8,4 +8,5 @@ qml.rcc
gui-plugin.so
.env
/demo
*.pb.go
\ No newline at end of file
*.pb.go
deploy
\ No newline at end of file
pan-light.go
浏览文件 @
4458b57c
...
...
@@ -114,6 +114,8 @@ func pcCmd() {
pcMoc
()
case
"dev"
:
pcDev
()
case
"build"
:
pcBuild
()
case
"download-icon"
:
downloadIcon
()
default
:
...
...
@@ -137,6 +139,10 @@ func pcDev() {
runCmd
(
"./pc"
,
"go"
,
"run"
,
"-tags=plugin"
,
"pan-light-pc-dev.go"
)
}
func
pcBuild
()
{
runCmd
(
"./pc"
,
"go"
,
"run"
,
"../qt/cmd/qtdeploy/main.go"
,
"-fast"
,
"build"
,
"desktop"
)
}
func
qtBin
(
name
string
)
string
{
v
,
ok1
:=
os
.
LookupEnv
(
"QT_VERSION"
)
d
,
ok2
:=
os
.
LookupEnv
(
"QT_DIR"
)
...
...
qt/tool-chain/cmd/deploy/bundle.go
浏览文件 @
4458b57c
...
...
@@ -103,7 +103,7 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
}()
//copy default assets
if
target
!=
"linux"
||
name
==
"lib"
{
if
target
!=
"linux"
||
name
==
"lib"
||
true
{
utils
.
SaveExec
(
filepath
.
Join
(
depPath
,
fmt
.
Sprintf
(
"%v.sh"
,
name
)),
linux_sh
(
target
,
name
))
}
...
...
qt/tool-chain/cmd/deploy/deploy.go
浏览文件 @
4458b57c
...
...
@@ -80,7 +80,7 @@ func Deploy(mode, target, path string, docker bool, ldFlags, tags string, fast b
build
(
mode
,
target
,
path
,
ldFlags
,
tags
,
name
,
depPath
,
fast
,
comply
)
if
!
(
fast
||
(
utils
.
QT_DEBUG_QML
()
&&
target
==
runtime
.
GOOS
))
||
(
target
==
"js"
||
target
==
"wasm"
)
{
if
!
(
fast
||
(
utils
.
QT_DEBUG_QML
()
&&
target
==
runtime
.
GOOS
))
||
(
target
==
"js"
||
target
==
"wasm"
)
||
true
{
bundle
(
mode
,
target
,
path
,
name
,
depPath
,
tags
,
fast
)
}
else
if
fast
{
switch
target
{
...
...
qt/tool-chain/utils/env.go
浏览文件 @
4458b57c
...
...
@@ -295,7 +295,7 @@ func GoList(args ...string) *exec.Cmd {
if
UseGOMOD
(
""
)
{
if
true
||
/*strings.Contains(strings.Join(args, "|"), "github.com/therecipe/env_"+runtime.GOOS+"_amd64") ||*/
strings
.
Contains
(
strings
.
Join
(
args
,
"|"
),
"github.com/peterq/pan-light/qt/tool-chain"
)
{
//TODO: make env readonly if it can't be found inside ./vendor ...
cmd
.
Args
=
append
(
cmd
.
Args
,
"-mod=readonly"
)
//
cmd.Args = append(cmd.Args, "-mod=readonly")
}
else
{
cmd
.
Args
=
append
(
cmd
.
Args
,
GOFLAGS
())
}
...
...
qt/tool-chain/utils/utils.go
浏览文件 @
4458b57c
...
...
@@ -95,7 +95,7 @@ func GoQtPkgPath(s ...string) (r string) {
if
len
(
goQtPkgPath
)
==
0
{
goQtPkgPath
=
strings
.
TrimSpace
(
RunCmd
(
GoList
(
"{{.Dir}}"
,
packageName
),
"utils.GoQtPkgPath"
))
fmt
.
Println
(
goQtPkgPath
)
os
.
Exit
(
0
)
//
os.Exit(0)
}
r
=
goQtPkgPath
goQtPkgPathMutex
.
Unlock
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录