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

fix sailfish support + fix linux deployment issue + fix some minor issues

Browse source
This commit is contained in:
therecipe 2019-06-26 22:31:33 +02:00
parent 83311ce9ed
commit 0aa6d6dc1a
32 changed files with 87 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/binding/converter/helper.go
View file

@ -5,6 +5,7 @@ import (
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"sync"
@ -259,6 +260,11 @@ func IsPrivateSignal(f *parser.Function) bool {
}
fData = utils.LoadOptional(filepath.Join(pkgConfigIncludeDirCache, strings.Title(parser.State.ClassMap[f.ClassName()].DocModule), fPath))
pkgConfigIncludeDirCacheMutex.Unlock()
} else if strings.HasPrefix(parser.State.Target, "sailfish") && runtime.GOOS == "darwin" {
fData = utils.LoadOptional(filepath.Join(utils.QT_INSTALL_PREFIX(target), "lib", fmt.Sprintf("%v.framework", strings.Title(parser.State.ClassMap[f.ClassName()].DocModule)), "Versions", "5", "Headers", fPath))
if fData == "" {
fData = utils.LoadOptional(filepath.Join(utils.QT_INSTALL_PREFIX(target), "lib", fmt.Sprintf("%v.framework", strings.Title(parser.State.ClassMap[f.ClassName()].DocModule)), "Headers", fPath))
}
} else {
fData = utils.Load(filepath.Join(utils.QT_INSTALL_PREFIX(target), "include", strings.Title(parser.State.ClassMap[f.ClassName()].DocModule), fPath))
}

3
internal/binding/parser/class_fix.go
View file

@ -269,6 +269,9 @@ func (c *Class) fixBases() {
}
prefixPath = pkgConfigIncludeDir
pkgConfigIncludeDirMutex.Unlock()
} else if strings.HasPrefix(State.Target, "sailfish") && runtime.GOOS == "darwin" {
infixPath = "lib"
suffixPath = ".framework/Headers/"
}
}
}

8
internal/binding/parser/parser.go
View file

@ -8,6 +8,7 @@ import (
"sync"
"github.com/sirupsen/logrus"
"github.com/therecipe/qt/internal/utils"
)
@ -155,10 +156,11 @@ func LoadModule(m string) *Module {
}
}
if err != nil {
if m != "DataVisualization" && m != "Charts" {
utils.Log.WithFields(logFields).WithError(err).Warn(logName)
} else {
switch m {
case "Charts", "DataVisualization", "VirtualKeyboard":
utils.Log.WithFields(logFields).WithError(err).Debug(logName)
default:
utils.Log.WithFields(logFields).WithError(err).Warn(logName)
}
return nil
}

4
internal/ci/darwin.sh
View file

@ -14,7 +14,7 @@ then
brew update
brew install qt5
brew outdated qt5 || brew upgrade qt5
ln -s /usr/local/Cellar/qt/5.11.2 $HOME/Desktop/Qt5.11.2
ln -s /usr/local/Cellar/qt/5.12.3 $HOME/Desktop/Qt
else
#download and install qt
QT=qt-unified-mac-x64-online
@ -43,7 +43,7 @@ then
#install deps for android sdk
$HOME/android-sdk-macosx/tools/bin/sdkmanager --list --verbose
echo "y" | $HOME/android-sdk-macosx/tools/bin/sdkmanager "platform-tools" "build-tools;26.0.0" "platforms;android-25"
echo "y" | $HOME/android-sdk-macosx/tools/bin/sdkmanager "platform-tools" "build-tools;28.0.3" "platforms;android-28"
echo "y" | $HOME/android-sdk-macosx/tools/bin/sdkmanager --update
#download and install android ndk

6
internal/ci/linux.sh
View file

@ -32,8 +32,8 @@ if [ "$QT_MXE" == "true" ]
then
#download and install qt (and wine) for cross compilation
sudo apt-get -y -qq install wine && sudo apt-get -qq clean
echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" | sudo tee --append /etc/apt/sources.list.d/mxeapt.list > /dev/null
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
echo "deb http://pkg.mxe.cc/repos/apt trusty main" | sudo tee --append /etc/apt/sources.list.d/mxeapt.list > /dev/null
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9
sudo apt-get -qq update
if [ "$QT_MXE_STATIC" == "true" ]
@ -71,7 +71,7 @@ if [ "$ANDROID" == "true" ]; then
#install deps for android sdk
$HOME/android-sdk-linux/tools/bin/sdkmanager --list --verbose
echo "y" | $HOME/android-sdk-linux/tools/bin/sdkmanager "platform-tools" "build-tools;26.0.0" "platforms;android-25"
echo "y" | $HOME/android-sdk-linux/tools/bin/sdkmanager "platform-tools" "build-tools;28.0.3" "platforms;android-28"
$HOME/android-sdk-linux/tools/bin/sdkmanager --update
#download and install android ndk

8
internal/cmd/cmd.go
View file

@ -340,7 +340,7 @@ func virtual(arg []string, target, path string, writeCacheToHost bool, docker bo
gpath := strings.Join(paths, pathseperator)
if writeCacheToHost {
gpath += pathseperator + gpfs
args = append(args, []string{"-e", "QT_STUB=true"}...)
args = append(args, []string{"-e", "QT_STUB=true"}...) //TODO: won't work with wine images atm
} else {
if strings.Contains(path, "github.com/therecipe/qt/internal/examples") && !strings.Contains(path, "github.com/therecipe/qt/internal/examples/androidextras") {
gpath += pathseperator + gpfs
@ -370,7 +370,7 @@ func virtual(arg []string, target, path string, writeCacheToHost bool, docker bo
}
if p, ok := os.LookupEnv("PKG_CONFIG_PATH"); ok {
args = append(args, []string{"-e", "PKG_CONFIG_PATH=" + p}...)
args = append(args, []string{"-e", "PKG_CONFIG_PATH=" + p}...) //TODO: won't work with wine images atm
}
if utils.QT_WEBKIT() {
@ -666,8 +666,8 @@ func BuildEnv(target, name, depPath string) (map[string]string, []string, []stri
env["GOARCH"] = utils.GOARCH()
}
//TODO: support 32 and 64 bit support; fix InitEnv as well
if strings.Contains(utils.QT_INSTALL_PREFIX(target), "env_windows_amd64") {
//TODO: support 32 and 64 bit; fix InitEnv as well (for 32 bit support)
if strings.Contains(utils.QT_INSTALL_PREFIX(target), "env_windows_amd64") && utils.QT_VERSION_NUM() < 5130 { //TODO: fix env_windows_amd64_512 instead
env["CGO_LDFLAGS"] = filepath.Join("C:\\", "Users", "Public", "env_windows_amd64", "Tools", "mingw730_64", "x86_64-w64-mingw32", "lib", "libmsvcrt.a")
}
}

3
internal/cmd/deploy/assets_sailfish.go
View file

@ -16,6 +16,9 @@ import (
func sailfish_ssh(port, login string, cmd ...string) error {
typ := "SailfishOS_Emulator"
if strings.HasPrefix(utils.QT_SAILFISH_VERSION(), "3.") {
typ = "Sailfish_OS-Emulator-latest"
}
if port == "2222" {
typ = "engine"
}

9
internal/cmd/deploy/build.go
View file

@ -174,6 +174,7 @@ func build_sailfish(target, path, ldFlagsCustom, name string) {
time.Sleep(10 * time.Second)
for _, l := range []string{"libmpc.so.3", "libmpfr.so.4", "libgmp.so.10", "libpthread_nonshared.a", "libc_nonshared.a"} {
sailfish_ssh("2222", "root", "rm", fmt.Sprintf("/usr/lib/%v", l))
sailfish_ssh("2222", "root", "ln", "-s", fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/usr/lib/%v", l), fmt.Sprintf("/usr/lib/%v", l))
}
@ -182,8 +183,12 @@ func build_sailfish(target, path, ldFlagsCustom, name string) {
arch, gcc = "armv7hl", "gnueabi"
}
sailfish_ssh("2222", "root", "ln", "-s", fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/bin/%v-meego-linux-%v-as", arch, gcc), fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/libexec/gcc/%v-meego-linux-%v/4.8.3/as", arch, gcc))
sailfish_ssh("2222", "root", "ln", "-s", fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/bin/%v-meego-linux-%v-ld", arch, gcc), fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/libexec/gcc/%v-meego-linux-%v/4.8.3/ld", arch, gcc))
gccVersion := "4.8.3"
if strings.HasPrefix(utils.QT_SAILFISH_VERSION(), "3.") {
gccVersion = "4.9.4"
}
sailfish_ssh("2222", "root", "ln", "-s", fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/bin/%v-meego-linux-%v-as", arch, gcc), fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/libexec/gcc/%v-meego-linux-%v/%v/as", arch, gcc, gccVersion))
sailfish_ssh("2222", "root", "ln", "-s", fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/bin/%v-meego-linux-%v-ld", arch, gcc), fmt.Sprintf("/srv/mer/toolings/SailfishOS-"+utils.QT_SAILFISH_VERSION()+"/opt/cross/libexec/gcc/%v-meego-linux-%v/%v/ld", arch, gcc, gccVersion))
var pattern string
if v := utils.GOVERSION(); strings.Contains(v, "1.1") || strings.Contains(v, "devel") {

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

@ -167,6 +167,19 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
if utils.ExistsFile(filepath.Join(libraryPath, libName)) {
utils.RunCmd(exec.Command("cp", "-L", strings.TrimSuffix(filepath.Join(libraryPath, libName), ".5"), filepath.Join(depPath, libDir, libName)), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
if strings.HasPrefix(libName, "libQt5Multimedia") {
libName = "libQt5MultimediaWidgets.so.5"
utils.RunCmdOptional(exec.Command("cp", "-L", strings.TrimSuffix(filepath.Join(libraryPath, libName), ".5"), filepath.Join(depPath, libDir, libName)), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
}
if strings.HasPrefix(libName, "libQt5WebEngine") {
libName = "libQt5WebEngineWidgets.so.5"
utils.RunCmdOptional(exec.Command("cp", "-L", strings.TrimSuffix(filepath.Join(libraryPath, libName), ".5"), filepath.Join(depPath, libDir, libName)), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
}
if strings.HasPrefix(libName, "libQt5Quick") {
libName = "libQt5QuickWidgets.so.5"
utils.RunCmdOptional(exec.Command("cp", "-L", strings.TrimSuffix(filepath.Join(libraryPath, libName), ".5"), filepath.Join(depPath, libDir, libName)), fmt.Sprintf("copy %v for %v on %v", libName, target, runtime.GOOS))
}
}
if strings.Contains(dep, "WebEngine") || strings.Contains(dep, "WebView") {

14
internal/cmd/deploy/run.go
View file

@ -51,13 +51,19 @@ func run(target, name, depPath, device string) {
if utils.QT_SAILFISH() {
return
}
utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "registervm", filepath.Join(utils.SAILFISH_DIR(), "emulator", "Sailfish OS Emulator", "Sailfish OS Emulator.vbox")), "register vm")
utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", "Sailfish OS Emulator", "--name", "GOPATH", "--hostpath", utils.MustGoPath(), "--automount"), "mount GOPATH")
emulator := "Sailfish OS Emulator"
if strings.HasPrefix(utils.QT_SAILFISH_VERSION(), "3.") {
emulator = fmt.Sprintf("Sailfish OS Emulator %v", utils.QT_SAILFISH_VERSION())
}
utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "registervm", filepath.Join(utils.SAILFISH_DIR(), "emulator", emulator, emulator+".vbox")), "register vm")
utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", emulator, "--name", "GOPATH", "--hostpath", utils.MustGoPath(), "--automount"), "mount GOPATH")
if runtime.GOOS == "windows" {
utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "Sailfish OS Emulator"), "start emulator")
utils.RunCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", emulator), "start emulator")
} else {
utils.RunCmdOptional(exec.Command("nohup", filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "Sailfish OS Emulator"), "start emulator")
utils.RunCmdOptional(exec.Command("nohup", filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", emulator), "start emulator")
}
time.Sleep(10 * time.Second)

3
internal/cmd/setup/check.go
View file

@ -135,6 +135,7 @@ func Check(target string, docker, vagrant bool) {
case "sailfish", "sailfish-emulator":
vars = append(vars, [][]string{
{"QT_SAILFISH_VERSION", utils.QT_SAILFISH_VERSION()},
{"VIRTUALBOX_DIR", utils.VIRTUALBOX_DIR()},
{"SAILFISH_DIR", utils.SAILFISH_DIR()},
}...)
@ -155,7 +156,7 @@ func Check(target string, docker, vagrant bool) {
if !strings.HasSuffix(v[0], "_DIR") {
continue
}
if v[0] == "QT_DIR" && (utils.QT_HOMEBREW() || utils.QT_MACPORTS() || utils.QT_NIX() || utils.QT_FELGO() || utils.QT_MSYS2() || utils.QT_PKG_CONFIG() || utils.MSYS_DOCKER() || utils.QT_DOCKER()) {
if v[0] == "QT_DIR" && (utils.QT_HOMEBREW() || utils.QT_MACPORTS() || utils.QT_NIX() || utils.QT_FELGO() || utils.QT_MSYS2() || utils.QT_PKG_CONFIG() || utils.MSYS_DOCKER() || utils.QT_DOCKER() || utils.QT_STATIC()) {
continue
}
if v[0] == "XCODE_DIR" && runtime.GOOS != "darwin" {

2
internal/cmd/setup/test.go
View file

@ -170,7 +170,7 @@ func Test(target string, docker, vagrant bool, vagrantsystem string) {
vagrantsystem,
false,
true,
true,
!strings.HasPrefix(target, "sailfish"),
)
templater.CleanupDepsForCI()
templater.CleanupDepsForCI = func() {}

2
internal/docker/android/Dockerfile
View file

@ -89,7 +89,7 @@ RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/androidextras/jni &
RUN GOARCH=arm64 $GOPATH/bin/qtsetup check android
RUN GOARCH=arm64 $GOPATH/bin/qtsetup generate android
RUN GOARCH=arm64 $GOPATH/bin/qtsetup install android
RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/androidextras/jni && GOARCH=arm64 $GOPATH/bin/qtdeploy -debug build android && rm -rf ./deploy
RUN cd $GOPATH/src/github.com/therecipe/qt/internal/examples/androidextras/jni && GOARCH=arm64 $GOPATH/bin/qtdeploy build android && rm -rf ./deploy
RUN $GOPATH/bin/qtsetup check android-emulator
RUN $GOPATH/bin/qtsetup generate android-emulator

2
internal/docker/darwin/Dockerfile
View file

@ -47,7 +47,7 @@ RUN rm /usr/bin/strip && ln -s /osxcross/target/bin/x86_64-apple-darwin18-strip
RUN ln -s /osxcross/target/bin/x86_64-apple-darwin18-otool /usr/bin/otool
RUN ln -s /osxcross/target/bin/x86_64-apple-darwin18-install_name_tool /usr/bin/install_name_tool
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN go get github.com/therecipe/qt/cmd/...
RUN GOOS=darwin go get github.com/therecipe/qt/cmd/... && DST=$GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/therecipe/env_linux_amd64_512/5.12.0/gcc_64/bin $DST

2
internal/docker/linux/Dockerfile
View file

@ -5,7 +5,7 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1

4
internal/docker/linux/Dockerfile.56
View file

@ -5,12 +5,12 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1
ENV QT=qt-opensource-linux-x64-5.6.3.run
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.6/5.6.3/$QT && chmod +x $QT
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.6/5.6.3/$QT && chmod +x $QT
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install libglib2.0-dev libglu1-mesa-dev
RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true VERSION=563
RUN find /opt/Qt5.6.3/5.6.3 -type f -name "*.debug" -delete

2
internal/docker/linux/Dockerfile.59
View file

@ -5,7 +5,7 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install dbus fontconfig libx11-6 libx11-xcb1

2
internal/docker/linux/Dockerfile.arch
View file

@ -6,7 +6,7 @@ ENV GOPATH $HOME/work
RUN pacman -Syyu --quiet || true
RUN pacman -S --noconfirm --needed --noprogressbar --quiet ca-certificates curl git tar
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
FROM archlinux/base

2
internal/docker/linux/Dockerfile.static
View file

@ -5,7 +5,7 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...

2
internal/docker/linux/Dockerfile.suse_leap
View file

@ -3,7 +3,7 @@ FROM opensuse/leap:latest as base
ENV GOPATH $HOME/work
RUN zypper -q ref && zypper -n -q install --no-recommends curl git gzip tar
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
FROM opensuse/leap:latest

2
internal/docker/linux/Dockerfile.suse_tumbleweed
View file

@ -3,7 +3,7 @@ FROM opensuse/tumbleweed:latest as base
ENV GOPATH $HOME/work
RUN zypper -q ref && zypper -n -q install --no-recommends curl git gzip tar
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
FROM opensuse/tumbleweed:latest

2
internal/docker/linux/Dockerfile.ubuntu_16_04
View file

@ -5,7 +5,7 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
FROM ubuntu:16.04

2
internal/docker/linux/Dockerfile.ubuntu_18_04
View file

@ -5,7 +5,7 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
FROM ubuntu:18.04

3
internal/docker/sailfish/Dockerfile
View file

@ -5,7 +5,7 @@ ENV HOME /home/$USER
ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
RUN GO=go1.12.4.linux-386.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN GO=go1.12.6.linux-386.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local
RUN /usr/local/go/bin/go get -tags=no_env github.com/therecipe/qt/cmd/...
@ -19,6 +19,7 @@ ENV SF_SDK_TOOLING_DIR /srv/mer/toolings/SailfishOS-2.2.1.18
ENV PATH /usr/local/go/bin:$PATH
ENV QT_DOCKER true
ENV QT_SAILFISH true
ENV QT_SAILFISH_VERSION 2.2.1.18
COPY --from=base /usr/local/go /usr/local/go
COPY --from=base $GOPATH/bin $GOPATH/bin

2
internal/docker/wine/Dockerfile.56
View file

@ -1,6 +1,6 @@
FROM therecipe/qt:wine_base as base
RUN QT=qt-opensource-windows-x86-mingw492-5.6.3.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.6/5.6.3/$QT \
RUN QT=qt-opensource-windows-x86-mingw492-5.6.3.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.6/5.6.3/$QT \
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=563 && rm -f $QT
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)

2
internal/docker/wine/Dockerfile.56_xp
View file

@ -1,6 +1,6 @@
FROM therecipe/qt:wine_base_xp as base
RUN QT=qt-opensource-windows-x86-mingw492-5.6.3.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.6/5.6.3/$QT \
RUN QT=qt-opensource-windows-x86-mingw492-5.6.3.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.6/5.6.3/$QT \
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\therecipe\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=563 && rm -f $QT
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)

2
internal/docker/wine/Dockerfile.base
View file

@ -7,7 +7,7 @@ ENV GOPATH $HOME/.wine/drive_c/gopath
ENV WINEDEBUG -all
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git && apt-get -qq clean
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local && rm -f $GO
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local && rm -f $GO
RUN GOOS=windows /usr/local/go/bin/go get -d -tags=no_env github.com/therecipe/qt/cmd/...
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install software-properties-common apt-transport-https && apt-get -qq clean

2
internal/docker/wine/Dockerfile.base_xp
View file

@ -7,7 +7,7 @@ ENV GOPATH $HOME/.wine/drive_c/gopath
ENV WINEDEBUG -all
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git && apt-get -qq clean
RUN GO=go1.12.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local && rm -f $GO
RUN GO=go1.12.6.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://dl.google.com/go/$GO && tar -xzf $GO -C /usr/local && rm -f $GO
RUN GOOS=windows /usr/local/go/bin/go get -d -tags=no_env github.com/therecipe/qt/cmd/...
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install software-properties-common apt-transport-https && apt-get -qq clean

5
internal/utils/darwin.go
View file

@ -147,5 +147,10 @@ func qT_DARWIN_DIR() string {
if QT_NIX() {
return QT_INSTALL_PREFIX("darwin")
}
if p := filepath.Join(QT_DIR(), fmt.Sprintf("%v/clang_64", QT_VERSION())); ExistsDir(p) {
return p
}
return filepath.Join(QT_DIR(), fmt.Sprintf("%v/clang_64", QT_VERSION_MAJOR()))
}

2
internal/utils/sailfish.go
View file

@ -46,5 +46,5 @@ func QT_SAILFISH_VERSION() string {
if ver, ok := os.LookupEnv("QT_SAILFISH_VERSION"); ok {
return ver
}
return "2.2.1.18"
return "3.0.3.9"
}

3
internal/vagrant/pre.bat
View file

@ -32,7 +32,7 @@ set PATH=%PATH%;C:\Progra~1\Git\bin
::install Go + pull repo
set GO=go1.11.2.windows-amd64.msi
set GO=go1.12.6.windows-amd64.msi
curl -sL --retry 10 --retry-delay 10 -o %TMP%\%GO% https://storage.googleapis.com/golang/%GO%
%TMP%\%GO% /passive /norestart
del %TMP%\%GO% /Q
@ -137,6 +137,7 @@ if "%ANDROID%" == "true" (
7z x %TMP%\!SDK! -oC:\android-sdk-windows\
del %TMP%\!SDK! /Q
::TODO update license hashes for sdkmanager
mkdir C:\android-sdk-windows\licenses
echo fc946e8f231f3e3159bf0b7c655c924cb2e38330>> C:\android-sdk-windows\licenses\android-googletv-license
echo d56f5187479451eabf01fb78af6dfcb131a6481e>> C:\android-sdk-windows\licenses\android-sdk-license

4
internal/vagrant/pre.sh
View file

@ -3,10 +3,10 @@ set -ev
if [[ "$OS" == "darwin" ]]; then
export PROF=.bash_profile
export GO=go1.11.2.darwin-amd64.tar.gz
export GO=go1.12.6.darwin-amd64.tar.gz
else if [[ "$OS" == "linux" ]]; then
export PROF=.profile
export GO=go1.11.2.linux-amd64.tar.gz
export GO=go1.12.6.linux-amd64.tar.gz
sudo apt-get -qq update && sudo apt-get -y -qq install curl git software-properties-common libgl1-mesa-dev fontconfig unzip && sudo apt-get -qq clean