Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/makefiles/BuildJaxws.gmk	Wed Jan 16 11:59:59 2013 -0800
     1.2 +++ b/makefiles/BuildJaxws.gmk	Wed Jan 16 22:17:39 2013 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -48,14 +48,12 @@
    1.11  $(eval $(call SetupJavaCompilation,BUILD_JAF,\
    1.12  		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
    1.13  		SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\
    1.14 -		CLEAN:=.properties,\
    1.15  		COPY:="dummy",\
    1.16  		BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes))
    1.17  
    1.18  $(eval $(call SetupJavaCompilation,BUILD_JAXWS,\
    1.19  		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
    1.20  		SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\
    1.21 -		CLEAN:=.properties,\
    1.22  		BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\
    1.23  		COPY:=.xsd,\
    1.24  		COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
    1.25 @@ -76,7 +74,31 @@
    1.26  BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
    1.27                 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin
    1.28  
    1.29 -$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF),\
    1.30 +# Imitate the property cleaning mechanism in the old build. This will likely be replaced 
    1.31 +# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build
    1.32 +# for now, even though it actually breaks properties containing # in the value.
    1.33 +# Using nawk to avoid solaris sed.
    1.34 +$(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties
    1.35 +	$(MKDIR) -p $(@D)
    1.36 +	$(RM) $@ $@.tmp
    1.37 +	$(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
    1.38 +	$(MV) $@.tmp $@
    1.39 +
    1.40 +JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties")
    1.41 +TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%,\
    1.42 +                       $(JAXWS_OUTPUTDIR)/jaxws_classes/%,$(JAXWS_SRC_PROP_FILES))
    1.43 +
    1.44 +$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties
    1.45 +	$(MKDIR) -p $(@D)
    1.46 +	$(RM) $@ $@.tmp
    1.47 +	$(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
    1.48 +	$(MV) $@.tmp $@
    1.49 +
    1.50 +JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties")
    1.51 +TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%,\
    1.52 +                       $(JAXWS_OUTPUTDIR)/jaf_classes/%,$(JAF_SRC_PROP_FILES))
    1.53 +
    1.54 +$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES),\
    1.55  		SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\
    1.56  		SUFFIXES:=.class .properties .xsd .java \
    1.57  			  com.sun.mirror.apt.AnnotationProcessorFactory \