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

Merge pull request #4 from bluszcz/develop

Browse source 
Change source
This commit is contained in:
Rafał Zawadzki 2023-02-02 10:39:59 +01:00 committed by GitHub
commit fc41b68e91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 122 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -5,9 +5,9 @@ Introduction
[Go](https://en.wikipedia.org/wiki/Go_(programming_language)), also known as Golang, is a programming language designed at Google.
[therecipe/qt](https://github.com/bluszcz/cutego) allows you to write Qt applications entirely in Go or JavaScript.
[bluszcz/cutego](https://github.com/bluszcz/cutego) allows you to write Qt applications entirely in Go or JavaScript.
Beside the language bindings provided, `therecipe/qt` also greatly simplifies the deployment of Qt applications to various software and hardware platforms.
Beside the language bindings provided, `bluszcz/cutego` also greatly simplifies the deployment of Qt applications to various software and hardware platforms.
At the time of writing, almost all Qt functions and classes are accessible, and you should be able to find everything you need to build fully featured Qt applications.

2
internal/binding/parser/class_add.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/therecipe/qt/internal/utils"
"github.com/bluszcz/cutego/internal/utils"
)
func (c *Class) add() {

4
internal/binding/templater/template_go.go
View file

@ -1502,10 +1502,10 @@ import "C"
fmt.Fprintln(bb, "\"github.com/bluszcz/cutego\"")
case "internal":
fmt.Fprintln(bb, "\"github.com/therecipe/qt/internal\"")
fmt.Fprintln(bb, "\"github.com/bluszcz/cutego/internal\"")
case "gow":
fmt.Fprintln(bb, "\"github.com/therecipe/qt/interop/gow\"")
fmt.Fprintln(bb, "\"github.com/bluszcz/cutego/interop/gow\"")
case "js":
if parser.UseWasm() {

2
internal/cmd/cmd.go
View file

@ -271,7 +271,7 @@ func Vagrant(arg []string, target, path string, writeCacheToHost bool, system st
}
func virtual(arg []string, target, path string, writeCacheToHost bool, docker bool, system string) {
dUser := "therecipe/qt"
dUser := "bluszcz/cutego"
if strings.Contains(target, ":") {
dUser = strings.Split(target, ":")[0]
target = strings.Split(target, ":")[1]

14
internal/docker/android/Dockerfile
View file

@ -39,13 +39,13 @@ ENV QT_VERSION 5.13.0
ENV QT_DIR /opt/Qt5.13.0
ENV QT_DOCKER true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_armv7 /opt/Qt5.13.0/5.13.0/android_armv7
COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_x86 /opt/Qt5.13.0/5.13.0/android_x86
COPY --from=therecipe/qt:linux /opt/Qt5.13.0/5.13.0/android_arm64_v8a /opt/Qt5.13.0/5.13.0/android_arm64_v8a
COPY --from=therecipe/qt:linux /opt/Qt5.13.0/Docs /opt/Qt5.13.0/Docs
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/5.13.0/android_armv7 /opt/Qt5.13.0/5.13.0/android_armv7
COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/5.13.0/android_x86 /opt/Qt5.13.0/5.13.0/android_x86
COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/5.13.0/android_arm64_v8a /opt/Qt5.13.0/5.13.0/android_arm64_v8a
COPY --from=bluszcz/cutego:linux /opt/Qt5.13.0/Docs /opt/Qt5.13.0/Docs
COPY --from=base $HOME/android-sdk-linux $HOME/android-sdk-linux
COPY --from=base $HOME/android-ndk-r18b $HOME/android-ndk-r18b
COPY --from=base $HOME/openssl-1.1.1a-arm $HOME/openssl-1.1.1a-arm

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

@ -14,7 +14,7 @@ RUN cd /osxcross && OSX_VERSION_MIN=10.12 UNATTENDED=1 ./build.sh
RUN cd /osxcross && ./target/bin/o64-clang++-libc++ -o osxcross ./oclang/test_libcxx.cpp
FROM therecipe/qt:darwin_static_base
FROM bluszcz/cutego:darwin_static_base
LABEL maintainer therecipe
ENV USER user

2
internal/docker/darwin/build.sh
View file

@ -4,4 +4,4 @@ if [ ! -f MacOSX*.sdk.tar.xz ]; then
GP=gen_sdk_package.sh && curl -sL --retry 10 --retry-delay 60 -O https://raw.githubusercontent.com/tpoechtrager/osxcross/master/tools/$GP && chmod +x $GP && ./$GP && rm $GP
fi
docker build -f Dockerfile -t therecipe/qt:darwin .
docker build -f Dockerfile -t bluszcz/cutego:darwin .

2
internal/docker/darwin/build_static.sh
View file

@ -4,4 +4,4 @@ if [ ! -f MacOSX*.sdk.tar.xz ]; then
GP=gen_sdk_package.sh && curl -sL --retry 10 --retry-delay 60 -O https://raw.githubusercontent.com/tpoechtrager/osxcross/master/tools/$GP && chmod +x $GP && ./$GP && rm $GP
fi
docker build -f Dockerfile.static -t therecipe/qt:darwin_static .
docker build -f Dockerfile.static -t bluszcz/cutego:darwin_static .

2
internal/docker/darwin/build_static_base.sh
View file

@ -53,4 +53,4 @@ zip -r ${PREF}.zip $PREF && rm -rf $PREF
du -sh ${PREF}.zip
docker build -f Dockerfile.static_base -t therecipe/qt:darwin_static_base .
docker build -f Dockerfile.static_base -t bluszcz/cutego:darwin_static_base .

2
internal/docker/darwin/save.sh
View file

@ -1,3 +1,3 @@
#!/bin/bash
docker save therecipe/qt:darwin | gzip -n > darwin.tar.gz
docker save bluszcz/cutego:darwin | gzip -n > darwin.tar.gz

2
internal/docker/docker_darwin_static_base_template.yml
View file

@ -17,4 +17,4 @@ jobs:
-
script: 'cd internal/docker/darwin && ./build_static_base.sh'
-
script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout'
script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push bluszcz/cutego:${{ parameters.tag }} && docker logout'

4
internal/docker/docker_job_template.yml
View file

@ -9,6 +9,6 @@ jobs:
-
script: 'sudo df -h; sudo rm -rf /usr/share/dotnet; sudo df -h;'
-
script: 'docker build --force-rm -f internal/docker/${{ parameters.file }} -t therecipe/qt:${{ parameters.tag }} .'
script: 'docker build --force-rm -f internal/docker/${{ parameters.file }} -t bluszcz/cutego:${{ parameters.tag }} .'
-
script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout'
script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push bluszcz/cutego:${{ parameters.tag }} && docker logout'

6
internal/docker/js/Dockerfile.js
View file

@ -23,9 +23,9 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin
COPY --from=base /usr/local/go /usr/local/go
COPY --from=base $GOPATH/bin $GOPATH/bin
COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk
COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten
COPY --from=therecipe/qt:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
COPY --from=bluszcz/cutego:js_base $HOME/emsdk $HOME/emsdk
COPY --from=bluszcz/cutego:js_base $HOME/.emscripten $HOME/.emscripten
COPY --from=bluszcz/cutego:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean
RUN ln -s /usr/bin/python2.7 /usr/bin/python

6
internal/docker/js/Dockerfile.js_thread
View file

@ -23,9 +23,9 @@ ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin
COPY --from=base /usr/local/go /usr/local/go
COPY --from=base $GOPATH/bin $GOPATH/bin
COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:js_base_thread $HOME/emsdk $HOME/emsdk
COPY --from=therecipe/qt:js_base_thread $HOME/.emscripten $HOME/.emscripten
COPY --from=therecipe/qt:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
COPY --from=bluszcz/cutego:js_base_thread $HOME/emsdk $HOME/emsdk
COPY --from=bluszcz/cutego:js_base_thread $HOME/.emscripten $HOME/.emscripten
COPY --from=bluszcz/cutego:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean
RUN ln -s /usr/bin/python2.7 /usr/bin/python

12
internal/docker/js/Dockerfile.wasm
View file

@ -9,12 +9,12 @@ ENV QT_API 5.13.0
ENV QT_DOCKER true
ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk
COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten
COPY --from=therecipe/qt:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:js_base $HOME/emsdk $HOME/emsdk
COPY --from=bluszcz/cutego:js_base $HOME/.emscripten $HOME/.emscripten
COPY --from=bluszcz/cutego:js_base /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean
RUN ln -s /usr/bin/python2.7 /usr/bin/python

12
internal/docker/js/Dockerfile.wasm_thread
View file

@ -9,12 +9,12 @@ ENV QT_API 5.13.0
ENV QT_DOCKER true
ENV QT_QMAKE_DIR /usr/local/Qt-5.13.0/bin
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:js_base_thread $HOME/emsdk $HOME/emsdk
COPY --from=therecipe/qt:js_base_thread $HOME/.emscripten $HOME/.emscripten
COPY --from=therecipe/qt:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:js_base_thread $HOME/emsdk $HOME/emsdk
COPY --from=bluszcz/cutego:js_base_thread $HOME/.emscripten $HOME/.emscripten
COPY --from=bluszcz/cutego:js_base_thread /usr/local/Qt-5.13.0 /usr/local/Qt-5.13.0
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean
RUN ln -s /usr/bin/python2.7 /usr/bin/python

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

@ -9,7 +9,7 @@ RUN GO=go1.13.4.linux-amd64.tar.gz && curl -sL --retry 10 --retry-delay 60 -O ht
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM therecipe/qt:linux_static_base as fcitx
FROM bluszcz/cutego:linux_static_base as fcitx
ENV CMAKE_PREFIX_PATH /opt/Qt/5.13.0/gcc_64/lib/cmake/Qt5/
@ -41,7 +41,7 @@ ENV QT_STATIC true
COPY --from=base /usr/local/go /usr/local/go
COPY --from=base $GOPATH/bin $GOPATH/bin
COPY --from=base $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:linux_static_base /opt/Qt/5.13.0 /opt/Qt/5.13.0
COPY --from=bluszcz/cutego:linux_static_base /opt/Qt/5.13.0 /opt/Qt/5.13.0
COPY --from=fcitx /fcitx-qt5/platforminputcontext/libfcitxplatforminputcontextplugin.a /opt/Qt/5.13.0/gcc_64/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev \

6
internal/docker/rpi/Dockerfile.base
View file

@ -14,9 +14,9 @@ ENV RPI_TOOLS_DIR /opt/qtrpi/raspi/tools
ENV RPI_COMPILER gcc-linaro-arm-linux-gnueabihf-raspbian-x64
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git make && apt-get -qq clean

2
internal/docker/rpi/Dockerfile.rpi1
View file

@ -1,4 +1,4 @@
FROM therecipe/qt:rpi_base
FROM bluszcz/cutego:rpi_base
LABEL maintainer therecipe

2
internal/docker/rpi/Dockerfile.rpi2
View file

@ -1,4 +1,4 @@
FROM therecipe/qt:rpi_base
FROM bluszcz/cutego:rpi_base
LABEL maintainer therecipe

2
internal/docker/rpi/Dockerfile.rpi3
View file

@ -1,4 +1,4 @@
FROM therecipe/qt:rpi_base
FROM bluszcz/cutego:rpi_base
LABEL maintainer therecipe

6
internal/docker/ubports/Dockerfile.64_vivid
View file

@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH amd64
ENV QT_UBPORTS_VERSION vivid
RUN rm -rf /usr/local/go || true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install qt*5-doc-html && apt-get -qq clean

6
internal/docker/ubports/Dockerfile.64_xenial
View file

@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH amd64
ENV QT_UBPORTS_VERSION xenial
RUN rm -rf /usr/local/go || true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
RUN $GOPATH/bin/qtsetup prep
RUN $GOPATH/bin/qtsetup check ubports

6
internal/docker/ubports/Dockerfile.arm_vivid
View file

@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH arm
ENV QT_UBPORTS_VERSION vivid
RUN rm -rf /usr/local/go || true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install qt*5-doc-html && apt-get -qq clean

6
internal/docker/ubports/Dockerfile.arm_xenial
View file

@ -12,9 +12,9 @@ ENV QT_UBPORTS_ARCH arm
ENV QT_UBPORTS_VERSION xenial
RUN rm -rf /usr/local/go || true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
RUN ln -s /usr/lib/arm-linux-gnueabihf/qt5/qt.conf /usr/lib/qt5/bin/

8
internal/docker/windows_32_shared/Dockerfile
View file

@ -10,10 +10,10 @@ ENV QT_MXE true
ENV QT_MXE_ARCH 386
ENV QT_MXE_STATIC false
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:windows_32_shared_base /usr/lib/mxe /usr/lib/mxe
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:windows_32_shared_base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep
RUN $GOPATH/bin/qtsetup check windows

8
internal/docker/windows_32_static/Dockerfile
View file

@ -10,10 +10,10 @@ ENV QT_MXE true
ENV QT_MXE_ARCH 386
ENV QT_MXE_STATIC true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:windows_32_static_base /usr/lib/mxe /usr/lib/mxe
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:windows_32_static_base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep
RUN $GOPATH/bin/qtsetup check windows

8
internal/docker/windows_64_shared/Dockerfile
View file

@ -10,10 +10,10 @@ ENV QT_MXE true
ENV QT_MXE_ARCH amd64
ENV QT_MXE_STATIC false
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:windows_64_shared_base /usr/lib/mxe /usr/lib/mxe
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:windows_64_shared_base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep
RUN $GOPATH/bin/qtsetup check windows

8
internal/docker/windows_64_static/Dockerfile
View file

@ -10,10 +10,10 @@ ENV QT_MXE true
ENV QT_MXE_ARCH amd64
ENV QT_MXE_STATIC true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=therecipe/qt:windows_64_static_base /usr/lib/mxe /usr/lib/mxe
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:windows_64_static_base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep
RUN $GOPATH/bin/qtsetup check windows

6
internal/docker/windows_legacy/Dockerfile.32_shared
View file

@ -16,9 +16,9 @@ ENV QT_MXE true
ENV QT_MXE_ARCH 386
ENV QT_MXE_STATIC false
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep

6
internal/docker/windows_legacy/Dockerfile.32_static
View file

@ -16,9 +16,9 @@ ENV QT_MXE true
ENV QT_MXE_ARCH 386
ENV QT_MXE_STATIC true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep

6
internal/docker/windows_legacy/Dockerfile.64_shared
View file

@ -16,9 +16,9 @@ ENV QT_MXE true
ENV QT_MXE_ARCH amd64
ENV QT_MXE_STATIC false
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep

6
internal/docker/windows_legacy/Dockerfile.64_static
View file

@ -16,9 +16,9 @@ ENV QT_MXE true
ENV QT_MXE_ARCH amd64
ENV QT_MXE_STATIC true
COPY --from=therecipe/qt:linux /usr/local/go /usr/local/go
COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=bluszcz/cutego:linux /usr/local/go /usr/local/go
COPY --from=bluszcz/cutego:linux $GOPATH/bin $GOPATH/bin
COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/src/github.com/StarAurryon/qt
COPY --from=base /usr/lib/mxe /usr/lib/mxe
RUN $GOPATH/bin/qtsetup prep

2
internal/docker/wine/Dockerfile
View file

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
RUN QT=qt-opensource-windows-x86-5.13.0.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.13/5.13.0/$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 && rm -f $QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
RUN QT=qt-opensource-windows-x86-5.13.0.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.13/5.13.0/$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 ARCH=32 && rm -f $QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
#TODO: use pacman instead

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
#TODO: use pacman instead
@ -110,7 +110,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq-
RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install patch && apt-get -qq clean
ADD https://raw.githubusercontent.com/therecipe/qt/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
ADD https://raw.githubusercontent.com/bluszcz/cutego/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
RUN cd $HOME/.wine/drive_c/go && patch -p 1 < rspfile.patch
RUN wine go install cmd/go cmd/link

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
RUN QT=qt-opensource-windows-x86-5.12.4.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.12/5.12.4/$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=qt5.5124 && rm -f $QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base_xp as base
FROM bluszcz/cutego:wine_base_xp as base
ENV QT qt-opensource-windows-x86-mingw492-5.6.3.exe
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/new_archive/qt/5.6/5.6.3/$QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
RUN QT=qt-opensource-windows-x86-5.9.6.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.9/5.9.6/$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=596 && rm -f $QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
RUN QT=qt-opensource-windows-x86-5.13.0.exe && curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/official_releases/qt/5.13/5.13.0/$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 MSVC=true && rm -f $QT

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
#TODO: use pacman instead

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

@ -1,4 +1,4 @@
FROM therecipe/qt:wine_base as base
FROM bluszcz/cutego:wine_base as base
#TODO: use pacman instead
@ -110,7 +110,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq-
RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install patch && apt-get -qq clean
ADD https://raw.githubusercontent.com/therecipe/qt/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
ADD https://raw.githubusercontent.com/bluszcz/cutego/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
RUN cd $HOME/.wine/drive_c/go && patch -p 1 < rspfile.patch
RUN wine go install cmd/go cmd/link

8
internal/examples/3rdparty/mpv/demo/main.go vendored
View file

@ -5,11 +5,11 @@ package main
import (
"os"
"github.com/therecipe/qt/core"
"github.com/therecipe/qt/gui"
"github.com/therecipe/qt/quick"
"github.com/bluszcz/cutego/core"
"github.com/bluszcz/cutego/gui"
"github.com/bluszcz/cutego/quick"
"github.com/therecipe/qt/internal/examples/3rdparty/mpv"
"github.com/bluszcz/cutego/internal/examples/3rdparty/mpv"
)
func main() {

6
internal/examples/3rdparty/mpv/mpv.go vendored
View file

@ -3,7 +3,7 @@ package mpv
//it's also possible to directly place this file beside the files from mpv-examples/libmpv/qml
//to get this working, change init.go to just run `make mocables`
//and remove the cgo LDFLAGS line used to link against the static lib below
//more info: https://github.com/therecipe/qt/issues/1162
//more info: https://github.com/bluszcz/cutego/issues/1162
/*
#cgo pkg-config: mpv
@ -13,8 +13,8 @@ void initMpv();
*/
import "C"
import (
"github.com/therecipe/qt/core"
_ "github.com/therecipe/qt/quick"
"github.com/bluszcz/cutego/core"
_ "github.com/bluszcz/cutego/quick"
)
type stub struct{ core.QObject } //TODO: needed for linking at the moment

28
internal/vagrant/docker/Vagrantfile vendored
View file

@ -13,85 +13,85 @@ Vagrant.configure("2") do |config|
config.vm.define "linux" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:linux"
d.pull_images "bluszcz/cutego:linux"
end
end
config.vm.define "android" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:android"
d.pull_images "bluszcz/cutego:android"
end
end
config.vm.define "windows_32_shared" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:windows_32_shared"
d.pull_images "bluszcz/cutego:windows_32_shared"
end
end
config.vm.define "windows_32_static" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:windows_32_static"
d.pull_images "bluszcz/cutego:windows_32_static"
end
end
config.vm.define "windows_64_shared" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:windows_64_shared"
d.pull_images "bluszcz/cutego:windows_64_shared"
end
end
config.vm.define "windows_64_static" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:windows_64_static"
d.pull_images "bluszcz/cutego:windows_64_static"
end
end
config.vm.define "rpi1" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:rpi1"
d.pull_images "bluszcz/cutego:rpi1"
end
end
config.vm.define "rpi2" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:rpi2"
d.pull_images "bluszcz/cutego:rpi2"
end
end
config.vm.define "rpi3" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:rpi3"
d.pull_images "bluszcz/cutego:rpi3"
end
end
config.vm.define "sailfish" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:sailfish"
d.pull_images "bluszcz/cutego:sailfish"
end
end
config.vm.define "ubports_arm_vivid" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:ubports_arm_vivid"
d.pull_images "bluszcz/cutego:ubports_arm_vivid"
end
end
config.vm.define "ubports_64_vivid" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:ubports_64_vivid"
d.pull_images "bluszcz/cutego:ubports_64_vivid"
end
end
config.vm.define "ubports_arm_xenial" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:ubports_arm_xenial"
d.pull_images "bluszcz/cutego:ubports_arm_xenial"
end
end
config.vm.define "ubports_64_xenial" do |m|
config.vm.provision "docker" do |d|
d.pull_images "therecipe/qt:ubports_64_xenial"
d.pull_images "bluszcz/cutego:ubports_64_xenial"
end
end

2
interop/gow/gow.go
View file

@ -1,6 +1,6 @@
package gow
import "github.com/therecipe/qt/internal"
import "github.com/bluszcz/cutego/internal"
var (
InitProcess = internal.InitProcess