equal
deleted
inserted
replaced
1 |
1 |
2 # Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2014, 2016, 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 |
80 JMOD_FLAGS += --modulepath $(JMODS_DIR) \ |
80 JMOD_FLAGS += --modulepath $(JMODS_DIR) \ |
81 --hash-modules '^(?!$(EXCLUDE_PATTERN))' |
81 --hash-modules '^(?!$(EXCLUDE_PATTERN))' |
82 endif |
82 endif |
83 endif |
83 endif |
84 |
84 |
85 # Changes to the jmod tool itself should also trigger a rebuild of all jmods |
85 # Changes to the jmod tool itself should also trigger a rebuild of all jmods. |
86 DEPS += $(JMOD_CMD) |
86 # The variable JMOD_CMD could contain an environment variable assignment before |
|
87 # the actual command. Filter that out using wildcard before adding to DEPS. |
|
88 DEPS += $(wildcard $(JMOD_CMD)) |
87 ifeq ($(EXTERNAL_BUILDJDK), false) |
89 ifeq ($(EXTERNAL_BUILDJDK), false) |
88 DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod) |
90 DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod) |
89 endif |
91 endif |
90 |
92 |
91 # TODO: What about headers? |
93 # TODO: What about headers? |
98 $(JMOD) create \ |
100 $(JMOD) create \ |
99 --module-version $(VERSION_SHORT) \ |
101 --module-version $(VERSION_SHORT) \ |
100 --os-name $(REQUIRED_OS_NAME) \ |
102 --os-name $(REQUIRED_OS_NAME) \ |
101 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
103 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
102 --os-version $(REQUIRED_OS_VERSION) \ |
104 --os-version $(REQUIRED_OS_VERSION) \ |
103 --modulepath $(JMODS_DIR) \ |
105 --modulepath $(JMODS_DIR) \ |
104 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \ |
106 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \ |
105 $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) |
107 $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) |
106 $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ |
108 $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ |
107 |
109 |
108 TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod |
110 TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod |