diff options
| author | Rene Engelhard <rene@debian.org> | 2013-02-13 20:21:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-14 08:32:39 +0000 |
| commit | 3a2d996b374be25af3cf8d33ed553c33b39cb96f (patch) | |
| tree | 3179998fbae7704c28e50333e6feb0739713908a | |
| parent | 97751d8ae088763e7d997bdc1de9c89b3ee6c36b (diff) | |
don't use -notimestanp when using gjdoc as javadoc
Conflicts:
config_host.mk.in
Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187
Reviewed-on: https://gerrit.libreoffice.org/2142
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | odk/pack/gendocu/makefile.mk | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 7b9834dc0368..73aecf84a2af 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -263,6 +263,7 @@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ +export JAVADOCISGJDOC=@JAVADOCISGJDOC@ @x_JAVALIB@ export JAVALIB=@JAVALIB@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index bb3f96ceed88..ce852295e984 100644 --- a/configure.ac +++ b/configure.ac @@ -6021,7 +6021,12 @@ if test "$SOLAR_JAVA" != ""; then JAVADOC=`cygpath -d "$JAVADOC"` JAVADOC=`cygpath -u "$JAVADOC"` fi + + if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then + JAVADOCISGJDOC="yes" + fi fi +AC_SUBST(JAVADOCISGJDOC) if test "$SOLAR_JAVA" != ""; then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 0e51d1c0be09..f3e5b080e794 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java -JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) +JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES) +.IF "$(JAVADOCISGJDOC)" != "yes" +JAVADOCPARAMS+= -notimestamp +.ENDIF JAVADOCLOG = $(MISC)$/javadoc_log.txt |