Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8037085: The sjavac exclude option should accept valid directory identifiers
authoralundblad
Tue, 22 Apr 2014 16:39:46 +0200
changeset 23983 fa89aaeb38c2
parent 23982 12e7bb480a6b
child 23984 e3e90595a176
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
make/common/JavaCompilation.gmk file | annotate | diff | comparison | revisions 
--- 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)))"
jdk-sandbox