stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 20:04:17 +02:00
commit 0a4a26770b
3 changed files with 5 additions and 14 deletions

1
.hgtags-top-repo

@ -277,3 +277,4 @@ ea2f7981236f3812436958748ab3d26e80a35130 jdk9-b28
7e3512dae8e020d44399c0f1c579ff1fe3090ed6 jdk9-b32
e4ba01b726e263953ae129be37c94de6ed145b1d jdk9-b33
087b23f35631e68e950496a36fce8ccca612966a jdk9-b34
c173ba994245380fb11ef077d1e59823386840eb jdk9-b35

7
make/MakeHelpers.gmk

@ -324,9 +324,10 @@ define DeclareRecipeForModuleMakefile
+($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix /$$(strip $3)/$$(strip $4)-$$(strip $1).gmk, \
$(MAKE_DIR_LIST))))) \
&& $(MAKE) $(MAKE_ARGS) \
-f $$(strip $4)-$$(strip $1).gmk \
$$(addprefix -I, $$(wildcard $(MAKE_DIR_LIST) \
$$(addsuffix /$$(strip $3), $(MAKE_DIR_LIST)))))
-f $$(strip $4)-$$(strip $1).gmk \
$$(addprefix -I, $$(wildcard $(MAKE_DIR_LIST) \
$$(addsuffix /$$(strip $3), $(MAKE_DIR_LIST)))) \
MODULE=$$(strip $1))
endef
################################################################################

11
modules.xml

@ -1490,16 +1490,6 @@
<to>java.desktop</to>
</export>
</module>
<module>
<name>jdk.compact3</name>
<depend re-exports="true">java.compact3</depend>
<depend re-exports="true">java.smartcardio</depend>
<depend re-exports="true">jdk.httpserver</depend>
<depend re-exports="true">jdk.naming.dns</depend>
<depend re-exports="true">jdk.naming.rmi</depend>
<depend re-exports="true">jdk.sctp</depend>
<depend re-exports="true">jdk.security.auth</depend>
</module>
<module>
<name>jdk.compiler</name>
<depend>java.base</depend>
@ -1735,7 +1725,6 @@
<depend>java.base</depend>
<depend>java.desktop</depend>
<depend>java.se</depend>
<depend>jdk.compact3</depend>
</module>
<module>
<name>jdk.scripting.nashorn</name>