# HG changeset patch
# User lana
# Date 1358753841 28800
# Node ID 4e049aa2495f99110d35a776adae73f04aecbc91
# Parent  06827097cdd3fa5cc439e5bd0e212961cd5705f1# Parent  2087e24a4357eceb6432e94918e75fdc706a27d6
Merge

diff -r 06827097cdd3 -r 4e049aa2495f .hgtags
--- a/.hgtags	Wed Jan 16 12:06:39 2013 -0800
+++ b/.hgtags	Sun Jan 20 23:37:21 2013 -0800
@@ -194,3 +194,4 @@
 6ec9edffc286c9c9ac96c9cd2050b01cb5d514a8 jdk8-b70
 499be952a291cec1dc774a84a238941d6faf772d jdk8-b71
 bdf2af722a6b54fca47d8c51d17a1b8f41dd7a3e jdk8-b72
+84946404d1e1de003ed2bf218ef8d48906a90e37 jdk8-b73
diff -r 06827097cdd3 -r 4e049aa2495f makefiles/BuildJaxp.gmk
--- a/makefiles/BuildJaxp.gmk	Wed Jan 16 12:06:39 2013 -0800
+++ b/makefiles/BuildJaxp.gmk	Sun Jan 20 23:37:21 2013 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,23 @@
 $(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))
 
-$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP),\
+# 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,\
 		JAR:=$(JAXP_OUTPUTDIR)/dist/lib/classes.jar))