Skip to content
Snippets Groups Projects
Commit 4b55be23 authored by Keith's avatar Keith Committed by afarrell
Browse files

Java 8 introduced a new very fussy javadoc which caused the install target to...

Java 8 introduced a new very fussy javadoc which caused the install target to fail. Bypassed but in a way that needs a flag in the DRAMA configuration file

   The html target fails if the new doclint checks introduced into javadoc
   with Java 8 are enabled. Until the source code files are fixed (a big job)
   defining the dmkmf symbol NoDramadocLint causes the -Xdoclint:none flag to
   be set and these tests are bypassed. So this is needed if Java 8 has been
   installed and the .java files have not yet been fixed. Anyone who has
   installed Java 8 will need to add this to their local DRAMA configuration
   file (in my case drama_local.macosx.cf).
parent 0e79a7d8
Branches
Tags 3.58
No related merge requests found
......@@ -7,11 +7,22 @@
* is not the standard library for c++ under Clang.
* I believe these have not been needed for some
* while on OS X, so this should be safe.
* 27-Feb-2015 - KS - The html target fails if the new doclint checks
* introduced into javadoc with Java 8 are enabled.
* Until the source code files are fixed (a big job)
* defining the dmkmf symbol NoDramadocLint causes
* the -Xdoclint:none flag to be set and these tests
* are bypassed. So this is needed if Java 8 has been
* installed and the .java files have not yet been
* fixed.
* 18-Mar-2015 - KS - There seem to be additional java_lang_Class*.h
* files generated now. The clean target now removes
* them, and any .bck files created by nedit.
*/
#BeginConfig
#DramaSystem /* Indicates we are part of drama itself */
ACMM_RELEASE=3_57$(ACMMBUILDVER)
ACMM_RELEASE=3_58$(ACMMBUILDVER)
RELEASE=r$(ACMM_RELEASE)
SYSTEM=djava /* System name (for release */
......@@ -21,6 +32,15 @@ SYSTEM=djava /* System name (for release */
USERCCOPTIONS = AnsiCFull()
USERCCCOPTIONS = AnsiCCFull() GccOnly(-Wno-long-long)
/* If the dmkmf flag NoJavadocLint is set, the doclint step introduced into
* javadoc with Java 8 is bypassed.
*/
#ifdef NoJavadocLint
JDOCFLAGS=-Xdoclint:none
#else
JDOCFLAGS=
#endif
#ifndef CcdvCmd
#define CcdvCmd
#endif
......@@ -343,7 +363,7 @@ BOTTOM = '<P><A href="http://www.aao.gov.au/drama/html/dramaintro.html" TARGET="
html : package.html package-list
$(CP) -f $(JAVA_FILES) package.html au/gov/aao/drama
- mkdir html
javadoc $(JCLASSPATH) -d html -windowtitle $(TITLE) -author -version -linkoffline $(LINK) $(LINKPACKAGEDIR) -header $(HEADER) -bottom $(BOTTOM) au.gov.aao.drama
javadoc $(JCLASSPATH) $(JDOCFLAGS) -d html -windowtitle $(TITLE) -author -version -linkoffline $(LINK) $(LINKPACKAGEDIR) -header $(HEADER) -bottom $(BOTTOM) au.gov.aao.drama
$(CP) -f $(EXAMPLES) html
......@@ -423,7 +443,7 @@ clean ::
$(RM) $(BUILT_INCL) au_gov_aao_drama_*.h java_lang_Class_EnclosingMethodInfo.h java_lang_Class_MethodArray.h
$(RM) *.o a.out core *.class *.$(LIBSUF)
$(RM) au.gov.aao.drama.*.html AllNames.html packages.html tree.html
$(RM) java_lang_Class.h
$(RM) java_lang_Class*.h *.bck
#
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment