From d854d19d42542ec4627f45873c57ad9d3d2aedc4 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Tue, 24 Jul 2007 12:31:02 +0000
Subject: INTEGRATION: CWS complextest1 (1.4.1154); FILE MERGED 2007/06/28
 08:48:50 cn 1.4.1154.2: #i78349# remove WRAPCMD 2007/06/21 14:37:37 cn
 1.4.1154.1: #i78349# modifications to run checkapi in new dmake environment

---
 solenv/bin/checkapi.btm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'solenv/bin')

diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm
index 761df23a1f4f..d09f2de91897 100644
--- a/solenv/bin/checkapi.btm
+++ b/solenv/bin/checkapi.btm
@@ -3,5 +3,16 @@
 SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
 SET 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 %&
+IFF "%JAVAI%" != "" THEN
+    SET JAVABIN=%JAVAI%
+ELSEIFF "%JAVA_HOME%" != "" THEN
+    SET JAVABIN=%JAVA_HOME%\bin\java
+ELSE
+   echo please set environment variable JAVA_HOME
+   exit 1
+ENDIFF
+
+set COMMAND=%JAVABIN% -Xmx120m -cp %CLASSPATH% org.openoffice.Runner %&
+
+echo %COMMAND
+%COMMAND
-- 
cgit