make/Import.gmk

Print this page
rev 11055 : 8066589: Make importing sa-jdi.jar optional on its existance


 204 ################################################################################
 205 
 206 $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked: $(HOTSPOT_DIST)/lib/sa-jdi.jar \
 207     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 208         $(ECHO) $(LOG_INFO) Unzipping $(<F)
 209         $(RM) -r $(@D)
 210         $(MKDIR) -p $(@D)
 211         $(CD) $(@D) && $(UNZIP) $< -x META-INF/MANIFEST.MF $(LOG_DEBUG)
 212         # We must move the service provider file out of the way so that
 213         # Gensrc-jdk.jdi.gmk can combine them.
 214         $(MKDIR) -p $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent
 215         $(MV) $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector \
 216             $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 217         $(TOUCH) $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 218         $(TOUCH) $@
 219 
 220 # Declaring this dependency guarantees that _the.sa.services will be rebuilt
 221 # even if zip is already unpacked.
 222 $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services: $(HOTSPOT_DIST)/lib/sa-jdi.jar
 223 
 224 SA_TARGETS += $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked \



 225     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services


 226 
 227 ################################################################################
 228 
 229 ifeq ($(OPENJDK_TARGET_OS), windows)
 230   $(eval $(call SetupCopyFiles,BASE_COPY_LIBS_BIN, \
 231       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \
 232       DEST := $(JDK_OUTPUTDIR)/bin, \
 233       FILES := $(filter-out %.lib, $(BASE_TARGETS))))
 234 
 235   $(eval $(call SetupCopyFiles,BASE_COPY_LIBS_LIB, \
 236       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \
 237       DEST := $(JDK_OUTPUTDIR)/lib, \
 238       FILES := $(filter %.lib, $(BASE_TARGETS))))
 239 
 240   $(eval $(call SetupCopyFiles,SA_COPY_LIBS, \
 241       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent, \
 242       DEST := $(JDK_OUTPUTDIR)/lib, \
 243       FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent/%, \
 244           $(SA_TARGETS))))
 245 




 204 ################################################################################
 205 
 206 $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked: $(HOTSPOT_DIST)/lib/sa-jdi.jar \
 207     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 208         $(ECHO) $(LOG_INFO) Unzipping $(<F)
 209         $(RM) -r $(@D)
 210         $(MKDIR) -p $(@D)
 211         $(CD) $(@D) && $(UNZIP) $< -x META-INF/MANIFEST.MF $(LOG_DEBUG)
 212         # We must move the service provider file out of the way so that
 213         # Gensrc-jdk.jdi.gmk can combine them.
 214         $(MKDIR) -p $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent
 215         $(MV) $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/META-INF/services/com.sun.jdi.connect.Connector \
 216             $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 217         $(TOUCH) $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 218         $(TOUCH) $@
 219 
 220 # Declaring this dependency guarantees that _the.sa.services will be rebuilt
 221 # even if zip is already unpacked.
 222 $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services: $(HOTSPOT_DIST)/lib/sa-jdi.jar
 223 
 224 # Some platforms don't have the serviceability agent
 225 ifeq (, $(filter $(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), aix-ppc64))
 226   ifneq ($(JVM_VARIANT_ZERO), true)
 227     SA_TARGETS += $(JDK_OUTPUTDIR)/modules/jdk.hotspot.agent/_the.sa.jar.unpacked \
 228         $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/_the.sa.services
 229   endif
 230 endif
 231 
 232 ################################################################################
 233 
 234 ifeq ($(OPENJDK_TARGET_OS), windows)
 235   $(eval $(call SetupCopyFiles,BASE_COPY_LIBS_BIN, \
 236       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \
 237       DEST := $(JDK_OUTPUTDIR)/bin, \
 238       FILES := $(filter-out %.lib, $(BASE_TARGETS))))
 239 
 240   $(eval $(call SetupCopyFiles,BASE_COPY_LIBS_LIB, \
 241       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \
 242       DEST := $(JDK_OUTPUTDIR)/lib, \
 243       FILES := $(filter %.lib, $(BASE_TARGETS))))
 244 
 245   $(eval $(call SetupCopyFiles,SA_COPY_LIBS, \
 246       SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent, \
 247       DEST := $(JDK_OUTPUTDIR)/lib, \
 248       FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent/%, \
 249           $(SA_TARGETS))))
 250