diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 12:30:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 12:30:49 +0000 |
| commit | 4d3fc3a9d2d7931f010f2cd6eef3b2ebb12d7570 (patch) | |
| tree | 027869359e9581693170133fa9f7d7040fe1a74b /solenv/bin/checkapi | |
| parent | 76117d46562c8d0f971eacfb32c4acc738b27450 (diff) | |
INTEGRATION: CWS complextest1 (1.5.1154); FILE MERGED
2007/06/28 08:47:57 cn 1.5.1154.2: #i78349# remove WRAPCMD
2007/06/21 14:37:37 cn 1.5.1154.1: #i78349# modifications to run checkapi in new dmake environment
Diffstat (limited to 'solenv/bin/checkapi')
| -rwxr-xr-x | solenv/bin/checkapi | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi index e9ac85126053..654d17722fce 100755 --- a/solenv/bin/checkapi +++ b/solenv/bin/checkapi @@ -2,5 +2,15 @@ JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT CLASSPATH=$JARFOLDER/OOoRunner.jar:$JARFOLDER/ridl.jar:$JARFOLDER/unoil.jar:$JARFOLDER/jurt.jar:$JARFOLDER/juh.jar:$JARFOLDER/java_uno.jar -echo java -Xmx120m -cp $CLASSPATH org.openoffice.Runner $* -java -Xmx120m -cp $CLASSPATH org.openoffice.Runner $* + +if [ -n "$JAVAI" ]; then + JAVABIN=$JAVAI +elif [ -n "$JAVA_HOME" ]; then + JAVABIN=$JAVA_HOME/bin/java +else + echo "please set environment variable JAVA_HOME" + exit 1 +fi + +echo $JAVABIN -Xmx120m -cp $CLASSPATH org.openoffice.Runner $* +$JAVABIN -Xmx120m -cp $CLASSPATH org.openoffice.Runner $* |