rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-208 Changed Qt download paths to get Qt 5.6.0 release.

Browse Source 
Updated MD5 paths to grab the md5sums.txt file instead of a file with the same name as the binary installer. The md5sums.txt file contains all md5 checksums for the file in the same directory.
Updated tools.mk to grep in the md5 file for the row with the name of the file of interest.
Added makefile variables for the Qt version for easier upgrades in the future.
Updated the qt installer script to use Qt5.6
Removed Linux x32 installer since it is not provided anymore.
Fixed compiler errors caused by Qt5.6 using C++11 as default.
This commit is contained in:
Fredrik Arvidsson 2016-03-24 15:01:26 +01:00
parent 5a97420cf3
commit 4e74160d3f
8 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/gcs/src/libs/eigen/Eigen/src/Core/arch/SSE/PacketMath.h
View File

@ -14,6 +14,10 @@ namespace Eigen {
namespace internal {
#if __cplusplus > 199711L
#define register // Deprecated in C++11.
#endif // #if __cplusplus > 199711L
#ifndef EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD
#define EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD 8
#endif

2
ground/gcs/src/libs/utils/filenamevalidatinglineedit.cpp
View File

@ -81,7 +81,7 @@ void FileNameValidatingLineEdit::setAllowDirectories(bool v)
#endif
static const char *notAllowedCharsSubDir = "?:&*\"|#%<> ";
static const char *notAllowedCharsNoSubDir = "?:&*\"|#%<> "SLASHES;
static const char *notAllowedCharsNoSubDir = "?:&*\"|#%<> " SLASHES;
static const char *notAllowedSubStrings[] = { ".." };

14
ground/gcs/src/plugins/config/calibration/thermal/thermalcalibration.h
View File

@ -41,13 +41,13 @@ class ThermalCalibration {
static const int BARO_PRESSURE_POLY_DEGREE = 3;
// TODO: determine max allowable relative error
static const double BARO_PRESSURE_MAX_REL_ERROR = 1E-6f;
static const double ACCEL_X_MAX_REL_ERROR = 1E-6f;
static const double ACCEL_Y_MAX_REL_ERROR = 1E-6f;
static const double ACCEL_Z_MAX_REL_ERROR = 1E-6f;
static const double GYRO_X_MAX_REL_ERROR = 1E-6f;
static const double GYRO_Y_MAX_REL_ERROR = 1E-6f;
static const double GYRO_Z_MAX_REL_ERROR = 1E-6f;
constexpr static const double BARO_PRESSURE_MAX_REL_ERROR = 1E-6f;
constexpr static const double ACCEL_X_MAX_REL_ERROR = 1E-6f;
constexpr static const double ACCEL_Y_MAX_REL_ERROR = 1E-6f;
constexpr static const double ACCEL_Z_MAX_REL_ERROR = 1E-6f;
constexpr static const double GYRO_X_MAX_REL_ERROR = 1E-6f;
constexpr static const double GYRO_Y_MAX_REL_ERROR = 1E-6f;
constexpr static const double GYRO_Z_MAX_REL_ERROR = 1E-6f;
public:
/**

4
ground/gcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.h
View File

@ -93,8 +93,8 @@ class ThermalCalibrationHelper : public QObject {
Q_OBJECT
public:
const static float TargetGradient = 0.20f;
const static float TargetTempDelta = 10.0f;
constexpr const static float TargetGradient = 0.20f;
constexpr const static float TargetTempDelta = 10.0f;
explicit ThermalCalibrationHelper(QObject *parent = 0);

2
ground/gcs/src/plugins/config/configstabilizationwidget.h
View File

@ -63,7 +63,7 @@ private:
static const int AUTOMATIC_UPDATE_RATE = 500;
static const int EXPO_CURVE_POINTS_COUNT = 100;
static const double EXPO_CURVE_CONSTANT = 1.00695;
constexpr static const double EXPO_CURVE_CONSTANT = 1.00695;
int boardModel;
int m_stabSettingsBankCount;

4
ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp
View File

@ -83,8 +83,8 @@ void ImportSummaryDialog::addLine(QString uavObjectName, QString text, bool stat
ui->importSummaryList->setItem(row, 2, new QTableWidgetItem(text));
// Disable editability and selectability in table elements
ui->importSummaryList->item(row, 1)->setFlags(!Qt::ItemIsEditable);
ui->importSummaryList->item(row, 2)->setFlags(!Qt::ItemIsEditable);
ui->importSummaryList->item(row, 1)->setFlags(ui->importSummaryList->item(row, 1)->flags() &= ~Qt::ItemIsEditable);
ui->importSummaryList->item(row, 2)->setFlags(ui->importSummaryList->item(row, 2)->flags() &= ~Qt::ItemIsEditable);
if (status) {
box->setChecked(true);

17
make/tool_install/qt-install.qs
View File

@ -1,7 +1,7 @@
/*
silent installer script
known not work with Qt 5.5.1 and QtIFW 2.0.2
known not work with Qt 5.6.0 and QtIFW 2.1.0
known issues:
- silent but not headless (QtIFW 2.0.3 should support installer.setSilent(true))
@ -14,11 +14,10 @@ function Controller()
{
console.log("*** Silent Installer ***");
console.log("Installing on " + installer.value("os"));
//installer.setSilent(true);
var qtInstallTargetDir = installer.environmentVariable("QT_INSTALL_TARGET_DIR");
if (qtInstallTargetDir == "") {
qtInstallTargetDir = installer.environmentVariable("PWD") + "/tools/qt-5.5.1";
qtInstallTargetDir = installer.environmentVariable("PWD") + "/tools/qt-5.6.0";
console.log("Environment variable QT_INSTALL_TARGET_DIR not set, using default " + qtInstallTargetDir);
}
installer.setValue("TargetDir", qtInstallTargetDir);
@ -97,18 +96,18 @@ Controller.prototype.ComponentSelectionPageCallback = function()
var page = gui.currentPageWidget();
page.deselectAll()
if (installer.value("os") == "win") {
selectComponent(page, "qt.55.win32_mingw492");
selectComponent(page, "qt.56.win32_mingw492");
selectComponent(page, "qt.tools.win32_mingw492");
}
else if (installer.value("os") == "x11") {
selectComponent(page, "qt.55.gcc");
selectComponent(page, "qt.55.gcc_64");
selectComponent(page, "qt.56.gcc");
selectComponent(page, "qt.56.gcc_64");
}
else if (installer.value("os") == "mac") {
selectComponent(page, "qt.55.clang_64");
selectComponent(page, "qt.56.clang_64");
}
selectComponent(page, "qt.55.qtquickcontrols");
selectComponent(page, "qt.55.qtscript");
selectComponent(page, "qt.56.qtquickcontrols");
selectComponent(page, "qt.56.qtscript");
//installer.componentByName("qt.tools.qtcreator").setValue("ForcedInstallation", "false");

45
make/tools.mk
View File

@ -86,36 +86,35 @@ $(TOOL_REMOVE_TARGETS):
TOOLS_URL := http://librepilot.github.io/tools
QT_MAJOR_VERSION := 5.6
QT_FULL_VERSION := 5.6.0
ifeq ($(UNAME), Linux)
ifeq ($(ARCH), x86_64)
QT_SDK_ARCH := gcc_64
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x64-5.5.1.run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x64-5.5.1.run.md5
OSG_URL := $(TOOLS_URL)/osg-3.5.1-linux-x64-qt-5.5.1.tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-linux-x64-qt-5.5.1.tar.gz
QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_MAJOR_VERSION)/$(QT_FULL_VERSION)/qt-opensource-linux-x64-$(QT_FULL_VERSION).run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/$(QT_MAJOR_VERSION)/$(QT_FULL_VERSION)/md5sums.txt
OSG_URL := $(TOOLS_URL)/osg-3.5.1-linux-x64-qt-$(QT_FULL_VERSION).tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-linux-x64-qt-$(QT_FULL_VERSION).tar.gz
else
QT_SDK_ARCH := gcc
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x86-5.5.1.run
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x86-5.5.1.run.md5
OSG_URL := $(TOOLS_URL)/osg-3.5.1-linux-x86-qt-5.5.1.tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-linux-x86-qt-5.5.1.tar.gz
# x32 for linux no longer provided as pre-built binaries.
endif
UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz
else ifeq ($(UNAME), Darwin)
QT_SDK_ARCH := clang_64
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-mac-x64-clang-5.5.1.dmg
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-mac-x64-clang-5.5.1.dmg.md5
QT_SDK_MOUNT_DIR := /Volumes/qt-opensource-mac-x64-clang-5.5.1
QT_SDK_MAINTENANCE_TOOL := /Volumes/qt-opensource-mac-x64-clang-5.5.1/qt-opensource-mac-x64-clang-5.5.1.app/Contents/MacOS/qt-opensource-mac-x64-clang-5.5.1
QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_MAJOR_VERSION)/$(QT_FULL_VERSION)/qt-opensource-mac-x64-clang-$(QT_FULL_VERSION).dmg
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/$(QT_MAJOR_VERSION)/$(QT_FULL_VERSION)/md5sums.txt
QT_SDK_MOUNT_DIR := /Volumes/qt-opensource-mac-x64-clang-$(QT_FULL_VERSION)
QT_SDK_MAINTENANCE_TOOL := /Volumes/qt-opensource-mac-x64-clang-$(QT_FULL_VERSION)/qt-opensource-mac-x64-clang-$(QT_FULL_VERSION).app/Contents/MacOS/qt-opensource-mac-x64-clang-$(QT_FULL_VERSION)
UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz
OSG_URL := $(TOOLS_URL)/osg-3.5.1-clang_64-qt-5.5.1.tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-clang_64-qt-5.5.1.tar.gz
OSG_URL := $(TOOLS_URL)/osg-3.5.1-clang_64-qt-$(QT_FULL_VERSION).tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-clang_64-qt-$(QT_FULL_VERSION).tar.gz
else ifeq ($(UNAME), Windows)
QT_SDK_ARCH := mingw492_32
QT_SDK_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-mingw492-5.5.1.exe
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-mingw492-5.5.1.exe.md5
QT_SDK_URL := http://download.qt.io/official_releases/qt/$(QT_MAJOR_VERSION)/$(QT_FULL_VERSION)/qt-opensource-windows-x86-mingw492-$(QT_FULL_VERSION).exe
QT_SDK_MD5_URL := http://download.qt.io/official_releases/qt/$(QT_MAJOR_VERSION)/$(QT_FULL_VERSION)/md5sums.txt
NSIS_URL := $(TOOLS_URL)/nsis-2.46-unicode.tar.bz2
MESAWIN_URL := $(TOOLS_URL)/mesawin.tar.gz
UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60-windows.tar.bz2
@ -126,7 +125,7 @@ GTEST_URL := $(TOOLS_URL)/gtest-1.7.0.zip
CCACHE_URL := http://samba.org/ftp/ccache/ccache-3.2.2.tar.bz2
CCACHE_MD5_URL := $(TOOLS_URL)/ccache-3.2.2.tar.bz2.md5
QT_VERSION := 5.5.1
QT_VERSION := $(QT_FULL_VERSION)
QT_SDK_DIR := $(TOOLS_DIR)/qt-$(QT_VERSION)
UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60
DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1
@ -309,7 +308,7 @@ endif
##############################
define MD5_CHECK_TEMPLATE
"`test -f \"$(1)\" && $(OPENSSL) dgst -md5 \"$(1)\" | $(CUT) -f2 -d' '`" $(2) "`$(CUT) -f1 -d' ' < \"$(1).md5\"`"
"`test -f \"$(1)\" && $(OPENSSL) dgst -md5 \"$(1)\" | $(CUT) -f2 -d' '`" $(2) "`$(GREP) $(notdir $(1)) $(1).md5 | $(CUT) -f1 -d' '`"
endef
##############################
@ -513,17 +512,17 @@ endef
ifeq ($(UNAME), Windows)
QT_SDK_PREFIX := $(QT_SDK_DIR)/5.5/$(QT_SDK_ARCH)
QT_SDK_PREFIX := $(QT_SDK_DIR)/$(QT_MAJOR_VERSION)/$(QT_SDK_ARCH)
$(eval $(call QT_INSTALL_TEMPLATE,$(QT_SDK_DIR),$(QT_SDK_URL),$(QT_SDK_MD5_URL),$(notdir $(QT_SDK_URL)),$(QT_SDK_ARCH)))
else ifeq ($(UNAME), Linux)
QT_SDK_PREFIX := "$(QT_SDK_DIR)/5.5/$(QT_SDK_ARCH)"
QT_SDK_PREFIX := "$(QT_SDK_DIR)/$(QT_MAJOR_VERSION)/$(QT_SDK_ARCH)"
$(eval $(call QT_INSTALL_TEMPLATE,$(QT_SDK_DIR),$(QT_SDK_URL),$(QT_SDK_MD5_URL),$(notdir $(QT_SDK_URL)),$(QT_SDK_ARCH)))
else ifeq ($(UNAME), Darwin)
QT_SDK_PREFIX := "$(QT_SDK_DIR)/5.5/$(QT_SDK_ARCH)"
QT_SDK_PREFIX := "$(QT_SDK_DIR)/$(QT_MAJOR_VERSION)/$(QT_SDK_ARCH)"
$(eval $(call MAC_QT_INSTALL_TEMPLATE,$(QT_SDK_DIR),$(QT_SDK_URL),$(QT_SDK_MD5_URL),$(notdir $(QT_SDK_URL)),$(QT_SDK_ARCH)))
else
@ -533,7 +532,7 @@ QT_SDK_PREFIX := $(QT_SDK_DIR)
.PHONY: qt_sdk_install
qt_sdk_install:
@$(ECHO) $(MSG_NOTICE) --------------------------------------------------------
@$(ECHO) $(MSG_NOTICE) Please install native Qt 5.5.x SDK using package manager
@$(ECHO) $(MSG_NOTICE) Please install native Qt 5.6.x SDK using package manager
@$(ECHO) $(MSG_NOTICE) --------------------------------------------------------
.PHONY: qt_sdk_clean