diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 08:26:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 08:26:21 +0000 |
| commit | 0cdab097c44f1891ae736eedb3d141170b887081 (patch) | |
| tree | 942043cd68d6362195a34dd4591385ab1d55e0a9 | |
| parent | b2653936a1587de664cb62cac4a4a4cd5beadb20 (diff) | |
CWS-TOOLING: integrate CWS cwscheckapi5_DEV300
| -rwxr-xr-x | solenv/bin/checkapi | 10 | ||||
| -rw-r--r-- | solenv/bin/checkapi.btm | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi index 8fc6c147bdbe..4725045c9583 100755 --- a/solenv/bin/checkapi +++ b/solenv/bin/checkapi @@ -7,8 +7,14 @@ fi JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT -myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar -myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/OOoRunner.jar + +if [ -n "$RUNNERJAR" ]; then + myCLASSPATH=$RUNNERJAR +else + myCLASSPATH=$JARFOLDER/OOoRunner.jar +fi + +myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB if [ -n "$JAVAI" ]; then diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm index dbbd61949442..e4c150b6b971 100644 --- a/solenv/bin/checkapi.btm +++ b/solenv/bin/checkapi.btm @@ -3,7 +3,14 @@ rem @echo off setlocal SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT% -SET APICLASSPATH=%JARFOLDER%\OOoRunner.jar;%JARFOLDER%\ridl.jar;%JARFOLDER%\unoil.jar;%JARFOLDER%\jurt.jar;%JARFOLDER%\juh.jar;%JARFOLDER%\java_uno.jar;\\unoapi\export\unoapi\bin\mysql.jar + +IFF "%RUNNERJAR%" != "" THEN + SET APICLASSPATH=%RUNNERJAR% +ELSE + SET APICLASSPATH=%JARFOLDER%\OOoRunner.jar +ENDIFF + +SET APICLASSPATH=%APICLASSPATH%;%JARFOLDER%\ridl.jar;%JARFOLDER%\unoil.jar;%JARFOLDER%\jurt.jar;%JARFOLDER%\juh.jar;%JARFOLDER%\java_uno.jar;\\unoapi\export\unoapi\bin\mysql.jar IFF "%JAVAI%" != "" THEN SET JAVABIN=%JAVAI% |