From 7cc47e4cdcb50769e8d96713eb3250167bbc5e8d Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Mon, 10 Mar 2014 01:48:24 +0100 Subject: [PATCH 1/5] OP-1258 update toolchain installer for Linux to 4.8-2013q4, change ARM_SDK_DIR accordingly --- make/tools.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index cd129cec7..14f8e0296 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -58,12 +58,12 @@ endif ifeq ($(UNAME), Linux) ifeq ($(ARCH), x86_64) - ARM_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/gcc-arm-none-eabi-4_7-2013q1-20130313-linux-amd64.tar.bz2 + ARM_SDK_URL := http://alessiomorale.com/OpenPilot/gcc-arm-none-eabi-4_8-2013q4-20131204-linux.tar.bz2 QT_SDK_URL := http://download.qt-project.org/official_releases/qt/5.2/5.2.1/qt-opensource-linux-x64-5.2.1.run QT_SDK_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-opensource-linux-x64-5.2.1.run.md5 QT_SDK_ARCH := gcc_64 else - ARM_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/gcc-arm-none-eabi-4_7-2013q1-20130313-linux-i686.tar.bz2 + ARM_SDK_URL := http://alessiomorale.com/OpenPilot/gcc-arm-none-eabi-4_8-2013q4-20131204-linux.tar.bz2 QT_SDK_URL := http://download.qt-project.org/official_releases/qt/5.2/5.2.1/qt-opensource-linux-x86-5.2.1.run QT_SDK_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-opensource-linux-x86-5.2.1.run.md5 QT_SDK_ARCH := gcc @@ -90,7 +90,7 @@ endif GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip # Changing PYTHON_DIR, also update it in ground/openpilotgcs/src/python.pri -ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_7-2013q1 +ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_8-2013q4 QT_SDK_DIR := $(TOOLS_DIR)/qt-5.2.1 MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw48_32 PYTHON_DIR := $(QT_SDK_DIR)/Tools/mingw48_32/opt/bin From a1afa6e889765e35a5c8d20107b05f8fbb921f05 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sun, 27 Apr 2014 22:20:49 +0200 Subject: [PATCH 2/5] OP-1258 updated to 2014q1, also allow to manually specify MD5 file url Conflicts: make/tools.mk --- make/tools.mk | 66 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 14f8e0296..7504248d3 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -58,39 +58,52 @@ endif ifeq ($(UNAME), Linux) ifeq ($(ARCH), x86_64) - ARM_SDK_URL := http://alessiomorale.com/OpenPilot/gcc-arm-none-eabi-4_8-2013q4-20131204-linux.tar.bz2 + ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-linux.tar.bz2 + ARM_SDK_MD5_URL:= https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-linux.tar.bz2/+md5 QT_SDK_URL := http://download.qt-project.org/official_releases/qt/5.2/5.2.1/qt-opensource-linux-x64-5.2.1.run QT_SDK_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-opensource-linux-x64-5.2.1.run.md5 QT_SDK_ARCH := gcc_64 else - ARM_SDK_URL := http://alessiomorale.com/OpenPilot/gcc-arm-none-eabi-4_8-2013q4-20131204-linux.tar.bz2 + ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-linux.tar.bz2 + ARM_SDK_MD5_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-linux.tar.bz2/+md5 QT_SDK_URL := http://download.qt-project.org/official_releases/qt/5.2/5.2.1/qt-opensource-linux-x86-5.2.1.run QT_SDK_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-opensource-linux-x86-5.2.1.run.md5 QT_SDK_ARCH := gcc endif UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz + UNCRUSTIFY_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz.md5 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz + DOXYGEN_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz.md5 else ifeq ($(UNAME), Darwin) - ARM_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/gcc-arm-none-eabi-4_7-2013q1-20130313-mac.tar.bz2 + ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-mac.tar.bz2 + ARM_SDK_MD5_URL:= https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-mac.tar.bz2/+md5 QT_SDK_URL := "Please install native Qt 5.1.x SDK using package manager" UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz + UNCRUSTIFY_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz.md5 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz + DOXYGEN_MD5_URL:= http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz.md5 else ifeq ($(UNAME), Windows) - ARM_SDK_URL := http://wiki.openpilot.org/download/attachments/18612236/gcc-arm-none-eabi-4_7-2013q1-20130313-windows.tar.bz2 + ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-win32.zip + ARM_SDK_MD5_URL:= https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-win32.zip/+md5 QT_SDK_URL := http://download.qt-project.org/official_releases/qt/5.2/5.2.1/qt-opensource-windows-x86-mingw48_opengl-5.2.1.exe QT_SDK_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-opensource-windows-x86-mingw48_opengl-5.2.1.exe.md5 QT_SDK_ARCH := mingw48_32 NSIS_URL := http://wiki.openpilot.org/download/attachments/18612236/nsis-2.46-unicode.tar.bz2 + NSIS_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/nsis-2.46-unicode.tar.bz2.md5 SDL_URL := http://wiki.openpilot.org/download/attachments/18612236/SDL-devel-1.2.15-mingw32.tar.gz + SDL_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/SDL-devel-1.2.15-mingw32.tar.gz.md5 OPENSSL_URL := http://wiki.openpilot.org/download/attachments/18612236/openssl-1.0.1e-win32.tar.bz2 + OPENSSL_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/openssl-1.0.1e-win32.tar.bz2.md5 UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2 + UNCRUSTIFY_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2.md5 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2 + DOXYGEN_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2.md5 endif GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip # Changing PYTHON_DIR, also update it in ground/openpilotgcs/src/python.pri -ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_8-2013q4 +ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_8-2014q1 QT_SDK_DIR := $(TOOLS_DIR)/qt-5.2.1 MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw48_32 PYTHON_DIR := $(QT_SDK_DIR)/Tools/mingw48_32/opt/bin @@ -275,9 +288,10 @@ endef # $(1) = tool name # $(2) = tool extract/build directory # $(3) = tool distribution URL -# $(4) = tool distribution file -# $(5) = optional extra build recipes template -# $(6) = optional extra clean recipes template +# $(4)= tool distribution MD5 URL +# $(5) = tool distribution file +# $(6) = optional extra build recipes template +# $(7) = optional extra clean recipes template # ############################## @@ -287,27 +301,27 @@ define TOOL_INSTALL_TEMPLATE $(1)_install: $(1)_clean | $(DL_DIR) $(TOOLS_DIR) - $(call DOWNLOAD_TEMPLATE,$(3),$(4),"$(3).md5") + $(call DOWNLOAD_TEMPLATE,$(3),$(5),$(4)) @$(ECHO) $(MSG_EXTRACTING) $$(call toprel, $(2)) $(V1) $(MKDIR) -p $$(call toprel, $(dir $(2))) - $(if $(filter $(suffix $(4)), .zip), - $(V1) $(UNZIP) $(UNZIP_SILENT) -d $$(call toprel, $(dir $(2))) $$(call toprel, $(DL_DIR)/$(4)), - $(V1) $(TAR) $(TAR_OPTIONS) -C $$(call toprel, $(dir $(2))) -xf $$(call toprel, $(DL_DIR)/$(4)) + $(if $(filter $(suffix $(5)), .zip), + $(V1) $(UNZIP) $(UNZIP_SILENT) -d $$(call toprel, $(dir $(2))) $$(call toprel, $(DL_DIR)/$(5)), + $(V1) $(TAR) $(TAR_OPTIONS) -C $$(call toprel, $(dir $(2))) -xf $$(call toprel, $(DL_DIR)/$(5)) ) - $(5) + $(6) $(1)_clean: @$(ECHO) $(MSG_CLEANING) $$(call toprel, $(2)) $(V1) [ ! -d "$(2)" ] || $(RM) -rf "$(2)" - $(6) + $(7) $(1)_distclean: - @$(ECHO) $(MSG_DISTCLEANING) $$(call toprel, $(DL_DIR)/$(4)) - $(V1) [ ! -f "$(DL_DIR)/$(4)" ] || $(RM) "$(DL_DIR)/$(4)" - $(V1) [ ! -f "$(DL_DIR)/$(4).md5" ] || $(RM) "$(DL_DIR)/$(4).md5" + @$(ECHO) $(MSG_DISTCLEANING) $$(call toprel, $(DL_DIR)/$(5)) + $(V1) [ ! -f "$(DL_DIR)/$(5)" ] || $(RM) "$(DL_DIR)/$(5)" + $(V1) [ ! -f "$(DL_DIR)/$(5).md5" ] || $(RM) "$(DL_DIR)/$(5).md5" endef @@ -454,7 +468,7 @@ endef # ############################## -$(eval $(call TOOL_INSTALL_TEMPLATE,arm_sdk,$(ARM_SDK_DIR),$(ARM_SDK_URL),$(notdir $(ARM_SDK_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,arm_sdk,$(ARM_SDK_DIR),$(ARM_SDK_URL),$(ARM_SDK_MD5_URL),$(notdir $(ARM_SDK_URL)))) ifeq ($(shell [ -d "$(ARM_SDK_DIR)" ] && $(ECHO) "exists"), exists) export ARM_SDK_PREFIX := $(ARM_SDK_DIR)/bin/arm-none-eabi- @@ -600,7 +614,7 @@ python_version: ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,nsis,$(NSIS_DIR),$(NSIS_URL),$(notdir $(NSIS_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,nsis,$(NSIS_DIR),$(NSIS_URL),$(NSIS_MD5_URL),$(notdir $(NSIS_URL)))) ifeq ($(shell [ -d "$(NSIS_DIR)" ] && $(ECHO) "exists"), exists) export NSIS := $(NSIS_DIR)/makensis @@ -624,7 +638,7 @@ endif ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,sdl,$(SDL_DIR),$(SDL_URL),$(notdir $(SDL_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,sdl,$(SDL_DIR),$(SDL_URL),$(SDL_MD5_URL),$(notdir $(SDL_URL)))) ifeq ($(shell [ -d "$(SDL_DIR)" ] && $(ECHO) "exists"), exists) export SDL_DIR := $(SDL_DIR) @@ -647,7 +661,7 @@ endif ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),$(notdir $(OPENSSL_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),$(OPENSSL_MD5_URL),$(notdir $(OPENSSL_URL)))) ifeq ($(shell [ -d "$(OPENSSL_DIR)" ] && $(ECHO) "exists"), exists) export OPENSSL := "$(OPENSSL_DIR)/bin/openssl" @@ -671,7 +685,7 @@ endif ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_DIR),$(UNCRUSTIFY_URL),$(notdir $(UNCRUSTIFY_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_DIR),$(UNCRUSTIFY_URL),$(UNCRUSTIFY_MD5_URL),$(notdir $(UNCRUSTIFY_URL)))) else # Linux or Mac @@ -695,7 +709,7 @@ define UNCRUSTIFY_CLEAN_TEMPLATE -$(V1) [ ! -d "$(UNCRUSTIFY_DIR)" ] || $(RM) -rf "$(UNCRUSTIFY_DIR)" endef -$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_BUILD_DIR),$(UNCRUSTIFY_URL),$(notdir $(UNCRUSTIFY_URL)),$(UNCRUSTIFY_BUILD_TEMPLATE),$(UNCRUSTIFY_CLEAN_TEMPLATE))) +$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_BUILD_DIR),$(UNCRUSTIFY_URL),$(UNCRUSTIFY_MD5_URL),$(notdir $(UNCRUSTIFY_URL)),$(UNCRUSTIFY_BUILD_TEMPLATE),$(UNCRUSTIFY_CLEAN_TEMPLATE))) endif @@ -719,7 +733,7 @@ uncrustify_version: ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_DIR),$(DOXYGEN_URL),$(notdir $(DOXYGEN_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_DIR),$(DOXYGEN_URL),$(DOXYGEN_MD5_URL),$(notdir $(DOXYGEN_URL)))) else # Linux or Mac @@ -743,7 +757,7 @@ define DOXYGEN_CLEAN_TEMPLATE -$(V1) [ ! -d "$(DOXYGEN_DIR)" ] || $(RM) -rf "$(DOXYGEN_DIR)" endef -$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_BUILD_DIR),$(DOXYGEN_URL),$(notdir $(DOXYGEN_URL)),$(DOXYGEN_BUILD_TEMPLATE),$(DOXYGEN_CLEAN_TEMPLATE))) +$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_BUILD_DIR),$(DOXYGEN_URL),$(DOXYGEN_MD5_URL),$(notdir $(DOXYGEN_URL)),$(DOXYGEN_BUILD_TEMPLATE),$(DOXYGEN_CLEAN_TEMPLATE))) endif @@ -765,7 +779,7 @@ doxygen_version: # ############################## -$(eval $(call TOOL_INSTALL_TEMPLATE,gtest,$(GTEST_DIR),$(GTEST_URL),$(notdir $(GTEST_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,gtest,$(GTEST_DIR),$(GTEST_URL),$(GTEST_MD5_URL),$(notdir $(GTEST_URL)))) export GTEST_DIR From 858d81d501731023cc40b7720a5e1bff38faba15 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Tue, 29 Apr 2014 02:02:51 +0200 Subject: [PATCH 3/5] OP-1258 make TOOL_INSTALL_TEMPLATE md5 url optional so that it defaults to fileurl.md5 --- make/tools.mk | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 7504248d3..5b2bdf929 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -71,17 +71,13 @@ ifeq ($(UNAME), Linux) QT_SDK_ARCH := gcc endif UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz - UNCRUSTIFY_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz.md5 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz - DOXYGEN_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz.md5 else ifeq ($(UNAME), Darwin) ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-mac.tar.bz2 ARM_SDK_MD5_URL:= https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-mac.tar.bz2/+md5 QT_SDK_URL := "Please install native Qt 5.1.x SDK using package manager" UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz - UNCRUSTIFY_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60.tar.gz.md5 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz - DOXYGEN_MD5_URL:= http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1.src.tar.gz.md5 else ifeq ($(UNAME), Windows) ARM_SDK_URL := https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-win32.zip ARM_SDK_MD5_URL:= https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q1-update/+download/gcc-arm-none-eabi-4_8-2014q1-20140314-win32.zip/+md5 @@ -89,15 +85,10 @@ else ifeq ($(UNAME), Windows) QT_SDK_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/qt-opensource-windows-x86-mingw48_opengl-5.2.1.exe.md5 QT_SDK_ARCH := mingw48_32 NSIS_URL := http://wiki.openpilot.org/download/attachments/18612236/nsis-2.46-unicode.tar.bz2 - NSIS_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/nsis-2.46-unicode.tar.bz2.md5 SDL_URL := http://wiki.openpilot.org/download/attachments/18612236/SDL-devel-1.2.15-mingw32.tar.gz - SDL_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/SDL-devel-1.2.15-mingw32.tar.gz.md5 OPENSSL_URL := http://wiki.openpilot.org/download/attachments/18612236/openssl-1.0.1e-win32.tar.bz2 - OPENSSL_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/openssl-1.0.1e-win32.tar.bz2.md5 UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2 - UNCRUSTIFY_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2.md5 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2 - DOXYGEN_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2.md5 endif GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip @@ -288,21 +279,23 @@ endef # $(1) = tool name # $(2) = tool extract/build directory # $(3) = tool distribution URL -# $(4)= tool distribution MD5 URL +# $(4) = tool distribution MD5 URL # $(5) = tool distribution file # $(6) = optional extra build recipes template # $(7) = optional extra clean recipes template # ############################## + + define TOOL_INSTALL_TEMPLATE .PHONY: $(addprefix $(1)_, install clean distclean) $(1)_install: $(1)_clean | $(DL_DIR) $(TOOLS_DIR) - $(call DOWNLOAD_TEMPLATE,$(3),$(5),$(4)) - + $(if $(4), $(call DOWNLOAD_TEMPLATE,$(3),$(5),$(4)),$(call DOWNLOAD_TEMPLATE,$(3),$(5),"$(3).md5")) + @$(ECHO) $(MSG_EXTRACTING) $$(call toprel, $(2)) $(V1) $(MKDIR) -p $$(call toprel, $(dir $(2))) $(if $(filter $(suffix $(5)), .zip), @@ -614,7 +607,7 @@ python_version: ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,nsis,$(NSIS_DIR),$(NSIS_URL),$(NSIS_MD5_URL),$(notdir $(NSIS_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,nsis,$(NSIS_DIR),$(NSIS_URL),,$(notdir $(NSIS_URL)))) ifeq ($(shell [ -d "$(NSIS_DIR)" ] && $(ECHO) "exists"), exists) export NSIS := $(NSIS_DIR)/makensis @@ -638,7 +631,7 @@ endif ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,sdl,$(SDL_DIR),$(SDL_URL),$(SDL_MD5_URL),$(notdir $(SDL_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,sdl,$(SDL_DIR),$(SDL_URL),,$(notdir $(SDL_URL)))) ifeq ($(shell [ -d "$(SDL_DIR)" ] && $(ECHO) "exists"), exists) export SDL_DIR := $(SDL_DIR) @@ -661,7 +654,7 @@ endif ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),$(OPENSSL_MD5_URL),$(notdir $(OPENSSL_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),,$(notdir $(OPENSSL_URL)))) ifeq ($(shell [ -d "$(OPENSSL_DIR)" ] && $(ECHO) "exists"), exists) export OPENSSL := "$(OPENSSL_DIR)/bin/openssl" @@ -685,7 +678,7 @@ endif ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_DIR),$(UNCRUSTIFY_URL),$(UNCRUSTIFY_MD5_URL),$(notdir $(UNCRUSTIFY_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_DIR),$(UNCRUSTIFY_URL),,$(notdir $(UNCRUSTIFY_URL)))) else # Linux or Mac @@ -709,7 +702,7 @@ define UNCRUSTIFY_CLEAN_TEMPLATE -$(V1) [ ! -d "$(UNCRUSTIFY_DIR)" ] || $(RM) -rf "$(UNCRUSTIFY_DIR)" endef -$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_BUILD_DIR),$(UNCRUSTIFY_URL),$(UNCRUSTIFY_MD5_URL),$(notdir $(UNCRUSTIFY_URL)),$(UNCRUSTIFY_BUILD_TEMPLATE),$(UNCRUSTIFY_CLEAN_TEMPLATE))) +$(eval $(call TOOL_INSTALL_TEMPLATE,uncrustify,$(UNCRUSTIFY_BUILD_DIR),$(UNCRUSTIFY_URL),,$(notdir $(UNCRUSTIFY_URL)),$(UNCRUSTIFY_BUILD_TEMPLATE),$(UNCRUSTIFY_CLEAN_TEMPLATE))) endif @@ -733,7 +726,7 @@ uncrustify_version: ifeq ($(UNAME), Windows) -$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_DIR),$(DOXYGEN_URL),$(DOXYGEN_MD5_URL),$(notdir $(DOXYGEN_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_DIR),$(DOXYGEN_URL),,$(notdir $(DOXYGEN_URL)))) else # Linux or Mac @@ -757,7 +750,7 @@ define DOXYGEN_CLEAN_TEMPLATE -$(V1) [ ! -d "$(DOXYGEN_DIR)" ] || $(RM) -rf "$(DOXYGEN_DIR)" endef -$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_BUILD_DIR),$(DOXYGEN_URL),$(DOXYGEN_MD5_URL),$(notdir $(DOXYGEN_URL)),$(DOXYGEN_BUILD_TEMPLATE),$(DOXYGEN_CLEAN_TEMPLATE))) +$(eval $(call TOOL_INSTALL_TEMPLATE,doxygen,$(DOXYGEN_BUILD_DIR),$(DOXYGEN_URL),,$(notdir $(DOXYGEN_URL)),$(DOXYGEN_BUILD_TEMPLATE),$(DOXYGEN_CLEAN_TEMPLATE))) endif @@ -779,7 +772,7 @@ doxygen_version: # ############################## -$(eval $(call TOOL_INSTALL_TEMPLATE,gtest,$(GTEST_DIR),$(GTEST_URL),$(GTEST_MD5_URL),$(notdir $(GTEST_URL)))) +$(eval $(call TOOL_INSTALL_TEMPLATE,gtest,$(GTEST_DIR),$(GTEST_URL),,$(notdir $(GTEST_URL)))) export GTEST_DIR From f9f7b62f9d1cffa7bde131957ba2918990ee8958 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Tue, 29 Apr 2014 10:52:41 +0200 Subject: [PATCH 4/5] OP-1258 fix an issue with Windows package (root folder is missing in the zip file) --- make/tools.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 5b2bdf929..a246d7ab1 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -298,6 +298,7 @@ $(1)_install: $(1)_clean | $(DL_DIR) $(TOOLS_DIR) @$(ECHO) $(MSG_EXTRACTING) $$(call toprel, $(2)) $(V1) $(MKDIR) -p $$(call toprel, $(dir $(2))) + $(if $(filter $(suffix $(5)), .zip), $(V1) $(UNZIP) $(UNZIP_SILENT) -d $$(call toprel, $(dir $(2))) $$(call toprel, $(DL_DIR)/$(5)), $(V1) $(TAR) $(TAR_OPTIONS) -C $$(call toprel, $(dir $(2))) -xf $$(call toprel, $(DL_DIR)/$(5)) @@ -460,9 +461,13 @@ endef # ARM SDK # ############################## - +ifeq ($(UNAME), Windows) +#unfortunately zip package for this release is missing root directory, so adding / at the end of the path +# so that template interpret last part as directory and use the full path +$(eval $(call TOOL_INSTALL_TEMPLATE,arm_sdk,$(ARM_SDK_DIR)/,$(ARM_SDK_URL),$(ARM_SDK_MD5_URL),$(notdir $(ARM_SDK_URL)))) +else $(eval $(call TOOL_INSTALL_TEMPLATE,arm_sdk,$(ARM_SDK_DIR),$(ARM_SDK_URL),$(ARM_SDK_MD5_URL),$(notdir $(ARM_SDK_URL)))) - +endif ifeq ($(shell [ -d "$(ARM_SDK_DIR)" ] && $(ECHO) "exists"), exists) export ARM_SDK_PREFIX := $(ARM_SDK_DIR)/bin/arm-none-eabi- else @@ -478,7 +483,7 @@ arm_sdk_version: # Template to check ARM toolchain version before building targets define ARM_GCC_VERSION_CHECK_TEMPLATE if ! $(ARM_SDK_PREFIX)gcc --version --specs=nano.specs >/dev/null 2>&1; then \ - $(ECHO) $(MSG_NOTICE) Please install ARM toolchain 4.7+ using \'make arm_sdk_install\' && \ + $(ECHO) $(MSG_NOTICE) Please install ARM toolchain 4.8 2014q1 using \'make arm_sdk_install\' && \ $(ECHO) $(MSG_NOTICE) Older ARM SDKs do not support new \'--specs=nano.specs\' option && \ exit 1; \ fi From f1923c2361c11b91d158283c37bb5e5227bf7199 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Tue, 29 Apr 2014 10:53:22 +0200 Subject: [PATCH 5/5] OP-1258 fix an issue with all_sdk_install on windows (still pointing to deprecated targets) --- make/tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/tools.mk b/make/tools.mk index a246d7ab1..5771abf28 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -115,7 +115,7 @@ QT_SDK_PREFIX := $(QT_SDK_DIR) BUILD_SDK_TARGETS := arm_sdk qt_sdk ifeq ($(UNAME), Windows) - BUILD_SDK_TARGETS += mingw sdl python nsis openssl + BUILD_SDK_TARGETS += sdl nsis openssl endif ALL_SDK_TARGETS := $(BUILD_SDK_TARGETS) gtest uncrustify doxygen