< prev index next >

make/ModuleWrapper.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2014, 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) 2014, 2016, 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
*** 43,88 **** # Setup copy rules from the modules directories to the jdk image directory. ifeq ($(OPENJDK_TARGET_OS), windows) TO_BIN_FILTER := %$(SHARED_LIBRARY_SUFFIX) %.diz %.pdb %.map ! $(eval $(call SetupCopyFiles,COPY_LIBS_TO_BIN, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/bin, \ FILES := $(filter $(TO_BIN_FILTER), \ $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS))))) ! $(eval $(call SetupCopyFiles,COPY_LIBS_TO_LIB, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/lib, \ FILES := $(filter-out $(TO_BIN_FILTER), \ $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS))))) else ! $(eval $(call SetupCopyFiles,COPY_LIBS_TO_LIB, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/lib, \ ! FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS)))) endif ! $(eval $(call SetupCopyFiles,COPY_INCLUDE, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/include, \ FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)/%, \ ! $(TARGETS)))) ! $(eval $(call SetupCopyFiles,COPY_CMDS, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/bin, \ ! FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/%, $(TARGETS)))) ! $(eval $(call SetupCopyFiles,COPY_CONF, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/conf, \ FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)/%, \ ! $(TARGETS)))) all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \ ! $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) --- 43,103 ---- # Setup copy rules from the modules directories to the jdk image directory. ifeq ($(OPENJDK_TARGET_OS), windows) TO_BIN_FILTER := %$(SHARED_LIBRARY_SUFFIX) %.diz %.pdb %.map ! $(eval $(call SetupCopyFiles, COPY_LIBS_TO_BIN, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/bin, \ FILES := $(filter $(TO_BIN_FILTER), \ $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS))), \ ! )) ! $(eval $(call SetupCopyFiles, COPY_LIBS_TO_LIB, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/lib, \ FILES := $(filter-out $(TO_BIN_FILTER), \ $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS))), \ ! )) else ! $(eval $(call SetupCopyFiles, COPY_LIBS_TO_LIB, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/lib, \ ! FILES := $(filter %$(SHARED_LIBRARY_SUFFIX), \ ! $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS))), \ ! )) ! $(eval $(call SetupCopyFiles, LINK_LIBS_TO_LIB, \ ! SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ ! DEST := $(JDK_OUTPUTDIR)/lib, \ ! FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), \ ! $(filter $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/%, \ ! $(TARGETS))), \ ! MACRO := link-file-relative, \ ! )) endif ! $(eval $(call SetupCopyFiles, COPY_INCLUDE, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/include, \ FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)/%, \ ! $(TARGETS)), \ ! )) ! $(eval $(call SetupCopyFiles, COPY_CMDS, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/bin, \ ! FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/%, $(TARGETS)), \ ! )) ! $(eval $(call SetupCopyFiles, COPY_CONF, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/conf, \ FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)/%, \ ! $(TARGETS)), \ ! )) all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \ ! $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
< prev index next >