1.1 --- a/make/common/shared/Defs-versions.gmk Thu Jul 29 13:33:20 2010 -0700
1.2 +++ b/make/common/shared/Defs-versions.gmk Wed Aug 04 22:02:14 2010 -0700
1.3 @@ -191,7 +191,7 @@
1.4
1.5 # Generic
1.6 REQUIRED_ANT_VER = 1.6.3
1.7 -REQUIRED_BOOT_VER = 1.5
1.8 +REQUIRED_BOOT_VER = 1.6
1.9 REQUIRED_FREETYPE_VERSION = 2.3.0
1.10 REQUIRED_MAKE_VER = 3.78
1.11 REQUIRED_UNZIP_VER = 5.12
2.1 --- a/make/docs/Makefile Thu Jul 29 13:33:20 2010 -0700
2.2 +++ b/make/docs/Makefile Wed Aug 04 22:02:14 2010 -0700
2.3 @@ -47,9 +47,9 @@
2.4
2.5 # Url to devdocs page
2.6 # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
2.7 -DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs
2.8 -DEV_DOCS_URL-6 = http://download.oracle.com/docs/cd/E17409_01/javase/6/docs
2.9 -DEV_DOCS_URL-7 = http://download.oracle.com/docs/cd/E17409_01/javase/7/docs
2.10 +DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html
2.11 +DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html
2.12 +DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
2.13 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
2.14
2.15 # Url to Java Language Spec
2.16 @@ -84,6 +84,11 @@
2.17 $(SHARE_SRC)/../solaris/classes \
2.18 $(SHARE_SRC)/../windows/classes \
2.19 $(SHARE_SRC)/doc/stub
2.20 +
2.21 +# List of directories that actually exist
2.22 +ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
2.23 +
2.24 +# List with classpath separator between them
2.25 EMPTY:=
2.26 SPACE:= $(EMPTY) $(EMPTY)
2.27 RELEASEDOCS_SOURCEPATH = \
2.28 @@ -240,7 +245,8 @@
2.29 # Default target is same as docs target, create core api and all others it can
2.30 #
2.31
2.32 -all docs: coredocs otherdocs
2.33 +all: docs
2.34 +docs: coredocs otherdocs
2.35
2.36 #################################################################
2.37 # Production Targets -- USE THESE TARGETS WHEN:
2.38 @@ -1178,9 +1184,9 @@
2.39 #
2.40 # Get a cache of all the directories
2.41
2.42 -$(DIRECTORY_CACHE): $(ALL_SOURCE_DIRS)
2.43 +$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
2.44 $(prep-target)
2.45 - @for cp in $(ALL_SOURCE_DIRS) ; do \
2.46 + @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
2.47 $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
2.48 $(FIND) $${cp} -type f >> $@; \
2.49 done