config_host.mk.in | 1 + configure.ac | 5 +++++ odk/pack/gendocu/makefile.mk | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit a45b42b8018834e8b6a1dd54a2ab91b51fbc02a6 Author: Rene Engelhard <[email protected]> Date: Wed Feb 13 20:21:44 2013 +0100 don't use -notimestanp when using gjdoc as javadoc Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187 diff --git a/config_host.mk.in b/config_host.mk.in index 4f5d2e4..803be08 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -267,6 +267,7 @@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ +export JAVADOCISGJDOC=@JAVADOCISGJDOC@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAINTERPRETER=@JAVAINTERPRETER@ @x_JAVALIB@ export JAVALIB=@JAVALIB@ diff --git a/configure.ac b/configure.ac index c906e0e..1355f3c 100644 --- a/configure.ac +++ b/configure.ac @@ -6354,7 +6354,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 0e51d1c..f3e5b08 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 commit 61f518fdc04e9ca4c691e46d7e7b0247532f19b0 Author: Rene Engelhard <[email protected]> Date: Wed Feb 13 20:20:05 2013 +0100 link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in the odk java docs ... as /1.4.1/ redirects to the generic Oracle Java page. 1.5 works. Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 7345e72..0e51d1c 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -59,7 +59,7 @@ 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.4.1/docs/api ./java $(JAVA_PACKAGES) +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) JAVADOCLOG = $(MISC)$/javadoc_log.txt _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
