1 #
   2 # Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
   3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4 #
   5 # This code is free software; you can redistribute it and/or modify it
   6 # under the terms of the GNU General Public License version 2 only, as
   7 # published by the Free Software Foundation.  Oracle designates this
   8 # particular file as subject to the "Classpath" exception as provided
   9 # by Oracle in the LICENSE file that accompanied this code.
  10 #
  11 # This code is distributed in the hope that it will be useful, but WITHOUT
  12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  13 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  14 # version 2 for more details (a copy is included in the LICENSE file that
  15 # accompanied this code).
  16 #
  17 # You should have received a copy of the GNU General Public License version
  18 # 2 along with this work; if not, write to the Free Software Foundation,
  19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  20 #
  21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  22 # or visit www.oracle.com if you need additional information or have any
  23 # questions.
  24 #
  25 
  26 default: all
  27 
  28 include $(SPEC)
  29 include MakeBase.gmk
  30 include Modules.gmk
  31 
  32 TOOL_TARGETS :=
  33 JDK_TARGETS :=
  34 JRE_TARGETS :=
  35 
  36 # Hook to include the corresponding custom file, if present.
  37 $(eval $(call IncludeCustomExtension, Images-pre.gmk))
  38 
  39 ############################################################################
  40 
  41 # All modules for the current target platform.
  42 ALL_MODULES := $(call FindAllModules)
  43 
  44 $(eval $(call ReadImportMetaData))
  45 
  46 JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
  47     $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
  48 JDK_MODULES += $(ALL_MODULES)
  49 
  50 # Modules list for compact builds
  51 JRE_COMPACT1_MODULES := \
  52     java.logging \
  53     java.scripting \
  54     jdk.localedata \
  55     jdk.crypto.cryptoki \
  56     jdk.crypto.ec \
  57     jdk.unsupported \
  58     #
  59 
  60 JRE_COMPACT2_MODULES := \
  61     $(JRE_COMPACT1_MODULES) \
  62     java.rmi \
  63     java.sql \
  64     java.xml \
  65     jdk.xml.dom \
  66     jdk.httpserver \
  67     #
  68 
  69 JRE_COMPACT3_MODULES := \
  70     $(JRE_COMPACT2_MODULES) \
  71     java.smartcardio \
  72     java.compiler \
  73     java.instrument \
  74     java.management \
  75     java.management.rmi \
  76     java.naming \
  77     java.prefs \
  78     java.security.jgss \
  79     java.security.sasl \
  80     java.sql.rowset \
  81     java.xml.crypto \
  82     jdk.management \
  83     jdk.naming.dns \
  84     jdk.naming.rmi \
  85     jdk.sctp \
  86     jdk.security.auth \
  87     #
  88 
  89 JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
  90 JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
  91 JRE_COMPACT1_MODULES_LIST := $(call CommaList, $(JRE_COMPACT1_MODULES))
  92 JRE_COMPACT2_MODULES_LIST := $(call CommaList, $(JRE_COMPACT2_MODULES))
  93 JRE_COMPACT3_MODULES_LIST := $(call CommaList, $(JRE_COMPACT3_MODULES))
  94 
  95 ################################################################################
  96 
  97 BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
  98 
  99 JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
 100 
 101 # Use this file inside the image as target for make rule
 102 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
 103 
 104 JLINK_ORDER_RESOURCES := **module-info.class
 105 JLINK_JLI_CLASSES :=
 106 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
 107   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/link_opt/classlist
 108   JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/link_opt/default_jli_trace.txt
 109 endif
 110 JLINK_ORDER_RESOURCES += \
 111     /java.base/java/** \
 112     /java.base/jdk/** \
 113     /java.base/sun/** \
 114     /java.base/com/** \
 115     /jdk.localedata/** \
 116     #
 117 
 118 JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
 119     --module-path $(IMAGES_OUTPUTDIR)/jmods \
 120     --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
 121     --release-info $(BASE_RELEASE_FILE) \
 122     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
 123     --dedup-legal-notices=error-if-not-same-content \
 124     $(JLINK_JLI_CLASSES) \
 125     #
 126 
 127 JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files --strip-debug
 128 
 129 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
 130   JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
 131 endif
 132 
 133 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 134     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
 135         $(ECHO) Creating jdk jimage
 136         $(RM) -r $(JDK_IMAGE_DIR)
 137         $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jdk, \
 138             $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
 139                 $(JLINK_JDK_EXTRA_OPTS) \
 140                 --output $(JDK_IMAGE_DIR) \
 141         )
 142         $(TOUCH) $@
 143 
 144 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 145     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
 146         $(ECHO) Creating jre jimage
 147         $(RM) -r $(JRE_IMAGE_DIR)
 148         $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre, \
 149             $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
 150                 $(JLINK_JRE_EXTRA_OPTS) \
 151                 --output $(JRE_IMAGE_DIR) \
 152         )
 153         $(TOUCH) $@
 154 
 155 
 156 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 157     $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
 158         $(ECHO) Creating jre compact1 jimage
 159         $(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
 160         $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact1, \
 161             $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
 162                 $(JLINK_JRE_EXTRA_OPTS) \
 163                 --output $(JRE_COMPACT1_IMAGE_DIR) \
 164         )
 165         $(TOUCH) $@
 166 
 167 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 168     $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
 169         $(ECHO) Creating jre compact2 jimage
 170         $(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
 171         $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact2, \
 172             $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
 173                 $(JLINK_JRE_EXTRA_OPTS) \
 174                 --output $(JRE_COMPACT2_IMAGE_DIR) \
 175         )
 176         $(TOUCH) $@
 177 
 178 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 179     $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
 180         $(ECHO) Creating jre compact3 jimage
 181         $(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
 182         $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact3, \
 183             $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
 184                 $(JLINK_JRE_EXTRA_OPTS) \
 185                 --output $(JRE_COMPACT3_IMAGE_DIR) \
 186         )
 187         $(TOUCH) $@
 188 
 189 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 190 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 191 TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 192 TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 193 TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 194 
 195 ################################################################################
 196 # /man dir
 197 #
 198 # All variables in this section are assigned with simple =, without :, to enable
 199 # more selective overriding from the custom version of this file.
 200 #
 201 # Avoid evaluating this whole section on windows for speed and stability
 202 ifneq ($(OPENJDK_TARGET_OS), windows)
 203   JRE_MAN_PAGES += \
 204       java.1 \
 205       jjs.1 \
 206       keytool.1 \
 207       orbd.1 \
 208       pack200.1 \
 209       rmid.1 \
 210       rmiregistry.1 \
 211       servertool.1 \
 212       unpack200.1
 213 
 214   JDK_MAN_PAGES += \
 215       $(JRE_MAN_PAGES) \

 216       idlj.1 \
 217       jar.1 \
 218       jarsigner.1 \
 219       javac.1 \
 220       javadoc.1 \
 221       javap.1 \
 222       jconsole.1 \
 223       jcmd.1 \
 224       jdb.1 \
 225       jdeps.1 \
 226       jinfo.1 \
 227       jmap.1 \
 228       jps.1 \
 229       jrunscript.1 \
 230       jstack.1 \
 231       jstat.1 \
 232       jstatd.1 \
 233       rmic.1 \
 234       serialver.1
 235 
 236   # This variable is potentially overridden in the closed makefile.
 237   MAN_SRC_BASEDIR ?= $(TOPDIR)/src
 238 
 239   ifeq ($(OPENJDK_TARGET_OS), linux)
 240     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
 241     MAN1_SUBDIR = man
 242   endif
 243   ifeq ($(OPENJDK_TARGET_OS), solaris)
 244     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
 245     MAN1_SUBDIR = sun/man/man1
 246   endif
 247   ifeq ($(OPENJDK_TARGET_OS), macosx)
 248     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
 249     MAN1_SUBDIR = man
 250   endif
 251 
 252   $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
 253         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
 254         $(install-file)
 255 
 256   $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
 257         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
 258         $(install-file)
 259 
 260   $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
 261         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
 262         $(install-file)
 263 
 264   $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
 265         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
 266         $(install-file)
 267 
 268   ifeq ($(OPENJDK_TARGET_OS), solaris)
 269     $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
 270         $(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@))
 271         $(install-file)
 272 
 273     $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
 274         $(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@))
 275         $(install-file)
 276   endif
 277 
 278   ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
 279     $(JRE_IMAGE_DIR)/man/ja:
 280         $(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@))
 281         $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
 282 
 283     $(JDK_IMAGE_DIR)/man/ja:
 284         $(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@))
 285         $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
 286   endif
 287 
 288   ifeq ($(OPENJDK_TARGET_OS), solaris)
 289     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
 290         $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
 291         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
 292         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
 293 
 294     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
 295         $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
 296         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
 297         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
 298   endif
 299 
 300   ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
 301     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
 302         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
 303         $(JRE_IMAGE_DIR)/man/ja
 304 
 305     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
 306         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
 307         $(JDK_IMAGE_DIR)/man/ja
 308   endif
 309 
 310   JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
 311   JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
 312 endif # Windows
 313 
 314 ################################################################################
 315 # src.zip
 316 
 317 $(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
 318         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
 319         $(install-file)
 320 
 321 JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip
 322 
 323 ################################################################################
 324 # /demo dir
 325 # Avoid doing the expensive find unless called with "jdk" as target.
 326 ifneq ($(filter jdk, $(MAKECMDGOALS)), )
 327 
 328   DEMO_FILES := \
 329       $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
 330         $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
 331             -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
 332       )
 333 
 334   ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
 335     ifeq ($(OPENJDK_TARGET_OS), macosx)
 336       DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES))
 337     else
 338       DEMO_FILES := $(filter-out %.debuginfo %.pdb %.map, $(DEMO_FILES))
 339     endif
 340   endif
 341 
 342   $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
 343       SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
 344       DEST := $(JDK_IMAGE_DIR)/demo, \
 345       FILES := $(DEMO_FILES), \
 346   ))
 347 
 348   JDK_TARGETS += $(JDK_COPY_DEMOS)
 349 endif
 350 
 351 ################################################################################
 352 # Code coverage data files
 353 
 354 ifeq ($(GCOV_ENABLED), true)
 355 
 356   GCOV_FIND_EXPR := -type f -name "*.gcno"
 357 
 358   $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
 359       SRC := $(OUTPUTDIR), \
 360       DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
 361       FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
 362 
 363   SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
 364 
 365   $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
 366       SRC := $(OUTPUTDIR), \
 367       DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
 368       FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
 369 
 370   SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
 371 
 372 endif
 373 
 374 ################################################################################
 375 # Debug symbols
 376 # Since debug symbols are not included in the jmod files, they need to be copied
 377 # in manually after generating the images.
 378 
 379 ALL_JDK_MODULES := $(JDK_MODULES)
 380 ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
 381     $(call FindTransitiveDepsForModule, $m)))
 382 
 383 ifeq ($(OPENJDK_TARGET_OS), windows)
 384   LIBS_TARGET_SUBDIR := bin
 385 else
 386   LIBS_TARGET_SUBDIR := lib
 387 endif
 388 
 389 # Param 1 - dir to find debuginfo files in
 390 FindDebuginfoFiles = \
 391     $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
 392         $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
 393         $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
 394 
 395 # Pick the correct debug info files to copy, either zipped or not.
 396 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
 397   DEBUGINFO_SUFFIXES += .diz
 398 else
 399   DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
 400   # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
 401   # dirs.
 402   ifeq ($(OPENJDK_TARGET_OS), macosx)
 403     $(eval $(call FillCacheFind, \
 404         $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
 405     FindDebuginfoFiles = \
 406         $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
 407   endif
 408 endif
 409 
 410 # Param 1 - either JDK or JRE
 411 SetupCopyDebuginfo = \
 412     $(foreach m, $(ALL_$1_MODULES), \
 413       $(eval $(call SetupCopyFiles, COPY_$1_LIBS_DEBUGINFO_$m, \
 414           SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$m, \
 415           DEST := $($1_IMAGE_DIR)/$(LIBS_TARGET_SUBDIR), \
 416           FILES := $(call FindDebuginfoFiles, \
 417               $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
 418       )) \
 419       $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
 420     )
 421 
 422 # No space before argument to avoid having to put $(strip ) everywhere in
 423 # implementation above.
 424 $(call SetupCopyDebuginfo,JDK)
 425 $(call SetupCopyDebuginfo,JRE)
 426 
 427 ################################################################################
 428 
 429 # Include custom post hook here to make it possible to augment the target lists
 430 # before actual target prerequisites are declared.
 431 $(eval $(call IncludeCustomExtension, Images-post.gmk))
 432 
 433 ################################################################################
 434 
 435 $(JRE_TARGETS): $(TOOL_JRE_TARGETS)
 436 $(JDK_TARGETS): $(TOOL_JDK_TARGETS)
 437 
 438 jdk: $(TOOL_JDK_TARGETS) $(JDK_TARGETS)
 439 jre: $(TOOL_JRE_TARGETS) $(JRE_TARGETS)
 440 symbols: $(SYMBOLS_TARGETS)
 441 
 442 all: jdk jre symbols
 443 
 444 $(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS)
 445 $(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS)
 446 $(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS)
 447 
 448 profiles: $(TOOL_JRE_COMPACT1_TARGETS) \
 449     $(TOOL_JRE_COMPACT2_TARGETS) \
 450     $(TOOL_JRE_COMPACT3_TARGETS) \
 451     $(JRE_COMPACT1_TARGETS) \
 452     $(JRE_COMPACT2_TARGETS) \
 453     $(JRE_COMPACT3_TARGETS)
 454 
 455 .PHONY: default all jdk jre symbols profiles
--- EOF ---