7179078: Remove @beaninfo processing from the makefiles
Reviewed-by: erikj, alexsch
This commit is contained in:
parent
93772df04d
commit
7e720e14ff
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -111,16 +111,6 @@ java.desktop_EXCLUDES += \
|
|||||||
sun/awt/X11/doc-files \
|
sun/awt/X11/doc-files \
|
||||||
#
|
#
|
||||||
|
|
||||||
# The exception handling of swing beaninfo
|
|
||||||
# These resources violates the convention of having code and resources together under
|
|
||||||
# $(JDK_TOPDIR)/src/.../classes directories
|
|
||||||
$(eval $(call SetupCopyFiles,COPY_BEANINFO, \
|
|
||||||
SRC := $(JDK_TOPDIR)/make/data/swingbeaninfo/images, \
|
|
||||||
DEST := $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/beaninfo/images, \
|
|
||||||
FILES := $(wildcard $(JDK_TOPDIR)/make/data/swingbeaninfo/images/*.gif)))
|
|
||||||
|
|
||||||
java.desktop_COPY_EXTRA += $(COPY_BEANINFO)
|
|
||||||
|
|
||||||
java.desktop_EXCLUDE_FILES += \
|
java.desktop_EXCLUDE_FILES += \
|
||||||
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
|
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
|
||||||
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
|
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
|
||||||
|
Loading…
Reference in New Issue
Block a user