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 the CI image builds + fix QT_STUB

Browse source
This commit is contained in:
therecipe 2020-05-30 19:47:09 +02:00
parent 5074eb6d8c
commit fbe09d927c
4 changed files with 91 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -756,7 +756,7 @@ default:
fmt.Fprint(bb, "func init() {\n")
if module == "QtQml" {
if module == "QtQml" && !utils.QT_STUB() {
var free string
if !UseJs() {
free = `C.QJSValue_DestroyQJSValue(unsafe.Pointer(uintptr(ptr)))

120
internal/ci/iscript.qs
View file

@ -5,6 +5,30 @@ function Controller()
installer.removeWizardPage(installer.components()[0], "WorkspaceWidget");
})
installer.setDefaultPageVisible(4092, false);
installer.setDefaultPageVisible(4093, false);
installer.setDefaultPageVisible(4094, false);
installer.setDefaultPageVisible(4095, false);
if (!installer.isOfflineOnly())
{
var repos = [
"http://download.qt.io/online/qtsdkrepository/"+installer.value("os")+"_x64/desktop/licenses/",
"http://download.qt.io/online/qtsdkrepository/"+installer.value("os")+"_x64/desktop/tools_generic/",
"http://download.qt.io/online/qtsdkrepository/"+installer.value("os")+"_x64/desktop/tools_qtcreator/",
"http://download.qt.io/online/qtsdkrepository/"+installer.value("os")+"_x64/desktop/"+installer.value("VERSION").replace(".", "_")+"/",
"http://download.qt.io/online/qtsdkrepository/"+installer.value("os")+"_x64/desktop/"+installer.value("VERSION").replace(".", "_")+"_src_doc_examples/"
];
if (installer.value("PREVIEW") == "true")
{
repos.push("http://download.qt.io/online/qtsdkrepository/"+installer.value("os")+"_x64/desktop/"+installer.value("VERSION").replace(".", "_").slice(0, -1)+"_preview/")
}
installer.addUserRepositories(repos)
}
installer.autoRejectMessageBoxes();
installer.installationFinished.connect(function()
{
@ -34,6 +58,23 @@ Controller.prototype.DynamicTelemetryPluginFormCallback = function()
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ObligationsPageCallback = function()
{
var page = gui.pageWidgetByObjectName("ObligationsPage");
page.obligationsAgreement.setChecked(true);
//company
//var nameEdit = gui.findChild(page, "CompanyName")
//if (nameEdit) { nameEdit.text = "My Company" }
//individual
var individualCheckbox = gui.findChild(page, "IndividualPerson")
if (individualCheckbox) { individualCheckbox.checked = true; }
page.completeChanged();
gui.clickButton(buttons.NextButton);
}
Controller.prototype.TargetDirectoryPageCallback = function()
{
gui.clickButton(buttons.NextButton);
@ -58,19 +99,54 @@ Controller.prototype.ComponentSelectionPageCallback = function()
}
var version = "qt5.5130";
var prefix = "";
if (installer.value("VERSION") != "")
{
version = installer.value("VERSION");
}
if (installer.value("PREVIEW") == "true")
{
version = version.slice(0, -1)
prefix = "preview."
}
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qt3d");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtcanvas3d");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtcharts");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtdatavis3d");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtlocation");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtnetworkauth");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtpurchasing");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtquickcontrols");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtquickcontrols2");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtremoteobjects");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtscript");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtserialbus");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtspeech");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtvirtualkeyboard");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtwebengine");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtwebglplugin");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtwebview");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".qtlottie");
if (installer.value("LINUX") == "true")
{
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".gcc_64");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".android_armv7");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".android_x86");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".android_arm64_v8a");
}
if (installer.value("DARWIN") == "true")
{
gui.currentPageWidget().selectComponent("qt."+version+".clang_64");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".clang_64");
}
if (installer.value("IOS") == "true")
{
gui.currentPageWidget().selectComponent("qt."+version+".ios");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".ios");
}
if (installer.value("WINDOWS") == "true")
@ -79,58 +155,30 @@ Controller.prototype.ComponentSelectionPageCallback = function()
{
if (installer.value("ARCH") == "32")
{
gui.currentPageWidget().selectComponent("qt."+version+".win32_msvc2017");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".win32_msvc2017");
gui.currentPageWidget().selectComponent("qt.tools.win32_mingw730")
}
else
{
gui.currentPageWidget().selectComponent("qt."+version+".win64_msvc2017_64");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".win64_msvc2017_64");
gui.currentPageWidget().selectComponent("qt.tools.win64_mingw730")
}
}
else
{
gui.currentPageWidget().selectComponent("qt."+version+".win32_mingw49");
gui.currentPageWidget().selectComponent("qt."+version+".win32_mingw53");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".win32_mingw49");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".win32_mingw53");
if (installer.value("ARCH") == "32")
{
gui.currentPageWidget().selectComponent("qt."+version+".win32_mingw73");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".win32_mingw73");
}
else
{
gui.currentPageWidget().selectComponent("qt."+version+".win64_mingw73");
gui.currentPageWidget().selectComponent(prefix+"qt."+version+".win64_mingw73");
}
}
}
gui.currentPageWidget().selectComponent("qt."+version+".qt3d");
gui.currentPageWidget().selectComponent("qt."+version+".qtcanvas3d");
gui.currentPageWidget().selectComponent("qt."+version+".qtcharts");
gui.currentPageWidget().selectComponent("qt."+version+".qtdatavis3d");
gui.currentPageWidget().selectComponent("qt."+version+".qtlocation");
gui.currentPageWidget().selectComponent("qt."+version+".qtnetworkauth");
gui.currentPageWidget().selectComponent("qt."+version+".qtpurchasing");
gui.currentPageWidget().selectComponent("qt."+version+".qtquickcontrols");
gui.currentPageWidget().selectComponent("qt."+version+".qtquickcontrols2");
gui.currentPageWidget().selectComponent("qt."+version+".qtremoteobjects");
gui.currentPageWidget().selectComponent("qt."+version+".qtscript");
gui.currentPageWidget().selectComponent("qt."+version+".qtserialbus");
gui.currentPageWidget().selectComponent("qt."+version+".qtspeech");
gui.currentPageWidget().selectComponent("qt."+version+".qtvirtualkeyboard");
gui.currentPageWidget().selectComponent("qt."+version+".qtwebengine");
gui.currentPageWidget().selectComponent("qt."+version+".qtwebglplugin");
gui.currentPageWidget().selectComponent("qt."+version+".qtwebview");
gui.currentPageWidget().selectComponent("qt."+version+".qtlottie");
if (installer.value("LINUX") == "true")
{
gui.currentPageWidget().selectComponent("qt."+version+".gcc_64");
gui.currentPageWidget().selectComponent("qt."+version+".android_armv7");
gui.currentPageWidget().selectComponent("qt."+version+".android_x86");
gui.currentPageWidget().selectComponent("qt."+version+".android_arm64_v8a");
}
gui.clickButton(buttons.NextButton);
}

10
internal/docker/android/Dockerfile
View file

@ -36,16 +36,16 @@ ENV GOPATH $HOME/work
ENV JDK_DIR /usr/lib/jvm/java-8-openjdk-amd64
ENV PATH /usr/local/go/bin:$PATH
ENV QT_VERSION 5.13.0
ENV QT_DIR /opt/Qt
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/therecipe/qt $GOPATH/src/github.com/therecipe/qt
COPY --from=therecipe/qt:linux /opt/Qt/5.13.0/android_armv7 /opt/Qt/5.13.0/android_armv7
COPY --from=therecipe/qt:linux /opt/Qt/5.13.0/android_x86 /opt/Qt/5.13.0/android_x86
COPY --from=therecipe/qt:linux /opt/Qt/5.13.0/android_arm64_v8a /opt/Qt/5.13.0/android_arm64_v8a
COPY --from=therecipe/qt:linux /opt/Qt/Docs /opt/Qt/Docs
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=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/linux/Dockerfile
View file

@ -10,7 +10,7 @@ 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.13.0.run
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.13/5.13.0/$QT && chmod +x $QT
RUN curl -sL --retry 10 --retry-delay 60 -O https://download.qt.io/archive/qt/5.13/5.13.0/$QT && chmod +x $QT
RUN QT_QPA_PLATFORM=minimal ./$QT --no-force-installations --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true
RUN find /opt/Qt5.13.0/5.13.0 -type f -name "*.debug" -delete
RUN find /opt/Qt5.13.0/Docs -type f ! -name "*.index" -delete