From 71edb9cad43d92de5bc85f2c970ad4883e8e9516 Mon Sep 17 00:00:00 2001 From: Quan Anh Tong Date: Wed, 23 Aug 2017 19:18:49 +0700 Subject: [PATCH] i435: create a temp dir to avoid conflict with package name --- internal/cmd/deploy/bundle.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/cmd/deploy/bundle.go b/internal/cmd/deploy/bundle.go index 1e71a099..1dd61c37 100644 --- a/internal/cmd/deploy/bundle.go +++ b/internal/cmd/deploy/bundle.go @@ -8,6 +8,7 @@ import ( "path/filepath" "runtime" "strings" + "time" "github.com/therecipe/qt/internal/binding/parser" "github.com/therecipe/qt/internal/binding/templater" @@ -86,7 +87,8 @@ func bundle(mode, target, path, name, depPath string) { return } - utils.MkdirAll(filepath.Join(depPath, "lib")) + tempLib := "lib" + time.Now().Format("20060102150405") + utils.MkdirAll(filepath.Join(depPath, tempLib)) 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))) @@ -121,7 +123,7 @@ func bundle(mode, target, path, name, depPath string) { } 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") { @@ -139,11 +141,11 @@ func bundle(mode, target, path, name, depPath string) { } for _, libName := range libs { 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")) { - 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)