mirror of
https://github.com/bluszcz/cutego.git
synced 2024-09-28 21:25:16 +03:00
i435: create a temp dir to avoid conflict with package name
This commit is contained in:
parent
62049250f0
commit
71edb9cad4
1 changed files with 6 additions and 4 deletions
|
@ -8,6 +8,7 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/therecipe/qt/internal/binding/parser"
|
"github.com/therecipe/qt/internal/binding/parser"
|
||||||
"github.com/therecipe/qt/internal/binding/templater"
|
"github.com/therecipe/qt/internal/binding/templater"
|
||||||
|
@ -86,7 +87,8 @@ func bundle(mode, target, path, name, depPath string) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
utils.MkdirAll(filepath.Join(depPath, "lib"))
|
tempLib := "lib" + time.Now().Format("20060102150405")
|
||||||
|
utils.MkdirAll(filepath.Join(depPath, tempLib))
|
||||||
|
|
||||||
var (
|
var (
|
||||||
libraryPath = strings.TrimSpace(utils.RunCmd(exec.Command(utils.ToolPath("qmake", target), "-query", "QT_INSTALL_LIBS"), fmt.Sprintf("query lib path for %v on %v", target, runtime.GOOS)))
|
libraryPath = strings.TrimSpace(utils.RunCmd(exec.Command(utils.ToolPath("qmake", target), "-query", "QT_INSTALL_LIBS"), fmt.Sprintf("query lib path for %v on %v", target, runtime.GOOS)))
|
||||||
|
@ -121,7 +123,7 @@ func bundle(mode, target, path, name, depPath string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if utils.ExistsFile(filepath.Join(libraryPath, libName)) {
|
if utils.ExistsFile(filepath.Join(libraryPath, libName)) {
|
||||||
utils.RunCmd(exec.Command("cp", "-L", filepath.Join(libraryPath, libName), filepath.Join(depPath, "lib", libName)), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
|
utils.RunCmd(exec.Command("cp", "-L", filepath.Join(libraryPath, libName), filepath.Join(depPath, tempLib, libName)), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.Contains(dep, "WebEngine") {
|
if strings.Contains(dep, "WebEngine") {
|
||||||
|
@ -139,11 +141,11 @@ func bundle(mode, target, path, name, depPath string) {
|
||||||
}
|
}
|
||||||
for _, libName := range libs {
|
for _, libName := range libs {
|
||||||
if utils.ExistsFile(filepath.Join(libraryPath, fmt.Sprintf("libQt5%v.so.5", libName))) {
|
if utils.ExistsFile(filepath.Join(libraryPath, fmt.Sprintf("libQt5%v.so.5", libName))) {
|
||||||
utils.RunCmd(exec.Command("cp", "-L", filepath.Join(libraryPath, fmt.Sprintf("libQt5%v.so.5", libName)), filepath.Join(depPath, "lib", fmt.Sprintf("libQt5%v.so.5", libName))), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
|
utils.RunCmd(exec.Command("cp", "-L", filepath.Join(libraryPath, fmt.Sprintf("libQt5%v.so.5", libName)), filepath.Join(depPath, tempLib, fmt.Sprintf("libQt5%v.so.5", libName))), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if utils.ExistsFile(filepath.Join(libraryPath, "libqgsttools_p.so.1.0.0")) {
|
if utils.ExistsFile(filepath.Join(libraryPath, "libqgsttools_p.so.1.0.0")) {
|
||||||
utils.RunCmd(exec.Command("cp", "-L", filepath.Join(libraryPath, "libqgsttools_p.so.1.0.0"), filepath.Join(depPath, "lib", "libqgsttools_p.so.1")), fmt.Sprintf("copy libqgsttools_p.so.1 for %v on %v", target, runtime.GOOS))
|
utils.RunCmd(exec.Command("cp", "-L", filepath.Join(libraryPath, "libqgsttools_p.so.1.0.0"), filepath.Join(depPath, tempLib, "libqgsttools_p.so.1")), fmt.Sprintf("copy libqgsttools_p.so.1 for %v on %v", target, runtime.GOOS))
|
||||||
}
|
}
|
||||||
|
|
||||||
libraryPath = filepath.Dir(libraryPath)
|
libraryPath = filepath.Dir(libraryPath)
|
||||||
|
|
Loading…
Reference in a new issue