Changeset 9 for trunk

Timestamp:

Jun 8, 2010, 2:28:40 PM (15 years ago)

Author:

dmik

Message:

make/defs: Make sure GetVersion returns for a string that doesn't contain the X.Y pattern to avoid bash errors complaining that the argument to [ is not integer.

File:

• trunk/openjdk/jdk/make/common/shared/Defs.gmk (modified) (6 diffs)

trunk/openjdk/jdk/make/common/shared/Defs.gmk

@@ -59 +59 @@
 endef
 
-# Checks an ALT value for spaces (should be one word), 
+# Checks an ALT value for spaces (should be one word),
 #       warns and returns Check_ALT_$1 if spaces
 define AltCheckSpaces
@@ -116 +116 @@
 # Given a line of text, get the major.minor version number from it
 define GetVersion
-$(shell echo $1 | sed -e 's@[^1-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*@\1@' )
+$(shell echo $1 | sed -ne 's@[^1-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*@\1@p')
 endef
 
@@ -291 +291 @@
 #
 #  Recommended setting: 2 seems to be ideal for single cpu machines,
-#                       2 times the number of CPU's is a basic formula, 
-#                       but probably not more than 4 if the machine is 
-#                       being shared by others, or the machine is limited 
+#                       2 times the number of CPU's is a basic formula,
+#                       but probably not more than 4 if the machine is
+#                       being shared by others, or the machine is limited
 #                       in RAM or swap.
 #
@@ -411 +411 @@
 endif
 
-# CACERTS_FILE: if OPENJDK is false and the internal version of the file 
-#               (that is, non-empty) is available, use it, otherwise use an 
+# CACERTS_FILE: if OPENJDK is false and the internal version of the file
+#               (that is, non-empty) is available, use it, otherwise use an
 #               empty keystore.
 #
@@ -465 +465 @@
 #   NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
 BINDIR      = $(OUTPUTDIR)/bin$(ISA_DIR)
-  
+
 # MOZILLA_HEADERS_PATH: path to mozilla header files for plugin
 ifdef ALT_MOZILLA_HEADERS_PATH
@@ -481 +481 @@
      CUPS_HEADERS_PATH:=$(call FullPath,$(ALT_CUPS_HEADERS_PATH))
      CUPS_HEADERS_PATH:=$(call AltCheckValue,CUPS_HEADERS_PATH)
-  else 
+  else
     CUPS_HEADERS_PATH:= \
       $(shell if [ -d "$(JDK_CUPS_HEADERS_PATH)" ]; then \