From 7ca788afcab731bc5b146e2532480f0ddae6860e Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Mon, 10 Sep 2018 09:29:21 +0200
Subject: [PATCH] Update on Makefile for sorting value
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 064a94992a..8a50618501 100755
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ ifeq "$(GRADLE)" ""
GRADLE = false && echo >/dev/null
else
GRADLE_VERSION := $(shell $(GRADLE) --version | grep "^Gradle" | awk '{print $$2}')
- GRADLE_VERSION_MIN := $(shell printf "%s\n%s\n" "$(GRADLE_VERSION_NEEDED)" "$(GRADLE_VERSION)" | sort -V 2>/dev/null | head -n1)
+ GRADLE_VERSION_MIN := $(shell printf "%s\n%s\n" "$(GRADLE_VERSION_NEEDED)" "$(GRADLE_VERSION)"|sort -n 2>/dev/null|head -n1)
ifneq "$(GRADLE_VERSION_NEEDED)" "$(GRADLE_VERSION_MIN)"
ERROR_MSG = echo "$(COLOR)Gradle $(GRADLE_VERSION) is too old. Needs at least $(GRADLE_VERSION_NEEDED). Falling back to regular javac command...\n$(RESET)"
GRADLE = false && echo >/dev/null
@@ -124,7 +124,7 @@ all: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse r
ttool: $(TTOOL_BINARY)
$(TTOOL_BINARY): FORCE
- @($(GRADLE) :ttool:build) || ($(ERROR_MSG) && $(MAKE) -C $(TTOOL_DIR) -e $@)
+ @($(GRADLE) :ttool:build) || ($(ERROR_MSG) $(GRADLE_VERSION) $(GRADLE_VERSION_NEEDED)&& $(MAKE) -C $(TTOOL_DIR) -e $@)
ttooljavac:
$(MAKE) -C $(TTOOL_DIR)
--
GitLab