make/common/Defs.gmk

*** 1,7 ****
  #
! # Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 107,127 ****
    ifndef CLOSED_SHARE_SRC
      CLOSED_SHARE_SRC    = $(CLOSED_SRC)/share
    endif
  endif
  
  #
! # Get platform definitions
! #
  
! include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM).gmk
  
  #
! # SE-Embedded support, if enabled
  #
  
! include $(JDK_TOPDIR)/make/common/Defs-embedded.gmk
  
  #
  # Cross-compilation Settings
  #
  ifdef CROSS_COMPILE_ARCH
--- 107,139 ----
    ifndef CLOSED_SHARE_SRC
      CLOSED_SHARE_SRC    = $(CLOSED_SRC)/share
    endif
  endif
  
+ # We allow for potential specialization of build files. This has to be
+ # done on a file-by-file, case-by-case basis. Here we define the basic control
+ # over where custom files are being used. Later we will include the custom
+ # Defs.gmk if necessary. Other files can follow a similar pattern as needed.
  #
! # For non-OpenJDK builds the default location is the make/closed repository.
! # For OpenJDK builds a real value has to be supplied externally.
  
! ifneq ($(OPENJDK),true)
!   CUSTOM_MAKE_DIR_REL=closed
! else
!   CUSTOM_MAKE_DIR_REL=NO_SUCH_PATH
! endif
! CUSTOM_MAKE_DIR=$(BUILDDIR)/$(CUSTOM_MAKE_DIR_REL)
  
+ # Use this variable to guard inclusion of the custom files
+ HAS_CUSTOM_MAKE := $(shell if [ -d $(CUSTOM_MAKE_DIR) ]; then echo 1; else echo 0; fi)
+ 
  #
! # Get platform definitions
  #
  
! include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM).gmk
  
  #
  # Cross-compilation Settings
  #
  ifdef CROSS_COMPILE_ARCH
*** 541,552 ****
    COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)
  else
    COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
  endif
  
! ifndef OPENJDK
! include $(JDK_TOPDIR)/make/closed/common/Defs.gmk
  endif
  
  # Install of imported file (JDK_IMPORT_PATH, or some other external location)
  define install-importonly-file
  @$(ECHO) "ASSEMBLY_IMPORT: $@"
--- 553,565 ----
    COPYRIGHT_YEAR = $(ALT_COPYRIGHT_YEAR)
  else
    COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
  endif
  
! # "Legacy" usage of the custom make repository
! ifeq ($(HAS_CUSTOM_MAKE),1)
!   include $(CUSTOM_MAKE_DIR)/common/Defs.gmk
  endif
  
  # Install of imported file (JDK_IMPORT_PATH, or some other external location)
  define install-importonly-file
  @$(ECHO) "ASSEMBLY_IMPORT: $@"
*** 568,573 ****
--- 581,590 ----
  
  define install-import-file
  $(install-importonly-file)
  endef
  
+ ifeq ($(HAS_CUSTOM_MAKE),1)
+   include $(CUSTOM_MAKE_DIR)/Defs.gmk
+ endif
+ 
  .PHONY: all build clean clobber