diff options
| author | Jerome Pilliet <pilliet@univ-mlv.fr> | 2012-12-17 11:12:50 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-10 20:35:29 -0800 |
| commit | eded3983484229204f84b484409e7c1fec0a3ab2 (patch) | |
| tree | ed54e87287dc0712c560213cf8d45433f9bfdb01 /core/droiddoc.mk | |
| parent | 558463768f2debb20d14abc98427864989da6519 (diff) | |
| download | build-eded3983484229204f84b484409e7c1fec0a3ab2.zip build-eded3983484229204f84b484409e7c1fec0a3ab2.tar.gz build-eded3983484229204f84b484409e7c1fec0a3ab2.tar.bz2 | |
Some changes added to compile and run with Java 6 and Java 7.
- correction of errors with Javac 6:
- target 1.5 and source empty.
- correction of errors with Javadoc 7:
- strange behavior when duplicate classes are given.
Change-Id: Ib814ede143f7799ef18e0fb1b733547519b8b0e5
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index dd448c4..639f219 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -159,6 +159,9 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) $(hide) ( \ + head -1 $(PRIVATE_SRC_LIST_FILE) | tr " " "\n" | sort | uniq | tr "\n" " " > $(PRIVATE_SRC_LIST_FILE)_temp; \ + cat $(PRIVATE_SRC_LIST_FILE) | sed '1 d' >> $(PRIVATE_SRC_LIST_FILE)_temp; \ + mv $(PRIVATE_SRC_LIST_FILE)_temp $(PRIVATE_SRC_LIST_FILE); \ javadoc \ \@$(PRIVATE_SRC_LIST_FILE) \ -J-Xmx1280m \ @@ -191,6 +194,9 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) $(hide) ( \ + head -1 $(PRIVATE_SRC_LIST_FILE) | tr " " "\n" | sort | uniq | tr "\n" " " > $(PRIVATE_SRC_LIST_FILE)_temp; \ + cat $(PRIVATE_SRC_LIST_FILE) | sed '1 d' >> $(PRIVATE_SRC_LIST_FILE)_temp; \ + mv $(PRIVATE_SRC_LIST_FILE)_temp $(PRIVATE_SRC_LIST_FILE); \ javadoc \ $(PRIVATE_DROIDDOC_OPTIONS) \ \@$(PRIVATE_SRC_LIST_FILE) \ |