Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/JavaCompilation.gmk	Wed Oct 23 17:03:19 2013 +0200
     1.2 +++ b/common/makefiles/JavaCompilation.gmk	Thu Oct 24 10:43:35 2013 +0200
     1.3 @@ -506,30 +506,30 @@
     1.4  
     1.5      $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
     1.6  	$(MKDIR) -p $$(@D)
     1.7 -	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
     1.8 +	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
     1.9  	$(ECHO) Compiling $1
    1.10  	($$($1_JVM) $$($1_SJAVAC) \
    1.11  	    $$($1_REMOTE) \
    1.12  	    -j $(JOBS) \
    1.13  	    --permit-unidentified-artifacts \
    1.14  	    --permit-sources-without-package \
    1.15 -	    --compare-found-sources $$($1_BIN)/_the.batch.tmp \
    1.16 +	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
    1.17  	    --log=$(LOG_LEVEL) \
    1.18  	    $$($1_SJAVAC_ARGS) \
    1.19  	    $$($1_FLAGS) \
    1.20  	    $$($1_HEADERS_ARG) \
    1.21  	    -d $$($1_BIN) && \
    1.22 -	$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
    1.23 +	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
    1.24    else
    1.25      # Using plain javac to batch compile everything.
    1.26 -    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch
    1.27 +    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
    1.28  
    1.29      # When building in batch, put headers in a temp dir to filter out those that actually
    1.30      # changed before copying them to the real header dir.
    1.31      ifneq (,$$($1_HEADERS))
    1.32        $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
    1.33  
    1.34 -      $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch
    1.35 +      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
    1.36  		$(MKDIR) -p $$(@D)
    1.37  		for f in `ls $$($1_HEADERS).tmp`; do \
    1.38  		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
    1.39 @@ -539,19 +539,19 @@
    1.40  		$(RM) -r $$($1_HEADERS).tmp
    1.41  		$(TOUCH) $$@
    1.42  
    1.43 -      $1 += $$($1_HEADERS)/_the.headers
    1.44 +      $1 += $$($1_HEADERS)/_the.$1_headers
    1.45      endif
    1.46  
    1.47      # When not using sjavac, pass along all sources to javac using an @file.
    1.48 -    $$($1_BIN)/_the.batch: $$($1_SRCS) $$($1_DEPENDS)
    1.49 +    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
    1.50  	$(MKDIR) -p $$(@D)
    1.51 -	$(RM) $$($1_BIN)/_the.batch $$($1_BIN)/_the.batch.tmp
    1.52 -	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
    1.53 -	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
    1.54 +	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
    1.55 +	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
    1.56 +	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
    1.57  	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
    1.58  	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
    1.59 -	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.batch.tmp && \
    1.60 -	$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
    1.61 +	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
    1.62 +	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
    1.63  
    1.64    endif
    1.65