Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/Images.gmk
branchhttp-client-branch
changeset 56255 39e28481492d
parent 48912 01237b276b8b
child 49886 22d36f1c0994
child 50002 4fad1003357f
equal deleted inserted replaced
56254:4b2272dfe720 56255:39e28481492d 
     1 #
 
     1 #
 
     2 # Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 
     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.
 
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
     4 #
 
     4 #
 
     5 # This code is free software; you can redistribute it and/or modify it
 
     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
 
     6 # under the terms of the GNU General Public License version 2 only, as
 
     7 # published by the Free Software Foundation.  Oracle designates this
 
     7 # published by the Free Software Foundation.  Oracle designates this
 
    45 
    45 
    46 JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
 
    46 JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
 
    47     $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 
    47     $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 
    48 JDK_MODULES += $(ALL_MODULES)
 
    48 JDK_MODULES += $(ALL_MODULES)
 
    49 
    49 
    50 # Modules list for compact builds 
    50 # Modules list for compact builds
 
    51 JRE_COMPACT1_MODULES := \
 
    51 JRE_COMPACT1_MODULES := \
 
    52     java.logging \
 
    52     java.logging \
 
    53     java.scripting \
 
    53     java.scripting \
 
    54     jdk.localedata \
 
    54     jdk.localedata \
 
    55     jdk.crypto.cryptoki \
 
    55     jdk.crypto.cryptoki \
 
   132 
   132 
   133 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   133 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   134     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   134     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   135 	$(ECHO) Creating jdk jimage
 
   135 	$(ECHO) Creating jdk jimage
 
   136 	$(RM) -r $(JDK_IMAGE_DIR)
 
   136 	$(RM) -r $(JDK_IMAGE_DIR)
 
   137 	$(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
 
   137 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jdk, \
 
   138 	    $(JLINK_JDK_EXTRA_OPTS) \
 
   138 	    $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
 
   139 	    --output $(JDK_IMAGE_DIR)
 
   139 	        $(JLINK_JDK_EXTRA_OPTS) \
 
       
   140 	        --output $(JDK_IMAGE_DIR) \
 
       
   141 	)
 
   140 	$(TOUCH) $@
 
   142 	$(TOUCH) $@
 
   141 
   143 
   142 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   144 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   143     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   145     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   144 	$(ECHO) Creating jre jimage
 
   146 	$(ECHO) Creating jre jimage
 
   145 	$(RM) -r $(JRE_IMAGE_DIR)
 
   147 	$(RM) -r $(JRE_IMAGE_DIR)
 
   146 	$(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
 
   148 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre, \
 
   147 	    $(JLINK_JRE_EXTRA_OPTS) \
 
   149 	    $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
 
   148 	    --output $(JRE_IMAGE_DIR)
 
   150 	        $(JLINK_JRE_EXTRA_OPTS) \
 
       
   151 	        --output $(JRE_IMAGE_DIR) \
 
       
   152 	)
 
   149 	$(TOUCH) $@
 
   153 	$(TOUCH) $@
 
   150 
   154 
   151 
   155 
   152 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   156 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   153     $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   157     $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   154 	$(ECHO) Creating jre compact1 jimage
 
   158 	$(ECHO) Creating jre compact1 jimage
 
   155 	$(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
 
   159 	$(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
 
   156 	$(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
 
   160 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact1, \
 
   157 	    $(JLINK_JRE_EXTRA_OPTS) \
 
   161 	    $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
 
   158 	    --output $(JRE_COMPACT1_IMAGE_DIR)
 
   162 	        $(JLINK_JRE_EXTRA_OPTS) \
 
       
   163 	        --output $(JRE_COMPACT1_IMAGE_DIR) \
 
       
   164 	)
 
   159 	$(TOUCH) $@
 
   165 	$(TOUCH) $@
 
   160 
   166 
   161 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   167 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   162     $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   168     $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   163 	$(ECHO) Creating jre compact2 jimage
 
   169 	$(ECHO) Creating jre compact2 jimage
 
   164 	$(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
 
   170 	$(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
 
   165 	$(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
 
   171 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact2, \
 
   166 	    $(JLINK_JRE_EXTRA_OPTS) \
 
   172 	    $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
 
   167 	    --output $(JRE_COMPACT2_IMAGE_DIR)
 
   173 	        $(JLINK_JRE_EXTRA_OPTS) \
 
       
   174 	        --output $(JRE_COMPACT2_IMAGE_DIR) \
 
       
   175 	)
 
   168 	$(TOUCH) $@
 
   176 	$(TOUCH) $@
 
   169 
   177 
   170 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   178 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
 
   171     $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   179     $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
 
   172 	$(ECHO) Creating jre compact3 jimage
 
   180 	$(ECHO) Creating jre compact3 jimage
 
   173 	$(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
 
   181 	$(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
 
   174 	$(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
 
   182 	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact3, \
 
   175 	    $(JLINK_JRE_EXTRA_OPTS) \
 
   183 	    $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
 
   176 	    --output $(JRE_COMPACT3_IMAGE_DIR)
 
   184 	        $(JLINK_JRE_EXTRA_OPTS) \
 
       
   185 	        --output $(JRE_COMPACT3_IMAGE_DIR) \
 
       
   186 	)
 
   177 	$(TOUCH) $@
 
   187 	$(TOUCH) $@
 
   178 
   188 
   179 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 
   189 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 
   180 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 
   190 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 
   181 TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 
   191 TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 
   197       orbd.1 \
 
   207       orbd.1 \
 
   198       pack200.1 \
 
   208       pack200.1 \
 
   199       rmid.1 \
 
   209       rmid.1 \
 
   200       rmiregistry.1 \
 
   210       rmiregistry.1 \
 
   201       servertool.1 \
 
   211       servertool.1 \
 
   202       tnameserv.1 \
 
       
   203       unpack200.1
 
   212       unpack200.1
 
   204 
   213 
   205   JDK_MAN_PAGES += \
 
   214   JDK_MAN_PAGES += \
 
   206       $(JRE_MAN_PAGES) \
 
   215       $(JRE_MAN_PAGES) \
 
   207       appletviewer.1 \
 
   216       appletviewer.1 \
 
   221       jrunscript.1 \
 
   230       jrunscript.1 \
 
   222       jstack.1 \
 
   231       jstack.1 \
 
   223       jstat.1 \
 
   232       jstat.1 \
 
   224       jstatd.1 \
 
   233       jstatd.1 \
 
   225       rmic.1 \
 
   234       rmic.1 \
 
   226       schemagen.1 \
 
   235       serialver.1
 
   227       serialver.1 \
 
       
   228       wsgen.1 \
 
       
   229       wsimport.1 \
 
       
   230       xjc.1
 
       
   231 
   236 
   232   # This variable is potentially overridden in the closed makefile.
 
   237   # This variable is potentially overridden in the closed makefile.
 
   233   MAN_SRC_BASEDIR ?= $(TOPDIR)/src
 
   238   MAN_SRC_BASEDIR ?= $(TOPDIR)/src
 
   234 
   239 
   235   ifeq ($(OPENJDK_TARGET_OS), linux)
 
   240   ifeq ($(OPENJDK_TARGET_OS), linux)
jdk-sandbox