From bf8404533669a802f38d121eb6b81cfa4307fab2 Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Thu, 22 Mar 2012 22:11:01 -0400 Subject: [PATCH 1/3] qt_sdk: upgrade to SDK v1.2 (QT v4.8.0) Qt 4.8+ is now required to build the GCS. This version of the SDK installer has dropped support for the --installdir option so users will need to manually specify the path for installation as: /tools/qtsdk-v1.2 in order for the Makefile to pick up this toolchain automatically. This update drops support for Ubuntu 9.10 (Karmic) due to an incompatibility with the glibc that ships with that release. Support should still be possible with Ubuntu 10.04 (Lucid) and newer. --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 14e1b641b..fafc24915 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ help: @echo " Here is a summary of the available targets:" @echo @echo " [Tool Installers]" - @echo " qt_sdk_install - Install the QT v4.6.2 tools" + @echo " qt_sdk_install - Install the QT v4.7.3 tools" @echo " arm_sdk_install - Install the Code Sourcery ARM gcc toolchain" @echo " openocd_install - Install the OpenOCD JTAG daemon" @echo " stm32flash_install - Install the stm32flash tool for unbricking boards" @@ -160,20 +160,22 @@ $(BUILD_DIR): ############################################################### # Set up QT toolchain -QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-2010.02 +QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-v1.2 .PHONY: qt_sdk_install -qt_sdk_install: QT_SDK_URL := http://get.qt.nokia.com/qtsdk/qt-sdk-linux-x86-opensource-2010.02.bin -qt_sdk_install: QT_SDK_FILE := $(notdir $(QT_SDK_URL)) +qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/8ea74da4-fec1-4277-8b26-c58cc82e204b/Qt_SDK_Lin32_offline +qt_sdk_install: QT_SDK_FILE := Qt_SDK_Lin32_offline_v1_2_en.run +#qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/c365bbf5-c2b9-4dda-9c1f-34b2c8d07785/Qt_SDK_Lin32_offline_v1_1_2 +#qt_sdk_install: QT_SDK_FILE := Qt_SDK_Lin32_offline_v1_1_2_en.run # order-only prereq on directory existance: qt_sdk_install : | $(DL_DIR) $(TOOLS_DIR) qt_sdk_install: qt_sdk_clean # download the source only if it's newer than what we already have - $(V1) wget -N -P "$(DL_DIR)" "$(QT_SDK_URL)" + $(V1) wget -N --content-disposition -P "$(DL_DIR)" "$(QT_SDK_URL)" #installer is an executable, make it executable and run it $(V1) chmod u+x "$(DL_DIR)/$(QT_SDK_FILE)" - "$(DL_DIR)/$(QT_SDK_FILE)" --installdir "$(QT_SDK_DIR)" + "$(DL_DIR)/$(QT_SDK_FILE)" -style cleanlooks .PHONY: qt_sdk_clean qt_sdk_clean: @@ -257,7 +259,7 @@ stm32flash_clean: ############################## ifeq ($(shell [ -d "$(QT_SDK_DIR)" ] && echo "exists"), exists) - QMAKE=$(QT_SDK_DIR)/qt/bin/qmake + QMAKE=$(QT_SDK_DIR)/Desktop/Qt/4.8.0/gcc/bin/qmake else # not installed, hope it's in the path... QMAKE=qmake From a64602de78626a840e30c94aa1d553487246a10d Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Sun, 1 Apr 2012 19:13:39 -0400 Subject: [PATCH 2/3] qt_sdk: notify user of proper path for installation --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index fafc24915..7cef9d4ee 100644 --- a/Makefile +++ b/Makefile @@ -173,6 +173,14 @@ qt_sdk_install: qt_sdk_clean # download the source only if it's newer than what we already have $(V1) wget -N --content-disposition -P "$(DL_DIR)" "$(QT_SDK_URL)" + # tell the user exactly which path they should select in the GUI + $(V1) echo "*** NOTE NOTE NOTE ***" + $(V1) echo "*" + $(V1) echo "* In the GUI, please use exactly this path as the installation path:" + $(V1) echo "* $(QT_SDK_DIR)" + $(V1) echo "*" + $(V1) echo "*** NOTE NOTE NOTE ***" + #installer is an executable, make it executable and run it $(V1) chmod u+x "$(DL_DIR)/$(QT_SDK_FILE)" "$(DL_DIR)/$(QT_SDK_FILE)" -style cleanlooks From 057cfafcf16e273da9d6f76af3018db840026c5f Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Sun, 1 Apr 2012 19:14:09 -0400 Subject: [PATCH 3/3] qt_sdk: hide install command when not verbose --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7cef9d4ee..48cd52cf6 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ qt_sdk_install: qt_sdk_clean #installer is an executable, make it executable and run it $(V1) chmod u+x "$(DL_DIR)/$(QT_SDK_FILE)" - "$(DL_DIR)/$(QT_SDK_FILE)" -style cleanlooks + $(V1) "$(DL_DIR)/$(QT_SDK_FILE)" -style cleanlooks .PHONY: qt_sdk_clean qt_sdk_clean: