Mercurial > hg > jdk9-shenandoah > jaxp
changeset 573:46e4951b2a26 jdk9-b06
Merge
| author | lana |
|---|---|
| date | Tue, 25 Mar 2014 12:31:49 -0700 |
| parents | a2223edadb83 (current diff) aea9ba992c78 (diff) |
| children | 389f4094fd60 6065cf14d4dd |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/make/BuildJaxp.gmk Thu Mar 20 13:44:11 2014 -0700 +++ b/make/BuildJaxp.gmk Tue Mar 25 12:31:49 2014 -0700 @@ -45,27 +45,11 @@ $(eval $(call SetupJavaCompilation,BUILD_JAXP, \ SETUP := GENERATE_NEWBYTECODE_DEBUG, \ SRC := $(JAXP_TOPDIR)/src, \ + CLEAN := .properties, \ BIN := $(JAXP_OUTPUTDIR)/classes, \ - SRCZIP := $(JAXP_OUTPUTDIR)/dist/lib/src.zip)) - -# Imitate the property cleaning mechanism in the old build. This will likely be replaced -# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build -# for now, even though it actually breaks properties containing # in the value. -# Using nawk to avoid solaris sed. -$(JAXP_OUTPUTDIR)/classes/%.properties: $(JAXP_TOPDIR)/src/%.properties - $(MKDIR) -p $(@D) - $(RM) $@ $@.tmp - $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp - $(MV) $@.tmp $@ - -SRC_PROP_FILES := $(shell $(FIND) $(JAXP_TOPDIR)/src -name "*.properties") -TARGET_PROP_FILES := $(patsubst $(JAXP_TOPDIR)/src/%, $(JAXP_OUTPUTDIR)/classes/%, $(SRC_PROP_FILES)) - -$(eval $(call SetupArchive,ARCHIVE_JAXP, $(BUILD_JAXP) $(TARGET_PROP_FILES), \ - SRCS := $(JAXP_OUTPUTDIR)/classes, \ - SUFFIXES := .class .properties, \ + SRCZIP := $(JAXP_OUTPUTDIR)/dist/lib/src.zip, \ JAR := $(JAXP_OUTPUTDIR)/dist/lib/classes.jar)) -all: $(JAXP_OUTPUTDIR)/dist/lib/classes.jar $(JAXP_OUTPUTDIR)/dist/lib/src.zip +all: $(BUILD_JAXP) .PHONY: default all