Skip to content
Snippets Groups Projects
Commit 7ca788af authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Update on Makefile for sorting value

parent 3a22dcde
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ ifeq "$(GRADLE)" "" ...@@ -14,7 +14,7 @@ ifeq "$(GRADLE)" ""
GRADLE = false && echo >/dev/null GRADLE = false && echo >/dev/null
else else
GRADLE_VERSION := $(shell $(GRADLE) --version | grep "^Gradle" | awk '{print $$2}') 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)" 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)" 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 GRADLE = false && echo >/dev/null
...@@ -124,7 +124,7 @@ all: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse r ...@@ -124,7 +124,7 @@ all: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse r
ttool: $(TTOOL_BINARY) ttool: $(TTOOL_BINARY)
$(TTOOL_BINARY): FORCE $(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: ttooljavac:
$(MAKE) -C $(TTOOL_DIR) $(MAKE) -C $(TTOOL_DIR)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment