Changeset 443

Timestamp:

Aug 25, 2016, 4:54:34 PM (9 years ago)

Author:

dmik

Message:

Adjust the makefiles to RPM/YUM UNIXROOT toolchain.

It should still be possible to build OpenJDK w/o RPM/YUM or
UNIXROOT by having manual configuration variable assigments
and binary tools installation but this setup is no longer
supported by us (and therefore all binary tools are
removed from SVN). Note that the RPM environment usually
contains much more recent versions of all utilities needed
for the build.

Location:

trunk

Files:

• env.cmd (modified) (3 diffs)
• openjdk/corba/make/common/shared/Defs-os2.gmk (modified) (1 diff)
• openjdk/corba/make/common/shared/Defs-utils.gmk (modified) (2 diffs)
• openjdk/jdk/make/common/shared/Defs-os2.gmk (modified) (1 diff)
• openjdk/jdk/make/common/shared/Defs-utils.gmk (modified) (2 diffs)
• tools/bin (deleted)

trunk/env.cmd

@@ -144 +144 @@
 
 /*
- * add SVN tools to PATH
- */
-call EnvAddFront 'PATH', ScriptDir'tools\bin'
-call EnvAddFront 'BEGINLIBPATH', ScriptDir'tools\bin'
-
-/*
  * add boot JDK tools to BEGINLIBPATH
  */
@@ -155 +149 @@
 
 /*
- * bash is required for the build
- */
-call EnvSet 'MAKESHELL', 'bash.exe'
+ * POSIX shell is required for the build (dash is recommended).
+ */
+call EnvSet 'MAKESHELL', 'sh.exe'
+
+/*
+ * Force English messages.
+ */
+call EnvSet 'LANG', 'en_US'
 
 /*
@@ -272 +271 @@
     end
     ExtraArgs = 'xcopy' build_path'\hotspot\import\jre\bin\client\*' build_path'\bin\client\'
-    aArgs = aArgs '&&' ExtraArgs 
+    aArgs = aArgs '&&' ExtraArgs
 end
 

trunk/openjdk/corba/make/common/shared/Defs-os2.gmk

@@ -84 +84 @@
   UNIXCOMMAND_PATH       :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
 else
-  # assume commands are in PATH
-  UNIXCOMMAND_PATH :=
+  ifdef UNIXROOT
+    # assume UNIXROOT is properly set (note: /bin is not used on OS/2)
+    UNIXCOMMAND_PATH := $(subst \,/,$(UNIXROOT)/usr/bin/)
+  else
+    # assume commands are in PATH
+    UNIXCOMMAND_PATH :=
+  endif
 endif
 UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
+
+# USRBIN_PATH: path to where the most common Unix commands are.
+#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
+ifdef ALT_USRBIN_PATH
+  xALT_USRBIN_PATH  :="$(subst \,/,$(ALT_USRBIN_PATH))"
+  fxALT_USRBIN_PATH :=$(call FullPath,$(xALT_USRBIN_PATH))
+  USRBIN_PATH       :=$(call PrefixPath,$(fxALT_USRBIN_PATH))
+else
+  ifdef UNIXROOT
+    # assume UNIXROOT is properly set
+    USRBIN_PATH := $(subst \,/,$(UNIXROOT)/usr/bin/)
+  else
+    # assume commands are in PATH
+    USRBIN_PATH :=
+  endif
+endif
+USRBIN_PATH:=$(call AltCheckSpaces,USRBIN_PATH)
 
 # SLASH_JAVA: location of all network accessable files

trunk/openjdk/corba/make/common/shared/Defs-utils.gmk

@@ -61 +61 @@
 endif
 
-ifeq ($(filter-out windows os2,$(PLATFORM)),)
+ifeq ($(PLATFORM),windows)
   UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
   UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
   UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
+  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
+ifeq ($(PLATFORM),os2)
+  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
   UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
 endif
@@ -160 +167 @@
 # OS/2 specific
 ifeq ($(PLATFORM),os2)
-  ECHO   = $(UNIXCOMMAND_PATH)echo -e
-  NAWK   = $(UNIXCOMMAND_PATH)awk
+  ECHO   = $(UTILS_COMMAND_PATH)echo -e
+  NAWK   = $(UTILS_COMMAND_PATH)awk
 endif
 

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

@@ -84 +84 @@
   UNIXCOMMAND_PATH       :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
 else
-  # assume commands are in PATH
-  UNIXCOMMAND_PATH :=
+  ifdef UNIXROOT
+    # assume UNIXROOT is properly set (note: /bin is not used on OS/2)
+    UNIXCOMMAND_PATH := $(subst \,/,$(UNIXROOT)/usr/bin/)
+  else
+    # assume commands are in PATH
+    UNIXCOMMAND_PATH :=
+  endif
 endif
 UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
+
+# USRBIN_PATH: path to where the most common Unix commands are.
+#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
+ifdef ALT_USRBIN_PATH
+  xALT_USRBIN_PATH  :="$(subst \,/,$(ALT_USRBIN_PATH))"
+  fxALT_USRBIN_PATH :=$(call FullPath,$(xALT_USRBIN_PATH))
+  USRBIN_PATH       :=$(call PrefixPath,$(fxALT_USRBIN_PATH))
+else
+  ifdef UNIXROOT
+    # assume UNIXROOT is properly set
+    USRBIN_PATH := $(subst \,/,$(UNIXROOT)/usr/bin/)
+  else
+    # assume commands are in PATH
+    USRBIN_PATH :=
+  endif
+endif
+USRBIN_PATH:=$(call AltCheckSpaces,USRBIN_PATH)
 
 # SLASH_JAVA: location of all network accessable files

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

@@ -61 +61 @@
 endif
 
-ifeq ($(filter-out windows os2,$(PLATFORM)),)
+ifeq ($(PLATFORM),windows)
   UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
   UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
   UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
+  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
+ifeq ($(PLATFORM),os2)
+  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
   UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
 endif
@@ -182 +189 @@
 # OS/2 specific
 ifeq ($(PLATFORM),os2)
-  ECHO   = $(UNIXCOMMAND_PATH)echo -e
-  NAWK   = $(UNIXCOMMAND_PATH)awk
+  ECHO   = $(UTILS_COMMAND_PATH)echo -e
+  NAWK   = $(UTILS_COMMAND_PATH)awk
 endif