equal
deleted
inserted
replaced
105 ZIP_VER :=$(call GetVersion,"$(_ZIP_VER)") |
105 ZIP_VER :=$(call GetVersion,"$(_ZIP_VER)") |
106 UNZIP_VER :=$(call GetVersion,"$(_UNZIP_VER)") |
106 UNZIP_VER :=$(call GetVersion,"$(_UNZIP_VER)") |
107 BOOT_VER :=$(call GetVersion,"$(_BOOT_VER)") |
107 BOOT_VER :=$(call GetVersion,"$(_BOOT_VER)") |
108 |
108 |
109 REQUIRED_ANT_VER := 1.6.3 |
109 REQUIRED_ANT_VER := 1.6.3 |
110 ifeq ($(ANT_HOME),) |
110 _ANT_VER:=$(shell $(ANT) -version 2>&1 ) |
111 _ANT_VER:=$(shell JAVACMD="$(BOOTDIR)/bin/java" $(ANT) -version 2>&1 ) |
|
112 else |
|
113 _ANT_VER:=$(shell JAVACMD="$(BOOTDIR)/bin/java" ANT_HOME="$(ANT_HOME)" $(ANT) -version 2>&1 ) |
|
114 endif |
|
115 ANT_VER:=$(call GetVersion,"$(_ANT_VER)") |
111 ANT_VER:=$(call GetVersion,"$(_ANT_VER)") |
116 |
112 |
117 ifdef ALT_BINDIR |
113 ifdef ALT_BINDIR |
118 ALT_BINDIR_VERSION := $(shell $(ALT_BINDIR)/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }') |
114 ALT_BINDIR_VERSION := $(shell $(ALT_BINDIR)/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }') |
119 ALT_BINDIR_OK := $(shell $(ECHO) $(ALT_BINDIR_VERSION) | $(EGREP) -c '^$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)') |
115 ALT_BINDIR_OK := $(shell $(ECHO) $(ALT_BINDIR_VERSION) | $(EGREP) -c '^$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)') |