lib/cutego
1
0
Fork 0
mirror of https://github.com/bluszcz/cutego.git synced 2024-09-28 21:25:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix the CI image builds again + some flutter deployment related changes

Browse source
This commit is contained in:
therecipe 2020-06-03 17:14:12 +02:00
parent 1a4a588c0b
commit c94e36745d
9 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/cmd/deploy/bundle.go
View file

@ -37,15 +37,15 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
}
var args []string
if _, err := ioutil.ReadDir(src); err == nil {
if utils.ExistsDir(src) {
if runtime.GOOS != "windows" || utils.MSYSTEM() != "" {
args = append(args, "-R")
}
}
var suffix string
if _, err := ioutil.ReadDir(dst); err != nil {
if runtime.GOOS == "windows" && utils.MSYSTEM() == "" {
if !utils.ExistsDir(dst) {
if runtime.GOOS == "windows" && utils.MSYSTEM() == "" && !utils.QT_DOCKER() {
suffix = "*"
}
}

6
internal/cmd/deploy/flutter.go
View file

@ -40,7 +40,11 @@ func flutter(target string, path string) {
case "windows":
for _, f := range []string{"flutter_engine.dll", "flutter_engine.dll.lib"} {
utils.RemoveAll(utils.GoQtPkgPath("flutter", f))
os.Symlink(filepath.Join(path, f), utils.GoQtPkgPath("flutter", f))
if utils.QT_DOCKER() && runtime.GOOS == "windows" {
utils.Save(utils.GoQtPkgPath("flutter", f), utils.Load(filepath.Join(path, f))) //TODO:
} else {
os.Symlink(filepath.Join(path, f), utils.GoQtPkgPath("flutter", f))
}
}
case "darwin":

15
internal/cmd/moc/test/sub/sub.go
View file

@ -3,12 +3,10 @@ package sub
import (
"github.com/therecipe/qt/internal/cmd/moc/test/sub/subsub"
"a" //vendor
"github.com/therecipe/qt/internal/cmd/moc/test/sub/b"
abc "github.com/therecipe/qt/internal/cmd/moc/test/sub/c"
. "github.com/therecipe/qt/internal/cmd/moc/test/sub/d"
"ago" //vendor
"github.com/therecipe/qt/internal/cmd/moc/test/sub/bgo"
abcgo "github.com/therecipe/qt/internal/cmd/moc/test/sub/cgo"
. "github.com/therecipe/qt/internal/cmd/moc/test/sub/dgo"
@ -58,19 +56,6 @@ type SubTestStruct struct {
_ func(*StructSubGoDGo) `signal:"subSignald3R"`
}
type SubTestStructNotUsed struct {
subsubcustom.SubSubTestStruct
_ func(a.StructSubGoA) `signal:"vendorSignal1"`
_ func(*a.StructSubGoA) `signal:"vendorSignal1R"`
_ func(a.StructSubMocA) `signal:"vendorSignal2"`
_ func(*a.StructSubMocA) `signal:"vendorSignal2R"`
_ func(ago.StructSubGoAGo) `signal:"vendorSignal3"`
_ func(*ago.StructSubGoAGo) `signal:"vendorSignal3R"`
}
func (s *SubTestStruct) init() {
s.SubSubConstructorProperty++
}

25
internal/cmd/moc/test/sub/sub_unix.go Normal file
View file

@ -0,0 +1,25 @@
// +build !windows
package sub
import (
"github.com/therecipe/qt/internal/cmd/moc/test/sub/subsub"
"a" //vendor
"ago" //vendor
)
//TODO: seems like there is a bug? in the Go 1.14 module mode that makes it impossible to pull (and use?) a project that uses vendor dirs on windows ...
type SubTestStructNotUsed struct {
subsubcustom.SubSubTestStruct
_ func(a.StructSubGoA) `signal:"vendorSignal1"`
_ func(*a.StructSubGoA) `signal:"vendorSignal1R"`
_ func(a.StructSubMocA) `signal:"vendorSignal2"`
_ func(*a.StructSubMocA) `signal:"vendorSignal2R"`
_ func(ago.StructSubGoAGo) `signal:"vendorSignal3"`
_ func(*ago.StructSubGoAGo) `signal:"vendorSignal3R"`
}

2
internal/docker/wine/Dockerfile.32_shared
View file

@ -19,7 +19,7 @@ RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-z3-.*tar.xz(?=\
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-assimp-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-dbus-1.12.1.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2018 | grep -m 1 -o -P 'mingw-w64-i686-fontconfig-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(cat repo | grep 2020 | grep -m 1 -o -P 'mingw-w64-i686-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-harfbuzz-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-jasper-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-libjpeg-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG

2
internal/docker/wine/Dockerfile.32_static
View file

@ -19,7 +19,7 @@ RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-z3-.*tar.xz(?=\
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-assimp-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-dbus-1.12.1.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2018 | grep -m 1 -o -P 'mingw-w64-i686-fontconfig-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(cat repo | grep 2020 | grep -m 1 -o -P 'mingw-w64-i686-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-harfbuzz-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-jasper-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-i686-libjpeg-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG

2
internal/docker/wine/Dockerfile.64_shared
View file

@ -19,7 +19,7 @@ RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-z3-.*tar.xz(?
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-assimp-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-dbus-1.12.1.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2018 | grep -m 1 -o -P 'mingw-w64-x86_64-fontconfig-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(cat repo | grep 2020 | grep -m 1 -o -P 'mingw-w64-x86_64-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-harfbuzz-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-jasper-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-libjpeg-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG

2
internal/docker/wine/Dockerfile.64_static
View file

@ -19,7 +19,7 @@ RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-z3-.*tar.xz(?
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-assimp-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-dbus-1.12.1.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2018 | grep -m 1 -o -P 'mingw-w64-x86_64-fontconfig-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(cat repo | grep 2020 | grep -m 1 -o -P 'mingw-w64-x86_64-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-freetype-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-harfbuzz-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-jasper-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG
RUN PKG=$(tac repo | grep 2019 | grep -m 1 -o -P 'mingw-w64-x86_64-libjpeg-.*tar.xz(?=\")') && curl -sL --retry 10 --retry-delay 60 -O $REPO/$PKG && tar -xf $PKG -C $HOME/.wine/drive_c/msys64 && rm -f $PKG

8
internal/utils/utils.go
View file

@ -14,13 +14,13 @@ import (
)
func ExistsFile(name string) bool {
_, err := os.Stat(name)
return err == nil
f, err := os.Stat(name)
return err == nil && !f.IsDir()
}
func ExistsDir(name string) bool {
_, err := os.Stat(name)
return err == nil
d, err := os.Stat(name)
return err == nil && d.IsDir()
}
func MkdirAll(dir string) error {