make/bsd/makefiles/vm.make

Print this page
rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn


  55 Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
  56 VPATH += $(Src_Dirs_V:%=%:)
  57 
  58 # set INCLUDES for C preprocessor.
  59 Src_Dirs_I += $(GENERATED)
  60 # The order is important for the precompiled headers to work.
  61 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
  62 
  63 # SYMFLAG is used by {jsig,saproc}.make
  64 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  65   # always build with debug info when we can create .dSYM/.debuginfo files
  66   SYMFLAG = -g
  67 else
  68   ifeq (${VERSION}, debug)
  69     SYMFLAG = -g
  70   else
  71     SYMFLAG =
  72   endif
  73 endif
  74 
  75 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
  76 # in $(GAMMADIR)/make/defs.make
  77 ifeq ($(HOTSPOT_BUILD_VERSION),)
  78   BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)\""
  79 else
  80   BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)\""
  81 endif
  82 
  83 # The following variables are defined in the generated flags.make file.
  84 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\""
  85 JRE_VERSION   = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""





  86 HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
  87 BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
  88 BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
  89 VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
  90 
  91 CXXFLAGS =           \
  92   ${SYSDEFS}         \
  93   ${INCLUDES}        \
  94   ${BUILD_VERSION}   \
  95   ${BUILD_TARGET}    \
  96   ${BUILD_USER}      \
  97   ${HS_LIB_ARCH}     \
  98   ${VM_DISTRO}
  99 
 100 # This is VERY important! The version define must only be supplied to vm_version.o
 101 # If not, ccache will not re-use the cache at all, since the version string might contain
 102 # a time and date.
 103 CXXFLAGS/vm_version.o += ${JRE_VERSION}
 104 
 105 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 106 
 107 # File specific flags
 108 CXXFLAGS += $(CXXFLAGS/BYFILE)
 109 
 110 ifdef DEFAULT_LIBPATH
 111 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
 112 endif
 113 
 114 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 115 CFLAGS += $(CFLAGS_WARN/BYFILE)
 116 
 117 # Do not use C++ exception handling
 118 CFLAGS += $(CFLAGS/NOEX)
 119 
 120 # Extra flags from gnumake's invocation or environment
 121 CFLAGS += $(EXTRA_CFLAGS)
 122 LFLAGS += $(EXTRA_CFLAGS)
 123 




  55 Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
  56 VPATH += $(Src_Dirs_V:%=%:)
  57 
  58 # set INCLUDES for C preprocessor.
  59 Src_Dirs_I += $(GENERATED)
  60 # The order is important for the precompiled headers to work.
  61 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
  62 
  63 # SYMFLAG is used by {jsig,saproc}.make
  64 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
  65   # always build with debug info when we can create .dSYM/.debuginfo files
  66   SYMFLAG = -g
  67 else
  68   ifeq (${VERSION}, debug)
  69     SYMFLAG = -g
  70   else
  71     SYMFLAG =
  72   endif
  73 endif
  74 








  75 # The following variables are defined in the generated flags.make file.
  76 JDK_VER_DEFS  = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \
  77                 -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \
  78                 -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \
  79                 -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\""
  80 VM_VER_DEFS   = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \
  81                 -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""  \
  82                 $(JDK_VER_DEFS)
  83 HS_LIB_ARCH   = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
  84 BUILD_TARGET  = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
  85 BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
  86 VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
  87 
  88 CXXFLAGS =           \
  89   ${SYSDEFS}         \
  90   ${INCLUDES}        \

  91   ${BUILD_TARGET}    \
  92   ${BUILD_USER}      \
  93   ${HS_LIB_ARCH}     \
  94   ${VM_DISTRO}
  95 
  96 # This is VERY important! The version define must only be supplied to vm_version.o
  97 # If not, ccache will not re-use the cache at all, since the version string might contain
  98 # a time and date.
  99 CXXFLAGS/vm_version.o += ${VM_VER_DEFS}
 100 
 101 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 102 
 103 # File specific flags
 104 CXXFLAGS += $(CXXFLAGS/BYFILE)
 105 
 106 ifdef DEFAULT_LIBPATH
 107 CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
 108 endif
 109 
 110 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
 111 CFLAGS += $(CFLAGS_WARN/BYFILE)
 112 
 113 # Do not use C++ exception handling
 114 CFLAGS += $(CFLAGS/NOEX)
 115 
 116 # Extra flags from gnumake's invocation or environment
 117 CFLAGS += $(EXTRA_CFLAGS)
 118 LFLAGS += $(EXTRA_CFLAGS)
 119