From a613c9ad5be96a9880cb81571e2128676e3e2151 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 24 Mar 2011 09:40:09 +0100 Subject: Some OOo -> LO changes (hopeful nothing broke with them) --- odk/docs/install.html | 20 ++++++++++---------- odk/setsdkenv_unix.csh.in | 6 +++--- odk/setsdkenv_unix.sh.in | 6 +++--- odk/setsdkenv_windows.template | 14 +++++++------- odk/util/makefile.pmk | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'odk') diff --git a/odk/docs/install.html b/odk/docs/install.html index baf9b5f1259f..87a07ca2364b 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -1,6 +1,6 @@ - OpenOffice.org %PRODUCT_RELEASE% SDK - Installation Guide + LibreOffice %PRODUCT_RELEASE% SDK - Installation Guide @@ -36,16 +36,16 @@ - + @@ -134,7 +134,7 @@
  • C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat  -> for Windows2000/XP or later

    The automatically started configure script (Unix and Windows2000/XP) - requests relevant information and directories (SDK, StarOffice, GNU make, + requests relevant information and directories (SDK, LibreOffice, GNU make, Java, C++), in order to prepare a working SDK environment. After completing the configure script once, the newly created script is always used to set the necessary environment variables for using the SDK and the required @@ -154,8 +154,8 @@

    • -

    The OpenOffice.org %PRODUCT_RELEASE% SDK comes with a set of development tools, base +

    The LibreOffice %PRODUCT_RELEASE% SDK comes with a set of development tools, base libraries, header files and helper class files that can be used to - develop Java/C++ components, to embed the OpenOffice.org %PRODUCT_RELEASE% application in + develop Java/C++ components, to embed the LibreOffice %PRODUCT_RELEASE% application in your own programs, or to use the API (scripting or remote control the office). For a complete working environment, we have some additional requirements:
    OpenOffice.org %PRODUCT_RELEASE% installationLibreOffice %PRODUCT_RELEASE% installation The SDK works on top of an existing office installation and uses the same libraries as the office installation.
    - @@ -172,14 +172,14 @@ + "/opt/libreoffice/sdk" @@ -218,7 +218,7 @@ the output is generated in the SDK directory itself. If an output directory is specified, the output is generated in a SDK dependent subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR> - /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out) + /LibreOffice %PRODUCT_RELEASE%/LINUXExample.out) diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in index 26f3b33a9393..cb2b0f5df695 100644 --- a/odk/setsdkenv_unix.csh.in +++ b/odk/setsdkenv_unix.csh.in @@ -8,16 +8,16 @@ setenv OO_SDK_NAME @OO_SDK_NAME@ # Installation directory of the Software Development Kit. -# Example: setenv OO_SDK_HOME /opt/openoffice.org/basis3.0/sdk +# Example: setenv OO_SDK_HOME /opt/libreoffice/basis3.4/sdk setenv OO_SDK_HOME '@OO_SDK_HOME@' # Office installation directory. -# Example: set OFFICE_HOME=/opt/openoffice.org3 +# Example: set OFFICE_HOME=/opt/libreoffice set OFFICE_HOME='@OFFICE_HOME@' OFFICE_BASE_HOME='@OFFICE_BASE_HOME@' # URE installation directory. -# Example: setenv OO_SDK_URE_HOME /opt/openoffice.org/ure +# Example: setenv OO_SDK_URE_HOME /opt/libreoffice/ure setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@' # Directory of the make command. diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index bf9761df3e77..91bf164bffbc 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -9,16 +9,16 @@ OO_SDK_NAME=@OO_SDK_NAME@ export OO_SDK_NAME # Installation directory of the Software Development Kit. -# Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk +# Example: OO_SDK_HOME=/opt/libreoffice/basis3.4/sdk OO_SDK_HOME='@OO_SDK_HOME@' # Office installation directory. -# Example: OFFICE_HOME=/opt/openoffice.org3 +# Example: OFFICE_HOME=/opt/libreoffice OFFICE_HOME='@OFFICE_HOME@' OFFICE_BASE_HOME='@OFFICE_BASE_HOME@' # URE installation directory. -# Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure +# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure OO_SDK_URE_HOME='@OO_SDK_URE_HOME@' export OO_SDK_URE_HOME diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template index d9dc4ec81fd4..fbe09f91755f 100755 --- a/odk/setsdkenv_windows.template +++ b/odk/setsdkenv_windows.template @@ -3,22 +3,22 @@ REM This script sets all enviroment variables, which REM are necessary for building the examples of the Office Development Kit. REM The Script was developed for the operating systems Windows. REM The SDK name -REM Example: set OO_SDK_NAME=openoffice3.0_sdk -set OO_SDK_NAME=openoffice.org3.0_sdk +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\OpenOffice.org\Basic 3.0\sdk +REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\Basis\sdk set OO_SDK_HOME= REM Office installation directory. -REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org 3 +REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3 set OFFICE_HOME= -REM Example: set OFFICE_HOME=C:\Program Files\OpenOffice.org\Basis 3.0 +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\OpenOffice.org\URE +REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE set OO_SDK_URE_HOME= REM Directory of the make command. @@ -45,7 +45,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:\openoffice.org3.0_sdk +REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\Basis\sdk set OO_SDK_OUT= REM Automatic deployment diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index d6d1f997651a..6e9f2013d0c2 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -27,8 +27,8 @@ # used for sdk common files PRODUCT_RELEASE=3.4 -OFFICENAME=OpenOffice.org -SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk +OFFICENAME=LibreOffice +SDKDIRNAME=libreoffice$(PRODUCT_RELEASE)_sdk OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE) TITLE=$(OFFICENAME) $(PRODUCT_RELEASE) SDK IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API" -- cgit
    OFFICE_HOMEPath to an existing StarOffice™ or OpenOffice.org - base installation, e.g. "/opt/staroffice8". Be sure + Path to an existing LibreOffice + base installation, e.g. "/opt/libreoffice8". Be sure that it is not a user installation only. Exactly one of OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be either unset or set to an empty value.
    OO_SDK_URE_HOME Path to an existing UNO Runtime Environment - installation, e.g. "/opt/openoffice.org/ure". Exactly one of + installation, e.g. "/opt/libreoffice/ure". Exactly one of OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be either unset or set to an empty value.
    OO_SDK_HOME Path to the SDK root directory, e.g. - "/usr/local/StarOffice8_SDK"
    OO_SDK_JAVA_HOME
    SDK_AUTO_DEPLOYMENT