diff options
| author | cl <none@none> | 2010-08-04 22:02:14 -0700 |
|---|---|---|
| committer | cl <none@none> | 2010-08-04 22:02:14 -0700 |
| commit | 62ac18751fb5e117197c809b580bdd374d9bbe37 (patch) | |
| tree | e8de0127ac6cab645a9b0fffdec102db13d73e8d | |
| parent | 75861e5fa52c1dc115178a2cce0f72e5409e878a (diff) | |
| parent | 89e1a31da94b37b9e4f35210caf1465ab9ba82a3 (diff) | |
Mergejdk7-b104
| -rw-r--r-- | make/common/shared/Defs-versions.gmk | 2 | ||||
| -rw-r--r-- | make/docs/Makefile | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/make/common/shared/Defs-versions.gmk b/make/common/shared/Defs-versions.gmk index 327f3a49b..870ae229f 100644 --- a/make/common/shared/Defs-versions.gmk +++ b/make/common/shared/Defs-versions.gmk @@ -191,7 +191,7 @@ endif # Generic REQUIRED_ANT_VER = 1.6.3 -REQUIRED_BOOT_VER = 1.5 +REQUIRED_BOOT_VER = 1.6 REQUIRED_FREETYPE_VERSION = 2.3.0 REQUIRED_MAKE_VER = 3.78 REQUIRED_UNZIP_VER = 5.12 diff --git a/make/docs/Makefile b/make/docs/Makefile index 20150c81a..a2aaccb13 100644 --- a/make/docs/Makefile +++ b/make/docs/Makefile @@ -47,9 +47,9 @@ BUG_SUBMIT_LINE = <a href=\"$(BUG_SUBMIT_URL)\">Submit a bug or feature</a> # Url to devdocs page # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html -DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs -DEV_DOCS_URL-6 = http://download.oracle.com/docs/cd/E17409_01/javase/6/docs -DEV_DOCS_URL-7 = http://download.oracle.com/docs/cd/E17409_01/javase/7/docs +DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html +DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html +DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION)) # Url to Java Language Spec @@ -84,6 +84,11 @@ ALL_SOURCE_DIRS = $(SHARE_SRC)/classes \ $(SHARE_SRC)/../solaris/classes \ $(SHARE_SRC)/../windows/classes \ $(SHARE_SRC)/doc/stub + +# List of directories that actually exist +ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS)) + +# List with classpath separator between them EMPTY:= SPACE:= $(EMPTY) $(EMPTY) RELEASEDOCS_SOURCEPATH = \ @@ -240,7 +245,8 @@ include NON_CORE_PKGS.gmk # Default target is same as docs target, create core api and all others it can # -all docs: coredocs otherdocs +all: docs +docs: coredocs otherdocs ################################################################# # Production Targets -- USE THESE TARGETS WHEN: @@ -1178,9 +1184,9 @@ $(TRACING_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TRACIN # # Get a cache of all the directories -$(DIRECTORY_CACHE): $(ALL_SOURCE_DIRS) +$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS) $(prep-target) - @for cp in $(ALL_SOURCE_DIRS) ; do \ + @for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \ $(ECHO) "$(FIND) $${cp} -type f >> $@"; \ $(FIND) $${cp} -type f >> $@; \ done |