changeset 1028:9262dcba562f

8037085: The sjavac exclude option should accept valid directory identifiers Summary: Option handling code rewritten. Exclusion / inclusion patterns changed from package to directories. Reviewed-by: jfranck, erikj, ihse
author alundblad
date Tue, 22 Apr 2014 16:39:46 +0200
parents 79a52c1cc5b6
children 8a591d2443ca
files make/common/JavaCompilation.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/JavaCompilation.gmk	Tue Apr 22 14:14:35 2014 +0200
+++ b/make/common/JavaCompilation.gmk	Tue Apr 22 16:39:46 2014 +0200
@@ -445,8 +445,8 @@
   # Now we have a list of all java files to compile: $$($1_SRCS)
 
   # Create the corresponding smart javac wrapper command line.
-  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
-      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
+  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix /*,$$($1_EXCLUDES))) \
+      $$(addprefix -i ,$$(addsuffix /*,$$($1_INCLUDES))) \
       $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
       $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
       -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"