diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /odk/setsdkenv_windows.template | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'odk/setsdkenv_windows.template')
| -rwxr-xr-x | odk/setsdkenv_windows.template | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template index fbe09f91755f..96877d26c28a 100755 --- a/odk/setsdkenv_windows.template +++ b/odk/setsdkenv_windows.template @@ -7,16 +7,13 @@ REM Example: set OO_SDK_NAME=libreoffice3.4_sdk set OO_SDK_NAME=libreoffice3.4_sdk REM Installation directory of the Software Development Kit. -REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\Basis\sdk +REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\sdk set OO_SDK_HOME= REM Office installation directory. REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3 set OFFICE_HOME= -REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3\Basis -set OFFICE_BASE_HOME= - REM URE installation directory. REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE set OO_SDK_URE_HOME= @@ -45,7 +42,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05 set OO_SDK_JAVA_HOME= REM Special output directory -REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\Basis\sdk +REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\sdk set OO_SDK_OUT= REM Automatic deployment @@ -90,11 +87,6 @@ if defined OFFICE_HOME ( set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program ) -REM Set office program path. -if defined OFFICE_BASE_HOME ( - set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\program - ) - REM Set UNO path, necessary to ensure that the cpp examples using the REM new UNO bootstrap mechanism use the configured office installation REM (only set when using an Office). @@ -108,8 +100,8 @@ set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\bin set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\java REM ) else ( set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH% -set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH% -set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes +set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH% +set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes REM ) REM Set classpath @@ -157,7 +149,6 @@ echo * SDK environment is prepared for Windows echo * echo * SDK = %OO_SDK_HOME% echo * Office = %OFFICE_HOME% -echo * Office Base = %OFFICE_BASE_HOME% echo * URE = %OO_SDK_URE_HOME% echo * Make = %OO_SDK_MAKE_HOME% echo * Zip = %OO_SDK_ZIP_HOME% |