More 'cleanup'

This commit is contained in:
bluszcz 2023-02-02 20:09:08 +01:00
parent 3ea68940c3
commit eec4e575fd
88 changed files with 134 additions and 130 deletions

View file

@ -18,7 +18,7 @@ Impressions
[Gallery](https://github.com/bluszcz/cutego/wiki/Gallery) of example applications.
[JavaScript Demo](https://therecipe.github.io/entry) | *[source](https://github.com/therecipe/entry)*
[JavaScript Demo](https://therecipe.github.io/entry) | *[source](https://therecipe.com/bluszcz/entry)*
Installation
------------

View file

@ -1,5 +1,6 @@
//go:build !no_env && darwin && amd64
// +build !no_env,darwin,amd64
package env
import _ "github.com/therecipe/env_darwin_amd64_513"
import _ "github.com/bluszcz/env_darwin_amd64_513"

View file

@ -1,5 +1,6 @@
//go:build !no_env && linux && amd64
// +build !no_env,linux,amd64
package env
import _ "github.com/therecipe/env_linux_amd64_513"
import _ "github.com/bluszcz/env_linux_amd64_513"

View file

@ -1,5 +1,6 @@
//go:build !no_env && windows && amd64
// +build !no_env,windows,amd64
package env
import _ "github.com/therecipe/env_windows_amd64_513"
import _ "github.com/bluszcz/env_windows_amd64_513"

View file

@ -183,7 +183,7 @@ func InitEnv(target string, docker bool, path string) {
}
if !utils.ExistsDir(utils.QT_DIR()) {
qt_dir := strings.TrimSpace(utils.RunCmd(utils.GoList("{{.Dir}}", "github.com/therecipe/env_"+runtime.GOOS+"_amd64_"+strconv.Itoa(utils.QT_VERSION_NUM())[:3], "-find"), "get env dir"))
qt_dir := strings.TrimSpace(utils.RunCmd(utils.GoList("{{.Dir}}", "github.com/bluszcz/env_"+runtime.GOOS+"_amd64_"+strconv.Itoa(utils.QT_VERSION_NUM())[:3], "-find"), "get env dir"))
switch runtime.GOOS {
case "linux", "darwin", "windows":
@ -209,7 +209,7 @@ func InitEnv(target string, docker bool, path string) {
if err == nil {
link = filepath.Join("C:\\", "Users", "Public", "env_windows_amd64_Tools")
utils.RemoveAll(link)
_, err = utils.RunCmdOptionalError(exec.Command("cmd", "/C", "mklink", "/J", link, strings.TrimSpace(utils.RunCmd(utils.GoList("{{.Dir}}", "github.com/therecipe/env_"+runtime.GOOS+"_amd64_"+strconv.Itoa(utils.QT_VERSION_NUM())[:3]+"/Tools", "-find"), "get env dir"))), "create symlink for env")
_, err = utils.RunCmdOptionalError(exec.Command("cmd", "/C", "mklink", "/J", link, strings.TrimSpace(utils.RunCmd(utils.GoList("{{.Dir}}", "github.com/bluszcz/env_"+runtime.GOOS+"_amd64_"+strconv.Itoa(utils.QT_VERSION_NUM())[:3]+"/Tools", "-find"), "get env dir"))), "create symlink for env")
}
}
if err != nil && target == runtime.GOOS {

View file

@ -17,15 +17,15 @@ func Update() {
utils.RunCmd(exec.Command("go", "clean", "-i", "github.com/bluszcz/cutego/internal/..."), "run \"go clean internal\"")
fetch := exec.Command("git", "fetch", "-f", "--all")
fetch.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt")
fetch.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "bluszcz", "qt")
utils.RunCmd(fetch, "run \"git fetch\"")
checkoutCmd := exec.Command("git", "checkout", "-f", "--", utils.GoQtPkgPath("cmd"))
checkoutCmd.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt")
checkoutCmd.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "bluszcz", "qt")
utils.RunCmd(checkoutCmd, "run \"git checkout cmd\"")
checkoutInternal := exec.Command("git", "checkout", "-f", "--", utils.GoQtPkgPath("internal"))
checkoutInternal.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "therecipe", "qt")
checkoutInternal.Dir = filepath.Join(utils.MustGoPath(), "src", "github.com", "bluszcz", "qt")
utils.RunCmd(checkoutInternal, "run \"git checkout internal\"")
hash := "please install git"

View file

@ -28,7 +28,7 @@ RUN find $HOME/openssl-1.1.1a-* -type f -exec llvm-strip --strip-all {} \;
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -15,7 +15,7 @@ RUN cd /osxcross && ./target/bin/o64-clang++-libc++ -o osxcross ./oclang/test_li
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER
@ -24,7 +24,7 @@ ENV PATH /usr/local/go/bin:$PATH
ENV QT_API 5.13.0
ENV QT_DOCKER true
ENV QT_VERSION $QT_API
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin
ENV QT_QMAKE_DIR $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/bin
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common apt-transport-https && apt-get -qq clean
@ -37,24 +37,24 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-install_name_tool /usr/bin/
RUN GO=go1.13.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 get github.com/StarAurryon/qt/cmd/...
RUN go get github.com/therecipe/env_darwin_amd64_513 && DST=$GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/bin $DST
RUN go get github.com/bluszcz/env_darwin_amd64_513 && DST=$GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/bin $DST
RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_pre.prf
RUN sed -i -e 's/$$QMAKE_MAC_SDK_PATH/$$(QMAKE_MAC_SDK_PATH)/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_post.prf
RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_pre.prf
RUN sed -i -e 's/$$QMAKE_MAC_SDK_PATH/$$(QMAKE_MAC_SDK_PATH)/g' $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_post.prf
ENV QMAKE_MAC_SDK_PATH /osxcross/target/SDK/MacOSX10.15.sdk
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install clang-9 && apt-get -qq clean && ln -s /usr/bin/clang-9 /usr/bin/clang && ln -s /usr/bin/clang++-9 /usr/bin/clang++
ENV LD_LIBRARY_PATH $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/lib
ENV QT_PLUGIN_PATH $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/plugins
ENV LD_LIBRARY_PATH $GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/lib
ENV QT_PLUGIN_PATH $GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/plugins
RUN git clone -q --depth 1 -b 5.13 https://github.com/qt/qttools.git && \
cd /qttools/src/macdeployqt/macdeployqt && \
sed -i -e 's/LIBS/#LIBS/g' macdeployqt.pro && \
sed -i -e 's,QString binaryPath;,QString binaryPath = QString(appBundlePath); binaryPath.chop(4); auto bS = binaryPath.split("/"); binaryPath.append(".app/Contents/MacOS/").append(bS.at(bS.size()-1)); return binaryPath;,g' ../shared/shared.cpp && \
$GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/bin/qmake macdeployqt.pro && make -j $(grep -c ^processor /proc/cpuinfo) && \
mv /qttools/bin/macdeployqt $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin/macdeployqt && rm -rf /qttools
$GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/bin/qmake macdeployqt.pro && make -j $(grep -c ^processor /proc/cpuinfo) && \
mv /qttools/bin/macdeployqt $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/bin/macdeployqt && rm -rf /qttools
ENV CC /osxcross/target/bin/x86_64-apple-darwin19-clang
ENV CXX /osxcross/target/bin/x86_64-apple-darwin19-clang++

View file

@ -15,7 +15,7 @@ RUN cd /osxcross && ./target/bin/o64-clang++-libc++ -o osxcross ./oclang/test_li
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER
@ -24,7 +24,7 @@ ENV PATH /usr/local/go/bin:$PATH
ENV QT_API 5.12.0
ENV QT_DOCKER true
ENV QT_VERSION $QT_API
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/bin
ENV QT_QMAKE_DIR $GOPATH/src/github.com/bluszcz/env_darwin_amd64_512/5.12.0/clang_64/bin
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common apt-transport-https && apt-get -qq clean
@ -36,25 +36,25 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-otool /usr/bin/otool
RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-install_name_tool /usr/bin/install_name_tool
RUN GO=go1.13.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 get -tags=no_env github.com/StarAurryon/qt/cmd/... && go get github.com/therecipe/env_linux_amd64_512
RUN go get github.com/therecipe/env_darwin_amd64_512 && 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
RUN go get -tags=no_env github.com/StarAurryon/qt/cmd/... && go get github.com/bluszcz/env_linux_amd64_512
RUN go get github.com/bluszcz/env_darwin_amd64_512 && DST=$GOPATH/src/github.com/bluszcz/env_darwin_amd64_512/5.12.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/bluszcz/env_linux_amd64_512/5.12.0/gcc_64/bin $DST
RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/mkspecs/features/mac/default_pre.prf
RUN sed -i -e 's/$$QMAKE_MAC_SDK_PATH/$$(QMAKE_MAC_SDK_PATH)/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/mkspecs/features/mac/default_post.prf
RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/bluszcz/env_darwin_amd64_512/5.12.0/clang_64/mkspecs/features/mac/default_pre.prf
RUN sed -i -e 's/$$QMAKE_MAC_SDK_PATH/$$(QMAKE_MAC_SDK_PATH)/g' $GOPATH/src/github.com/bluszcz/env_darwin_amd64_512/5.12.0/clang_64/mkspecs/features/mac/default_post.prf
ENV QMAKE_MAC_SDK_PATH /osxcross/target/SDK/MacOSX10.15.sdk
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install clang-9 && apt-get -qq clean && ln -s /usr/bin/clang-9 /usr/bin/clang && ln -s /usr/bin/clang++-9 /usr/bin/clang++
ENV LD_LIBRARY_PATH $GOPATH/src/github.com/therecipe/env_linux_amd64_512/5.12.0/gcc_64/lib
ENV QT_PLUGIN_PATH $GOPATH/src/github.com/therecipe/env_linux_amd64_512/5.12.0/gcc_64/plugins
ENV LD_LIBRARY_PATH $GOPATH/src/github.com/bluszcz/env_linux_amd64_512/5.12.0/gcc_64/lib
ENV QT_PLUGIN_PATH $GOPATH/src/github.com/bluszcz/env_linux_amd64_512/5.12.0/gcc_64/plugins
RUN git clone -q --depth 1 -b 5.13 https://github.com/qt/qttools.git && \
cd /qttools/src/macdeployqt/macdeployqt && \
sed -i -e 's/LIBS/#LIBS/g' macdeployqt.pro && \
sed -i -e 's,QString binaryPath;,QString binaryPath = QString(appBundlePath); binaryPath.chop(4); auto bS = binaryPath.split("/"); binaryPath.append(".app/Contents/MacOS/").append(bS.at(bS.size()-1)); return binaryPath;,g' ../shared/shared.cpp && \
$GOPATH/src/github.com/therecipe/env_linux_amd64_512/5.12.0/gcc_64/bin/qmake macdeployqt.pro && make -j $(grep -c ^processor /proc/cpuinfo) && \
mv /qttools/bin/macdeployqt $GOPATH/src/github.com/therecipe/env_darwin_amd64_512/5.12.0/clang_64/bin/macdeployqt && rm -rf /qttools
$GOPATH/src/github.com/bluszcz/env_linux_amd64_512/5.12.0/gcc_64/bin/qmake macdeployqt.pro && make -j $(grep -c ^processor /proc/cpuinfo) && \
mv /qttools/bin/macdeployqt $GOPATH/src/github.com/bluszcz/env_darwin_amd64_512/5.12.0/clang_64/bin/macdeployqt && rm -rf /qttools
ENV CC /osxcross/target/bin/x86_64-apple-darwin19-clang
ENV CXX /osxcross/target/bin/x86_64-apple-darwin19-clang++

View file

@ -15,7 +15,7 @@ RUN cd /osxcross && ./target/bin/o64-clang++-libc++ -o osxcross ./oclang/test_li
FROM bluszcz/cutego:darwin_static_base
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER
@ -25,7 +25,7 @@ ENV QT_API 5.13.0
ENV QT_DOCKER true
ENV QT_STATIC true
ENV QT_VERSION $QT_API
ENV QT_QMAKE_DIR $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin
ENV QT_QMAKE_DIR $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/bin
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install curl git build-essential libglib2.0-dev software-properties-common apt-transport-https && apt-get -qq clean
@ -38,18 +38,18 @@ RUN ln -s /osxcross/target/bin/x86_64-apple-darwin19-install_name_tool /usr/bin/
RUN GO=go1.13.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 get github.com/StarAurryon/qt/cmd/...
RUN DST=$GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/bin $DST
RUN DST=$GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/bin && rm -r $DST && cp -r $GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/bin $DST
RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_pre.prf
RUN sed -i -e 's/$$QMAKE_MAC_SDK_PATH/$$(QMAKE_MAC_SDK_PATH)/g' $GOPATH/src/github.com/therecipe/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_post.prf
RUN sed -i -e 's/error/warning/g' $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_pre.prf
RUN sed -i -e 's/$$QMAKE_MAC_SDK_PATH/$$(QMAKE_MAC_SDK_PATH)/g' $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513/5.13.0/clang_64/mkspecs/features/mac/default_post.prf
ENV QMAKE_MAC_SDK_PATH /osxcross/target/SDK/MacOSX10.15.sdk
RUN curl -sL --retry 10 --retry-delay 60 https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install clang-9 && apt-get -qq clean && ln -s /usr/bin/clang-9 /usr/bin/clang && ln -s /usr/bin/clang++-9 /usr/bin/clang++
ENV LD_LIBRARY_PATH $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/lib
ENV QT_PLUGIN_PATH $GOPATH/src/github.com/therecipe/env_linux_amd64_513/5.13.0/gcc_64/plugins
ENV LD_LIBRARY_PATH $GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/lib
ENV QT_PLUGIN_PATH $GOPATH/src/github.com/bluszcz/env_linux_amd64_513/5.13.0/gcc_64/plugins
ENV CC /osxcross/target/bin/x86_64-apple-darwin19-clang
ENV CXX /osxcross/target/bin/x86_64-apple-darwin19-clang++

View file

@ -6,15 +6,15 @@ ENV GOPATH $HOME/work
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install unzip
COPY env_darwin_amd64_513.zip $GOPATH/src/github.com/therecipe/env_darwin_amd64_513.zip
RUN cd $GOPATH/src/github.com/therecipe && unzip env_darwin_amd64_513.zip
COPY env_darwin_amd64_513.zip $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513.zip
RUN cd $GOPATH/src/github.com/bluszcz && unzip env_darwin_amd64_513.zip
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER
ENV GOPATH $HOME/work
COPY --from=base $GOPATH/src/github.com/therecipe/env_darwin_amd64_513 $GOPATH/src/github.com/therecipe/env_darwin_amd64_513
COPY --from=base $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513 $GOPATH/src/github.com/bluszcz/env_darwin_amd64_513

View file

@ -20,4 +20,4 @@ jobs:
GO111MODULE: on
steps:
-
script: 'xcode-select --install; mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/therecipe/examples.git && cd ./examples && go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_darwin_amd64_513.git vendor/github.com/therecipe/env_darwin_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets'
script: 'xcode-select --install; mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/bluszcz/examples.git && cd ./examples && go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/bluszcz/env_darwin_amd64_513.git vendor/github.com/bluszcz/env_darwin_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets'

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 bluszcz/cutego:${{ parameters.tag }} && docker logout'
script: 'docker login -u bluszcz -p $(DOCKER_PASSWORD) && docker push bluszcz/cutego:${{ parameters.tag }} && docker logout'

View file

@ -11,4 +11,4 @@ jobs:
-
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 bluszcz/cutego:${{ parameters.tag }} && docker logout'
script: 'docker login -u bluszcz -p $(DOCKER_PASSWORD) && docker push bluszcz/cutego:${{ parameters.tag }} && docker logout'

View file

@ -26,4 +26,4 @@ jobs:
-
script: sudo apt-get -qq update && sudo apt-get --no-install-recommends -qq -y install build-essential libglib2.0-dev libglu1-mesa-dev libpulse-dev fcitx-frontend-qt5
-
script: 'mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/therecipe/examples.git && cd ./examples && go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_linux_amd64_513.git vendor/github.com/therecipe/env_linux_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets'
script: 'mkdir -p $(go env GOPATH)/src && cd $(go env GOPATH)/src && git clone https://github.com/bluszcz/examples.git && cd ./examples && go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/bluszcz/env_linux_amd64_513.git vendor/github.com/bluszcz/env_linux_amd64_513 && $(go env GOPATH)/bin/qtsetup && $(go env GOPATH)/bin/qtdeploy test desktop ./basic/widgets'

View file

@ -27,4 +27,4 @@ jobs:
-
script: 'go get -v -tags=no_env github.com/StarAurryon/qt/cmd/... && $(go env GOPATH)/bin/qtsetup prep'
-
script: 'go get -v -d github.com/therecipe/${{ parameters.tag }} && cd $(go env GOPATH)/src/github.com/therecipe/${{ parameters.tag }} && ./deploy.sh && GITHUB_SECRET=$(GITHUB_SECRET) ./push.sh'
script: 'go get -v -d github.com/bluszcz/${{ parameters.tag }} && cd $(go env GOPATH)/src/github.com/bluszcz/${{ parameters.tag }} && ./deploy.sh && GITHUB_SECRET=$(GITHUB_SECRET) ./push.sh'

View file

@ -20,7 +20,7 @@ jobs:
GO111MODULE: on
steps:
-
script: 'md C:\Users\VssAdministrator\go\src && git clone https://github.com/therecipe/examples.git C:\Users\VssAdministrator\go\src\examples'
script: 'md C:\Users\VssAdministrator\go\src && git clone https://github.com/bluszcz/examples.git C:\Users\VssAdministrator\go\src\examples'
-
script: 'go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/therecipe/env_windows_amd64_513.git vendor/github.com/therecipe/env_windows_amd64_513 && C:\Users\VssAdministrator\go\bin\qtsetup && C:\Users\VssAdministrator\go\bin\qtdeploy test desktop ./basic/widgets'
script: 'go install -v -tags=no_env github.com/StarAurryon/qt/cmd/... && go mod vendor && git clone https://github.com/bluszcz/env_windows_amd64_513.git vendor/github.com/bluszcz/env_windows_amd64_513 && C:\Users\VssAdministrator\go\bin\qtsetup && C:\Users\VssAdministrator\go\bin\qtdeploy test desktop ./basic/widgets'
workingDirectory: C:\Users\VssAdministrator\go\src\examples

View file

@ -18,7 +18,7 @@ RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -18,7 +18,7 @@ RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -10,7 +10,7 @@ RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -10,7 +10,7 @@ RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -19,7 +19,7 @@ RUN find /opt/Qt5.13.0/5.13.0/gcc_64 -type f ! -name "*.a" ! -name "*.la" ! -nam
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -19,7 +19,7 @@ RUN find /opt/Qt5.12.4/5.12.4/gcc_64 -type f ! -name "*.a" ! -name "*.la" ! -nam
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -20,7 +20,7 @@ RUN find /opt/Qt5.6.3/5.6.3/gcc_64 -type f ! -name "*.a" ! -name "*.la" ! -name
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -19,7 +19,7 @@ RUN find /opt/Qt5.9.6/5.9.6/gcc_64 -type f ! -name "*.a" ! -name "*.la" ! -name
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -10,7 +10,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 archlinux/base
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

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 debian:10.0
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-aarch64-debian:buster
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/raspberry-pi-debian:buster
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-armv7ahf-debian:buster
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

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 debian:9.0
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-aarch64-debian:stretch
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/raspberry-pi-debian:stretch
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-armv7ahf-debian:stretch
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

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 fedora:latest
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-aarch64-fedora:latest
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-armv7ahf-fedora:latest
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -26,7 +26,7 @@ RUN cd /fcitx-qt5/platforminputcontext && cmake . && make -j $(grep -c ^process
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -14,6 +14,6 @@ RUN cd /opt/qt5 && ./configure -prefix /opt/Qt/5.13.0/gcc_64 -confirm-license -o
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
COPY --from=base /opt/Qt/5.13.0 /opt/Qt/5.13.0

View file

@ -7,7 +7,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 opensuse/leap:latest
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV GOPATH $HOME/work
ENV PATH /usr/local/go/bin:$PATH

View file

@ -7,7 +7,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 opensuse/tumbleweed:latest
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV GOPATH $HOME/work
ENV PATH /usr/local/go/bin:$PATH

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 ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-aarch64-ubuntu:xenial
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-armv7ahf-ubuntu:xenial
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

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 ubuntu:18.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-aarch64-ubuntu:bionic
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,7 +8,7 @@ RUN [ "cross-build-start" ]
RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM balenalib/generic-armv7ahf-ubuntu:bionic
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER
@ -20,7 +20,7 @@ COPY --from=bluszcz/cutego:linux $GOPATH/src/github.com/StarAurryon/qt $GOPATH/s
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git make && apt-get -qq clean
RUN SYSROOT=qtrpi-sysroot-minimal-latest.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/therecipe/files/releases/download/v0.0.0/$SYSROOT && tar -xzf $SYSROOT -C / && rm -f $SYSROOT
RUN SYSROOT=qtrpi-sysroot-minimal-latest.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/bluszcz/files/releases/download/v0.0.0/$SYSROOT && tar -xzf $SYSROOT -C / && rm -f $SYSROOT
RUN ln -s /opt/qtrpi/raspbian/sysroot-minimal /opt/qtrpi/raspbian/sysroot
RUN git clone -q --depth 1 https://github.com/raspberrypi/tools.git /opt/qtrpi/raspi/tools

View file

@ -1,8 +1,8 @@
FROM bluszcz/cutego:rpi_base
LABEL maintainer therecipe
LABEL maintainer bluszcz
RUN QT=qtrpi-rpi1_qt-5.7.0.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/therecipe/files/releases/download/v0.0.0/$QT && tar -xzf $QT -C / && rm -f $QT
RUN QT=qtrpi-rpi1_qt-5.7.0.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/bluszcz/files/releases/download/v0.0.0/$QT && tar -xzf $QT -C / && rm -f $QT
RUN git clone -q --depth 1 -b 5.7 https://github.com/qt/qtvirtualkeyboard.git /opt/qtrpi/raspi/qtvirtualkeyboard && cd /opt/qtrpi/raspi/qtvirtualkeyboard && ../qt5/bin/qmake qtvirtualkeyboard.pro CONFIG+=lang-all && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo) && rm -rf /opt/qtrpi/raspi/qtvirtualkeyboard

View file

@ -1,8 +1,8 @@
FROM bluszcz/cutego:rpi_base
LABEL maintainer therecipe
LABEL maintainer bluszcz
RUN QT=qtrpi-rpi2_qt-5.7.0.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/therecipe/files/releases/download/v0.0.0/$QT && tar -xzf $QT -C / && rm -f $QT
RUN QT=qtrpi-rpi2_qt-5.7.0.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/bluszcz/files/releases/download/v0.0.0/$QT && tar -xzf $QT -C / && rm -f $QT
RUN git clone -q --depth 1 -b 5.7 https://github.com/qt/qtvirtualkeyboard.git /opt/qtrpi/raspi/qtvirtualkeyboard && cd /opt/qtrpi/raspi/qtvirtualkeyboard && ../qt5/bin/qmake qtvirtualkeyboard.pro CONFIG+=lang-all && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo) && rm -rf /opt/qtrpi/raspi/qtvirtualkeyboard

View file

@ -1,8 +1,8 @@
FROM bluszcz/cutego:rpi_base
LABEL maintainer therecipe
LABEL maintainer bluszcz
RUN QT=qtrpi-rpi3_qt-5.7.0.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/therecipe/files/releases/download/v0.0.0/$QT && tar -xzf $QT -C / && rm -f $QT
RUN QT=qtrpi-rpi3_qt-5.7.0.tar.gz && curl -sL --retry 10 --retry-delay 60 -O https://github.com/bluszcz/files/releases/download/v0.0.0/$QT && tar -xzf $QT -C / && rm -f $QT
RUN git clone -q --depth 1 -b 5.7 https://github.com/qt/qtvirtualkeyboard.git /opt/qtrpi/raspi/qtvirtualkeyboard && cd /opt/qtrpi/raspi/qtvirtualkeyboard && ../qt5/bin/qmake qtvirtualkeyboard.pro CONFIG+=lang-all && make -j $(grep -c ^processor /proc/cpuinfo) && make install -j $(grep -c ^processor /proc/cpuinfo) && rm -rf /opt/qtrpi/raspi/qtvirtualkeyboard

View file

@ -10,7 +10,7 @@ RUN /usr/local/go/bin/go get -tags=no_env github.com/StarAurryon/qt/cmd/...
FROM i386/ubuntu:14.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM clickable/ubuntu-sdk:15.04-amd64
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM clickable/ubuntu-sdk:16.04-amd64
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM clickable/ubuntu-sdk:15.04-armhf
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM clickable/ubuntu-sdk:16.04-armhf
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,6 +8,6 @@ RUN cd /usr/lib/mxe && make -j $(grep -c ^processor /proc/cpuinfo) MXE_TARGETS='
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
COPY --from=base /usr/lib/mxe /usr/lib/mxe

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,6 +8,6 @@ RUN cd /usr/lib/mxe && make -j $(grep -c ^processor /proc/cpuinfo) MXE_TARGETS='
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
COPY --from=base /usr/lib/mxe /usr/lib/mxe

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,6 +8,6 @@ RUN cd /usr/lib/mxe && make -j $(grep -c ^processor /proc/cpuinfo) MXE_TARGETS='
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
COPY --from=base /usr/lib/mxe /usr/lib/mxe

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -8,6 +8,6 @@ RUN cd /usr/lib/mxe && make -j $(grep -c ^processor /proc/cpuinfo) MXE_TARGETS='
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
COPY --from=base /usr/lib/mxe /usr/lib/mxe

View file

@ -4,7 +4,7 @@ RUN echo "deb http://pkg.mxe.cc/repos/apt trusty main" | tee --append /etc/apt/s
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -4,7 +4,7 @@ RUN echo "deb http://pkg.mxe.cc/repos/apt trusty main" | tee --append /etc/apt/s
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -4,7 +4,7 @@ RUN echo "deb http://pkg.mxe.cc/repos/apt trusty main" | tee --append /etc/apt/s
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -4,7 +4,7 @@ RUN echo "deb http://pkg.mxe.cc/repos/apt trusty main" | tee --append /etc/apt/s
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,7 +1,7 @@
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
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\qt\\internal\\ci\\iscript.qs WINDOWS=true && rm -f $QT
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_64 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_64 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_64 -name "*d.dll.a" -exec grep -l "gnu_debug" {} \+)
@ -10,7 +10,7 @@ RUN find $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs -type f ! -name "*.index" -delete
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,7 +1,7 @@
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
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\qt\\internal\\ci\\iscript.qs WINDOWS=true ARCH=32 && rm -f $QT
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/mingw73_32 -name "*d.dll.a" -exec grep -l "gnu_debug" {} \+)
@ -10,7 +10,7 @@ RUN find $HOME/.wine/drive_c/Qt/Qt5.13.0/Docs -type f ! -name "*.index" -delete
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -71,7 +71,7 @@ RUN rm -rf $HOME/.wine/drive_c/msys64/mingw32/qt5/share/qt5/examples
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -78,7 +78,7 @@ RUN rm -rf $HOME/.wine/drive_c/msys64/mingw32/qt5-static/share/qt5/examples
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,7 +1,7 @@
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
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=qt5.5124 && rm -f $QT
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.12.4/5.12.4/mingw73_64 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.12.4/5.12.4/mingw73_64 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.12.4/5.12.4/mingw73_64 -name "*d.dll.a" -exec grep -l "gnu_debug" {} \+)
@ -10,7 +10,7 @@ RUN find $HOME/.wine/drive_c/Qt/Qt5.12.4/Docs -type f ! -name "*.index" -delete
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -2,7 +2,7 @@ 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
RUN 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 QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\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" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll.a" -exec grep -l "gnu_debug" {} \+)
@ -11,7 +11,7 @@ RUN find $HOME/.wine/drive_c/Qt/Qt5.6.3/Docs -type f ! -name "*.index" -delete
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -2,7 +2,7 @@ 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
RUN 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 QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\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" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.6.3/5.6.3/mingw49_32 -name "*d.dll.a" -exec grep -l "gnu_debug" {} \+)
@ -11,7 +11,7 @@ RUN find $HOME/.wine/drive_c/Qt/Qt5.6.3/Docs -type f ! -name "*.index" -delete
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,7 +1,7 @@
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
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\qt\\internal\\ci\\iscript.qs WINDOWS=true VERSION=596 && rm -f $QT
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.9.6/5.9.6/mingw53_32 -name "*d.a" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.9.6/5.9.6/mingw53_32 -name "*d.dll" -exec grep -l "gnu_debug" {} \+)
RUN rm -f $(find $HOME/.wine/drive_c/Qt/Qt5.9.6/5.9.6/mingw53_32 -name "*d.dll.a" -exec grep -l "gnu_debug" {} \+)
@ -10,7 +10,7 @@ RUN find $HOME/.wine/drive_c/Qt/Qt5.9.6/Docs -type f ! -name "*.index" -delete
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,7 +1,7 @@
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
&& QT_QPA_PLATFORM=minimal xvfb-run wine Z:\\$QT --no-force-installations --script=C:\\gopath\\src\\github.com\\bluszcz\\qt\\internal\\ci\\iscript.qs WINDOWS=true MSVC=true && rm -f $QT
RUN find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/msvc2017_64 -type f -name "*d.dll" -exec sh -c 'test -e $(echo {} | sed -e "s/d\./\./g") && rm -rf {}' \;
RUN find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/msvc2017_64 -type f -name "*d.lib" -exec sh -c 'test -e $(echo {} | sed -e "s/d\./\./g") && rm -rf {}' \;
RUN find $HOME/.wine/drive_c/Qt/Qt5.13.0/5.13.0/msvc2017_64 -name "*.exe" -size +7M -maxdepth 4 -delete
@ -22,7 +22,7 @@ RUN cd $HOME/.wine/drive_c/go/src && wine cmd /c make.bat && git reset --hard &&
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER
@ -46,7 +46,7 @@ RUN apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ xenial mai
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq-stable && apt-get -qq clean
RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w
RUN curl -sL --retry 10 --retry-delay 60 https://github.com/therecipe/files/releases/download/v0.0.0/msvc_2017.tar.gz | tar -xz -C $HOME/.wine/drive_c
RUN curl -sL --retry 10 --retry-delay 60 https://github.com/bluszcz/files/releases/download/v0.0.0/msvc_2017.tar.gz | tar -xz -C $HOME/.wine/drive_c
RUN echo 'REGEDIT4\n\n\
[HKEY_CURRENT_USER\Environment]\n\

View file

@ -71,7 +71,7 @@ RUN rm -rf $HOME/.wine/drive_c/msys64/mingw64/qt5/share/qt5/examples
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -78,7 +78,7 @@ RUN rm -rf $HOME/.wine/drive_c/msys64/mingw64/qt5-static/share/qt5/examples
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -1,5 +1,5 @@
FROM ubuntu:16.04
LABEL maintainer therecipe
LABEL maintainer bluszcz
ENV USER user
ENV HOME /home/$USER

View file

@ -30,7 +30,7 @@ func initQQuickView(path string) *quick.QQuickView {
func main() {
var path = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "therecipe", "qt", "internal", "examples", "quick", "hotreload", "qml", "hotreload.qml")
var path = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "bluszcz", "qt", "internal", "examples", "quick", "hotreload", "qml", "hotreload.qml")
widgets.NewQApplication(len(os.Args), os.Args)

View file

@ -28,7 +28,7 @@ import (
)
var (
pathToProject = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "therecipe", "qt", "internal", "examples", "showcases", "wallet")
pathToProject = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "bluszcz", "qt", "internal", "examples", "showcases", "wallet")
pathToWalletDaemon = filepath.Join(os.Getenv("GOPATH"), "bin", "wallet", "WalletDaemon")
PRODUCTION = true //set to 'true' to use qrc: instead of qml files

View file

@ -1,3 +1,4 @@
//go:build qml
// +build qml
package main
@ -28,7 +29,7 @@ func main() {
if PRODUCTION {
path = "qrc:/qml/view.qml"
} else {
path = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "therecipe", "qt", "internal", "examples", "sql", "masterdetail_qml", "view", "qml", "view.qml")
path = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "bluszcz", "qt", "internal", "examples", "sql", "masterdetail_qml", "view", "qml", "view.qml")
}
core.QCoreApplication_SetAttribute(core.Qt__AA_EnableHighDpiScaling, true)

View file

@ -320,7 +320,7 @@ func InitProcess() {
return nil
}
dlpath := fmt.Sprintf("https://github.com/therecipe/box/releases/download/v0.0.0/%v_%v_%v_%v_%v.zip", runtime.GOOS, runtime.GOARCH, "513", "full", "http")
dlpath := fmt.Sprintf("https://github.com/bluszcz/box/releases/download/v0.0.0/%v_%v_%v_%v_%v.zip", runtime.GOOS, runtime.GOARCH, "513", "full", "http")
if Config.DownloadUrl != "" {
dlpath = Config.DownloadUrl
}

View file

@ -108,7 +108,7 @@ if "%QT_MSYS2%" == "true" (
::install Qt
set QT=qt-unified-windows-x86-online.exe
curl -sL --retry 10 --retry-delay 10 -o %TMP%\!QT! https://download.qt.io/official_releases/online_installers/!QT!
%TMP%\!QT! -v --script %GOPATH%\src\github.com\therecipe\qt\internal\ci\iscript.qs WINDOWS=true
%TMP%\!QT! -v --script %GOPATH%\src\github.com\bluszcz\qt\internal\ci\iscript.qs WINDOWS=true
del %TMP%\!QT! /Q
setx /M PATH "%PATH%;C:\Qt\Tools\mingw730_64\bin"
set PATH=%PATH%;C:\Qt\Tools\mingw730_64\bin