Merge
This commit is contained in:
commit
7614783367
@ -68,10 +68,17 @@ BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \
|
|||||||
# Dummy variable so far, in the old build system it was false by default
|
# Dummy variable so far, in the old build system it was false by default
|
||||||
SWINGBEAN_DEBUG_FLAG = false
|
SWINGBEAN_DEBUG_FLAG = false
|
||||||
# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
|
# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses
|
||||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS)
|
# LocaleDataMetaInfo needs to be generated before running this to avoid confusing errors
|
||||||
|
# in the build log.
|
||||||
|
$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
|
||||||
|
$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \
|
||||||
|
$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \
|
||||||
|
| $(GENSRC_LOCALEDATAMETAINFO)
|
||||||
$(ECHO) Generating beaninfo
|
$(ECHO) Generating beaninfo
|
||||||
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
|
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
|
||||||
$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -doclet GenDocletBeanInfo \
|
$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
|
||||||
|
-sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
|
||||||
|
-doclet GenDocletBeanInfo \
|
||||||
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
|
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
|
||||||
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
|
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
|
||||||
-XDignore.symbol.file=true \
|
-XDignore.symbol.file=true \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user