Project

General

Profile

Issue #1317 ยป add-1.8-to-javac-correct-version-check.patch

My Self, 08/22/2015 02:30 PM

View differences:

core/main.mk
121 121
endif
122 122

  
123 123
# Check for the correct version of javac
124
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.[67][\. "$$]')
124
javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.[678][\. "$$]')
125 125
ifeq ($(strip $(javac_version)),)
126 126
$(info ************************************************************)
127 127
$(info You are attempting to build with the incorrect version)
128 128
$(info of javac.)
129 129
$(info $(space))
130 130
$(info Your version is: $(shell javac -version 2>&1 | head -n 1).)
131
$(info The correct version is: 1.6 or 1.7.)
131
$(info The correct version is: 1.6, 1.7 or 1.8.)
132 132
$(info ************************************************************)
133 133
$(error stop)
134 134
endif
    (1-1/1)