mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use -notimestanp when using gjdoc as javadoc

Browse Source 
Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187
This commit is contained in:
Rene Engelhard
2013-02-13 20:21:44 +01:00
parent 61f518fdc0
commit a45b42b801
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -267,6 +267,7 @@ export JAVACISGCJ=@JAVACISGCJ@
export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACISKAFFE=@JAVACISKAFFE@
export JAVACOMPILER=@JAVACOMPILER@ export JAVACOMPILER=@JAVACOMPILER@
export JAVADOC=@JAVADOC@ export JAVADOC=@JAVADOC@
export JAVADOCISGJDOC=@JAVADOCISGJDOC@
export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@
export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVAINTERPRETER=@JAVAINTERPRETER@
@x_JAVALIB@ export JAVALIB=@JAVALIB@ @x_JAVALIB@ export JAVALIB=@JAVALIB@

5
configure.ac
View File

@@ -6354,7 +6354,12 @@ if test "$SOLAR_JAVA" != ""; then
JAVADOC=`cygpath -d "$JAVADOC"` JAVADOC=`cygpath -d "$JAVADOC"`
JAVADOC=`cygpath -u "$JAVADOC"` JAVADOC=`cygpath -u "$JAVADOC"`
fi fi
if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
JAVADOCISGJDOC="yes"
fi fi
fi
AC_SUBST(JAVADOCISGJDOC)
if test "$SOLAR_JAVA" != ""; then if test "$SOLAR_JAVA" != ""; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr

5
odk/pack/gendocu/makefile.mk
View File

@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.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 JAVADOCLOG = $(MISC)$/javadoc_log.txt