8005548: build-infra: Fix docs target on windows

Thu, 27 Dec 2012 20:55:53 +0100

author
erikj
date
Thu, 27 Dec 2012 20:55:53 +0100
changeset 558
d5f3a6f60d51
parent 557
d2c1f80118de
child 559
ef6adbf511cc

8005548: build-infra: Fix docs target on windows
Summary: Fix path sep variable
Reviewed-by: tbell

common/makefiles/javadoc/Javadoc.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/common/makefiles/javadoc/Javadoc.gmk	Thu Dec 27 20:18:21 2012 +0100
     1.2 +++ b/common/makefiles/javadoc/Javadoc.gmk	Thu Dec 27 20:55:53 2012 +0100
     1.3 @@ -32,8 +32,6 @@
     1.4  # Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
     1.5  #
     1.6  
     1.7 -CLASSPATH_SEPARATOR = :
     1.8 -
     1.9  DOCSDIR=$(OUTPUT_ROOT)/docs
    1.10  TEMPDIR=$(OUTPUT_ROOT)/docstemp
    1.11  
    1.12 @@ -137,7 +135,7 @@
    1.13  # List of all possible directories for javadoc to look for sources
    1.14  #    NOTE: Quotes are required around sourcepath argument only on Windows.
    1.15  #          Otherwise, you get "No packages or classes specified." due 
    1.16 -#          to $(CLASSPATH_SEPARATOR) being interpreted as an end of 
    1.17 +#          to $(PATH_SEP) being interpreted as an end of 
    1.18  #          command (newline or shell ; character)
    1.19  ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
    1.20                    $(JDK_IMPSRC) \
    1.21 @@ -154,7 +152,7 @@
    1.22  EMPTY:=
    1.23  SPACE:= $(EMPTY) $(EMPTY)
    1.24  RELEASEDOCS_SOURCEPATH = \
    1.25 -    $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS)))
    1.26 +    $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
    1.27  
    1.28  define prep-target
    1.29  $(MKDIR) -p $(@D)

mercurial