# HG changeset patch
# User lana
# Date 1395775909 25200
# Node ID be22d398982c36bbde559aebd894ebe22be7e9cb
# Parent  21f2f0f8b9f7f9e111de048217be2258c89328bd# Parent  fb2176d74d5d1008240ec7ec59df91be083eab8b
Merge

diff -r 21f2f0f8b9f7 -r be22d398982c jaxp/make/BuildJaxp.gmk
--- a/jaxp/make/BuildJaxp.gmk	Thu Mar 20 13:44:11 2014 -0700
+++ b/jaxp/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