mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildserver: remove Qt installer, its huge, outdated, and being replaced

Browse source 
The currently included Qt has known security issues and is outdated.  This
can now be replaced by downloading and installing the Qt installer using
the sudo= build field.  @relan's provisioner system will also replace this
once that's done.  There are only two apps that currently use the Qt stuff:

* csd.qtproject.minesweeper
* org.openorienteering.mapper
This commit is contained in:
Hans-Christoph Steiner 2018-01-23 17:55:48 +01:00
parent 825b8e9683
commit 62ddab7edd
8 changed files with 0 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/Vagrantfile vendored
View file

@ -72,8 +72,6 @@ Vagrant.configure("2") do |config|
config.vm.provision "shell", path: "provision-android-sdk"
config.vm.provision "shell", path: "provision-android-ndk",
args: ["/home/vagrant/android-ndk"]
config.vm.provision "shell", path: "provision-qt-sdk",
args: ["/home/vagrant/qt-sdk"]
config.vm.provision "shell", path: "provision-pip",
args: ["compare-locales"]
config.vm.provision "shell", path: "provision-gradle"

1
buildserver/config.buildserver.py
View file

@ -9,7 +9,6 @@ ndk_paths = {
'r15c': "/home/vagrant/android-ndk/r15c",
'r16': "/home/vagrant/android-ndk/r16",
}
qt_sdk_path = "/home/vagrant/qt-sdk/5.7.0/5.7"
java_paths = {
'8': "/usr/lib/jvm/java-8-openjdk-amd64",
}

2
buildserver/provision-apt-get-install
View file

@ -95,8 +95,6 @@ packages="
python3-requests
python3-yaml
python3-ruamel.yaml
qt5-default
qtbase5-dev
quilt
realpath
rsync

83
buildserver/provision-qt-sdk
View file

@ -1,83 +0,0 @@
#!/bin/bash
set -e
QT_DIR=$1
test -e $QT_DIR || mkdir -p $QT_DIR
cat << EOF > $QT_DIR/5.7.0-installer.qs
// Bases on script from http://stackoverflow.com/a/34032216
function Controller() {
installer.autoRejectMessageBoxes();
installer.installationFinished.connect(function() {
gui.clickButton(buttons.NextButton);
})
}
Controller.prototype.WelcomePageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.CredentialsPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.IntroductionPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.TargetDirectoryPageCallback = function()
{
gui.currentPageWidget().TargetDirectoryLineEdit.setText("$QT_DIR/5.7.0");
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget();
// You can get these component names by running the installer with the
// --verbose flag. It will then print out a resource tree.
widget.deselectAll();
widget.selectComponent("qt.55.gcc_64");
widget.selectComponent("qt.57.qtwebengine.gcc_64");
widget.selectComponent("qt.57.android_x86");
widget.selectComponent("qt.57.android_armv7");
// widget.deselectComponent("...");
gui.clickButton(buttons.NextButton);
}
Controller.prototype.LicenseAgreementPageCallback = function() {
gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
gui.clickButton(buttons.NextButton);
}
Controller.prototype.StartMenuDirectoryPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ReadyForInstallationPageCallback = function()
{
gui.clickButton(buttons.NextButton);
}
Controller.prototype.FinishedPageCallback = function() {
var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
checkBoxForm.launchQtCreatorCheckBox.checked = false;
}
gui.clickButton(buttons.FinishButton);
}
EOF
if [ ! -e $QT_DIR/5.7.0 ]; then
echo "Installing Qt SDK 5.7.0 to $QT_DIR/5.7.0 ..."
/vagrant/cache/qt-opensource-linux-x64-android-5.7.0.run --platform minimal --script $QT_DIR/5.7.0-installer.qs --verbose
echo "Qt SDK 5.7.0 installation done."
fi
rm $QT_DIR/5.7.0-installer.qs