tg_javav.mk (7871dc3e) tg_javav.mk (86e1cf34)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 24 unchanged lines hidden (view full) ---

33JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
34JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
35
36# that's the version known by the specific
37# java version
38JAVAVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSVERSION_CMD))
39
40# and a computed integer for comparing
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 24 unchanged lines hidden (view full) ---

33JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
34JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
35
36# that's the version known by the specific
37# java version
38JAVAVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSVERSION_CMD))
39
40# and a computed integer for comparing
41# each point seperated token blown up to 4 digits
41# each point separated token blown up to 4 digits
42JAVANUMVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSNUMVERSION_CMD))
43
44.ELSE # "$(SOLAR_JAVA)"!=""
45JAVAVER=0.0.0
46JAVANUMVER=000000000000
47.ENDIF # "$(SOLAR_JAVA)"!=""
48.ENDIF # "$(L10N_framework)"==""
49.ENDIF # "$(JAVAVER)"=="" || "$(JAVALOCATION)"!="$(JAVA_HOME)"
42JAVANUMVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSNUMVERSION_CMD))
43
44.ELSE # "$(SOLAR_JAVA)"!=""
45JAVAVER=0.0.0
46JAVANUMVER=000000000000
47.ENDIF # "$(SOLAR_JAVA)"!=""
48.ENDIF # "$(L10N_framework)"==""
49.ENDIF # "$(JAVAVER)"=="" || "$(JAVALOCATION)"!="$(JAVA_HOME)"