javaunohelper/com/sun/star/comp/helper/UnoInfo.java | 3 odk/configure.pl | 34 +++++++ odk/docs/install.html | 93 +++++++++----------- odk/setsdkenv_unix.sh.in | 61 +++++-------- odk/settings/settings.mk | 44 +++------ odk/source/unoapploader/unx/unoapploader.c | 14 ++- odk/util/makefile.pmk | 2 7 files changed, 129 insertions(+), 122 deletions(-)
New commits: commit f3b3a6daf24c4fd9ca9d5b726c64d44017bef71a Author: Jürgen Schmidt <[email protected]> Date: Tue Jun 11 15:07:33 2013 +0000 #122482# make boost optional and adapt settings diff --git a/odk/configure.pl b/odk/configure.pl index eee5324..9f6e2a4 100755 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -94,6 +94,10 @@ if ( $main::operatingSystem =~ m/darwin/ ) $main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog("javac"); $main::javaVersion = "1.5.0_01"; +$main::OO_SDK_BOOST_HOME_SUGGESTION = ""; +$main::boostVersion = "1.48.0"; +$main::skipBoostDir = 0; + $main::SDK_AUTO_DEPLOYMENT = ""; $main::SDK_AUTO_DEPLOYMENT_SUGGESTION = "YES"; @@ -490,6 +494,34 @@ while ( (!$main::correctVersion) && } } +# prepare boost directory (optional) +while ( (!$main::skipBoostDir) && + ((! -d "$main::OO_SDK_BOOST_HOME" ) || + ((-d "$main::OO_SDK_BOOST_HOME") && (! -e "$main::OO_SDK_BOOST_HOME/boost/tr1/unordered_map.hpp"))) ) +{ + + print " Enter boost directory [$main::OO_SDK_BOOST_HOME_SUGGESTION]: "; + $main::OO_SDK_BOOST_HOME = readStdIn(); + chop($main::OO_SDK_BOOST_HOME); + if ( $main::OO_SDK_BOOST_HOME eq "" ) + { + $main::OO_SDK_BOOST_HOME = $main::OO_SDK_BOOST_HOME_SUGGESTION; + } + if ( (! -d "$main::OO_SDK_BOOST_HOME") || + ((-d "$main::OO_SDK_BOOST_HOME") && (! -e "$main::OO_SDK_BOOST_HOME/boost/tr1/unordered_map.hpp")) ) + { + print " Error: boost couldn't be find or verified, please specify a boost directory.\n"; + if ( skipChoice("optional output directory") == 1 ) + { + $main::skipBoostDir = 1; + } + $main::OO_SDK_BOOST_HOME = ""; + } else + { + # the boost directory is optional + $main::skipBoostDir = 1; + } +} # prepare output directory (optional) while ( (!$main::skipOutputDir) && @@ -744,7 +776,6 @@ sub prepareScriptFile() $_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go; $_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go; $_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go; -# $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go; $_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go; $_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go; $_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go; @@ -752,6 +783,7 @@ sub prepareScriptFile() $_ =~ s#\@OO_SDK_CPP_HOME\@#$main::OO_SDK_CPP_HOME#go; $_ =~ s#\@OO_SDK_CC_55_OR_HIGHER\@#$main::OO_SDK_CC_55_OR_HIGHER#go; $_ =~ s#\@OO_SDK_JAVA_HOME\@#$main::OO_SDK_JAVA_HOME#go; + $_ =~ s#\@OO_SDK_BOOST_HOME\@#$main::OO_SDK_BOOST_HOME#go; $_ =~ s#\@SDK_AUTO_DEPLOYMENT\@#$main::SDK_AUTO_DEPLOYMENT#go; $_ =~ s#\@OO_SDK_OUTPUT_DIR\@#$main::OO_SDK_OUTPUT_DIR#go; diff --git a/odk/docs/install.html b/odk/docs/install.html index 146d091..e3a12cb 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -150,6 +150,13 @@ <tr valign="middle"> <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> </tr> + <td><b>Boost (<b>Unix only</b> and optional)<b></td> + <td class="content80">The boost library is used today on Unix systems as replacement for the stlport library. The stlport library is removed and replaced by either the compiler stl (on Windows) or the boost stl on all Unix based systems. We are planning to switch to the compiler stl completely as soon as possible. The boost headers/library are <b>optional</b> and for C++ development only if stl containers are used. + <p><b>Download:</b> <a target="_blank" href="http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download"; title="link to boost version 1.48.0 (online)">http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download</a>.</p> + </td> + <tr valign="middle"> + <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> + </tr> <tr> <td><img class="nothing10" src="images/nada.gif"></td> <td align="right"> @@ -188,10 +195,8 @@ <tr valign="top"> <td class="cell20"><b>OFFICE_HOME</b></td> <td class="cell80">Path to an existing Apache OpenOffice - base installation, e.g. "/opt/openoffice3". 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.</td> + installation, e.g. "/opt/openoffice4". Be sure + that it is not a user installation only.</td> </tr> <tr><a name="oosdkname"/> <td class="cell20"><b>OO_SDK_NAME</b></td> @@ -202,13 +207,6 @@ example, used to create an output directory in the users home directory for any generated output when you use the SDK build environment.</td> </tr> - <tr> - <td class="cell20"><b>OO_SDK_URE_HOME</b></td> - <td class="cell80">Path to an existing UNO Runtime Environment - installation, e.g. "/opt/openoffice/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.</td> - </tr> <tr> <td class="cell20"><b>OO_SDK_HOME</b></td> <td class="cell80">Path to the SDK root directory, e.g. @@ -252,6 +250,10 @@ <td class="cell20"><b>OO_SDK_SED_HOME</b></td> <td class="cell80">Path to the 'sed' tool.</td> </tr> + <tr> + <td class="cell20"><b>OO_SDK_BOOST_HOME</b></td> + <td class="cell80">Path to a boost installation, this is optional for C++ and Unix only.</td> + </tr> <tr> <td class="cell20"><b>OO_SDK_OUTPUT_DIR</b></td> <td class="cell80">Path to an existing directory where the example output @@ -299,46 +301,36 @@ <td class="cell80">See description <a href="#oosdkname" title="link to the description of the environment variable OO_SDK_NAME">above</a>.</td> </tr> <tr valign="top"> - <td class="cell20">OO_SDK_URE_BIN_DIR</td> - <td class="cell80">The path within the chosen office or URE - installation where binary executables are located (e.g., - <i>$OFFICE_HOME/program</i> for an office installation, or - <i>$OO_SDK_URE_HOME/bin</i> for a Unix URE installation).</td> + <td class="cell20">OO_SDK_OFFICE_BIN_DIR</td> + <td class="cell80">The path to the program directory in the office installation (e.g. <i>$OFFICE_HOME/program</i>).</td> </tr> <tr valign="top"> - <td class="cell20">OO_SDK_URE_LIB_DIR</td> - <td class="cell80">The path within the chosen office or URE - installation where dynamic libraries are located (e.g., - <i>$OFFICE_HOME/program</i> for an office installation, or - <i>$OO_SDK_URE_HOME/lib</i> for a Unix URE installation).</td> + <td class="cell20">OO_SDK_OFFICE_LIB_DIR</td> + <td class="cell80">The path to the office program directory in the office installtion (e.g. <i>$OFFICE_HOME/program</i>).</td> </tr> <tr valign="top"> - <td class="cell20">OO_SDK_URE_JAVA_DIR</td> - <td class="cell80">The path within the chosen office or URE - installation where Java JARs are located (e.g., - <i>$OFFICE_HOME/program/classes</i> for an office installation, or - <i>$OO_SDK_URE_HOME/share/java</i> for a Unix URE installation).</td> + <td class="cell20">OO_SDK_OFFICE_JAVA_DIR</td> + <td class="cell80">The path to the classes direcgtory in the office program directory where Java JARs are located (e.g. + <i>$OFFICE_HOME/program/classes</i>).</td> </tr> <tr valign="top"> <td class="cell20">CLASSPATH</td> <td class="cell80"> - =<i>$OO_SDK_URE_JAVA_DIR/juh.jar; - $OO_SDK_URE_JAVA_DIR/jurt.jar; - $OO_SDK_URE_JAVA_DIR/ridl.jar; - $OO_SDK_URE_JAVA_DIR/unoloader.jar; - [$OO_SDK_URE_JAVA_DIR/unoil.jar;] + =<i>$OO_SDK_OFFICE_JAVA_DIR/juh.jar; + $OO_SDK_OFFICE_JAVA_DIR/jurt.jar; + $OO_SDK_OFFICE_JAVA_DIR/ridl.jar; + $OO_SDK_OFFICE_JAVA_DIR/unoloader.jar; + [$OO_SDK_OFFICE_JAVA_DIR/unoil.jar;] $CLASSPATH</i><br> <p>The classpath will be set or extended to the necessary jar files of - the specified office installation. (<i>unoil.jar</i> is only included - when OFFICE_HOME is set.)</p> + the specified office installation.</p> </td> </tr> <tr valign="top"> <td class="cell20">OFFICE_PROGRAM_PATH</td> <td class="cell80">=<i>$OFFICE_HOME/program</i><br> <p>This variable is used to find, for example, the office type library and - the UNO package deployment tool. This variable is only relevant when - OFFICE_HOME is set.</p> + the UNO package deployment tool.</p> </td> </tr> <tr valign="top"> @@ -349,8 +341,7 @@ the bootstrap mechanism finds the default office installation for the user on the system. This variable is optional but is set from the scripts to ensure a homogeneous environment. Especially useful during development - where you might have more than one office installation installed. This - variable is only relevant when OFFICE_HOME is set.</p> + where you might have more than one office installation installed.</p> </td> </tr> </table> @@ -359,25 +350,25 @@ <table class="table4"> <tr valign="top"> <td class="cell20">LD_LIBRARY_PATH</td> - <td class="cell80">=<i>$OO_SDK_URE_LIB_DIR: $OO_SDK_HOME/(solsparc|solintel)/lib: $LD_LIBRARY_PATH</i><br> - <p>The LD_LIBRARY_PATH will be set or will be extended by the office/URE + <td class="cell80">=<i>$OO_SDK_OFFICE_LIB_DIR: $OO_SDK_HOME/(solsparc|solintel)/lib: $LD_LIBRARY_PATH</i><br> + <p>The LD_LIBRARY_PATH will be set or will be extended by the office library path, the platform dependent lib directory for several additional libraries.</p> </td> </tr> <tr valign="top"> <td class="cell20">PATH</td> - <td class="cell80">=<i>$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH</i></b><br> + <td class="cell80">=<i>$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_OFFICE_BIN_DIR: $PATH</i></b><br> <p>The PATH variable will be extended by the paths for the SDK development tools, the compiler, the JDK, GNU make, the zip tool and the - OO_SDK_URE_BIN_DIR, where the compiler or the JDK are + OO_SDK_OFFICE_BIN_DIR, where the compiler or the JDK are optional.</p> </td> </tr> <tr> - <td colspan="2" class="cell80">When OO_SDK_URE_HOME is set, the script + <td colspan="2" class="cell80"Based OFFICE_HOME, the script additionally creates symbolic links to the public dynamic libraries of - the URE in <i>$OO_SDK_HOME/(solsparc|solintel)/lib</i>, which are + the office UNO runtime in <i>$OO_SDK_HOME/(solsparc|solintel)/lib</i>, which are needed for linking.</td> </tr> </table> @@ -385,25 +376,25 @@ <table class="table4"> <tr valign="top"> <td class="cell20">LD_LIBRARY_PATH</td> - <td class="cell80">=<i>$OO_SDK_URE_LIB_DIR: $SDK_HOME/linux/lib: $LD_LIBRARY_PATH</i><br> - <p>The LD_LIBRARY_PATH will be set or will be extended by the office/URE + <td class="cell80">=<i>$OO_SDK_OFFICE_LIB_DIR: $SDK_HOME/linux/lib: $LD_LIBRARY_PATH</i><br> + <p>The LD_LIBRARY_PATH will be set or will be extended by the office library path, the platform dependent lib directory for some additional libraries.</p> </td> </tr> <tr valign="top"> <td class="cell20">PATH</td> - <td class="cell80">=<i>$OO_SDK_HOME/linux/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_URE_BIN_DIR: $PATH</i><br> + <td class="cell80">=<i>$OO_SDK_HOME/linux/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_OFFICE_BIN_DIR: $PATH</i><br> <p>The PATH variable will be extended by the paths for the SDK development tools, the compiler, the JDK, GNU make, the zip tool and the - OO_SDK_URE_BIN_DIR, where the compiler and the JDK are + OO_SDK_OFFICE_BIN_DIR, where the compiler and the JDK are optional.</p> </td> </tr> <tr> - <td colspan="2" class="cell80">When OO_SDK_URE_HOME is set, the script + <td colspan="2" class="cell80">Based on OFFICE_HOME, the script additionally creates symbolic links to the public dynamic libraries of - the URE in <i>$OO_SDK_HOME/linux/lib</i>, which are needed for + the office UNO runtime in <i>$OO_SDK_HOME/linux/lib</i>, which are needed for linking.</td> </tr> </table> @@ -411,10 +402,10 @@ <table class="table4"> <tr valign="top"> <td class="cell20">PATH</td> - <td class="cell80">=<i>%OO_SDK_HOME%\windows\bin; %OO_SDK_MAKE_HOME%; %OO_SDK_ZIP_HOME%; [%OO_SDK_CLI_HOME%;] [%OO_SDK_CPP_HOME%;] [%OO_SDK_JAVA_HOME%\bin;] %OO_SDK_URE_BIN_DIR%; %PATH%</i><br> + <td class="cell80">=<i>%OO_SDK_HOME%\windows\bin; %OO_SDK_MAKE_HOME%; %OO_SDK_ZIP_HOME%; [%OO_SDK_CLI_HOME%;] [%OO_SDK_CPP_HOME%;] [%OO_SDK_JAVA_HOME%\bin;] %OO_SDK_OFFICE_BIN_DIR%; %PATH%</i><br> <p>The PATH variable will be extended by the paths for the SDK development tools, the compiler, the JDK, GNU make, the zip tool and the - OO_SDK_URE_BIN_DIR.</p> + OO_SDK_OFFICE_BIN_DIR.</p> </td> </tr> <tr valign="top"> diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 878d134..4055a64 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -63,6 +63,11 @@ OO_SDK_CC_55_OR_HIGHER=@OO_SDK_CC_55_OR_HIGHER@ # Example: OO_SDK_JAVA_HOME=/usr/jdk/jdk1.6.0_10 OO_SDK_JAVA_HOME=@OO_SDK_JAVA_HOME@ +# Directory of Boost (optional, C++ only) +# Example: OO_SDK_BOOST_HOME=/opt/local/boost_1_48_0 +OO_SDK_BOOST_HOME=@OO_SDK_BOOST_HOME@ +export OO_SDK_BOOST_HOME + # Special output directory # Example: OO_SDK_OUTPUT_DIR=$HOME OO_SDK_OUTPUT_DIR=@OO_SDK_OUTPUT_DIR@ @@ -82,10 +87,9 @@ fi export OO_SDK_HOME # Check installation path for the office. -if [ -z "${OFFICE_HOME}" ] && [ -z "${OO_SDK_URE_HOME}" ] +if [ -z "${OFFICE_HOME}" ] then - echo 'Error: Please set either the environment variable OFFICE_HOME or the' - echo 'environment variable OO_SDK_URE_HOME.' + echo 'Error: Please set either the environment variable OFFICE_HOME.' exit 0 fi @@ -118,13 +122,13 @@ then export UNO_PATH fi -OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH} -OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH} -OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes +OO_SDK_OFFICE_BIN_DIR=${OFFICE_PROGRAM_PATH} +OO_SDK_OFFICE_LIB_DIR=${OFFICE_PROGRAM_PATH} +OO_SDK_OFFICE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes -export OO_SDK_URE_BIN_DIR -export OO_SDK_URE_LIB_DIR -export OO_SDK_URE_JAVA_DIR +export OO_SDK_OFFICE_BIN_DIR +export OO_SDK_OFFICE_LIB_DIR +export OO_SDK_OFFICE_JAVA_DIR OO_SDK_OUT=$OO_SDK_HOME # Prepare appropriate output directory. @@ -151,7 +155,7 @@ case ${sdk_platform} in soext=so exampleout=SOLARISexample.out stldebug=_debug - LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_OFFICE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -169,7 +173,7 @@ case ${sdk_platform} in exampleout=MACOSXexample.out platform=MacOSX stldebug=_stldebug - DYLD_LIBRARY_PATH=/usr/lib:${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH} + DYLD_LIBRARY_PATH=/usr/lib:${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_OFFICE_LIB_DIR}:.:${DYLD_LIBRARY_PATH} export DYLD_LIBRARY_PATH ;; @@ -187,7 +191,7 @@ case ${sdk_platform} in exampleout=LINUXexample.out platform=Linux stldebug=_stldebug - LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_OFFICE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -205,7 +209,7 @@ case ${sdk_platform} in exampleout=FREEBSDexample.out platform=FreeBSD stldebug=_stldebug - LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_OFFICE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH if [ -e "/sbin/sysctl" ] @@ -234,10 +238,10 @@ case ${sdk_platform} in esac # Add directory of the SDK tools to the path. -PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH} +PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OFFICE_PROGRAM_PATH}:.:${PATH} # Set the classpath -CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OO_SDK_URE_JAVA_DIR}/unoil.jar:${CLASSPATH} +CLASSPATH=${OO_SDK_OFFICE_JAVA_DIR}/juh.jar:${OO_SDK_OFFICE_JAVA_DIR}/jurt.jar:${OO_SDK_OFFICE_JAVA_DIR}/ridl.jar:${OO_SDK_OFFICE_JAVA_DIR}/unoloader.jar:${OO_SDK_OFFICE_JAVA_DIR}/unoil.jar:${CLASSPATH} export CLASSPATH @@ -294,12 +298,6 @@ fi export PATH -if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${stldebug}.${soext}" ] -then - STLDEBUG=${stldebug} - export STLDEBUG -fi - if [ "${platform}" = "MacOSX" ] then # For URE, prepare symbolic links for libraries: @@ -313,31 +311,21 @@ then "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] - then - rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" - fi - # prepare links if [ "${OFFICE_HOME}" ] then mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] - then - ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" - fi fi fi @@ -356,6 +344,7 @@ echo " * cat = $OO_SDK_CAT_HOME" echo " * sed = $OO_SDK_SED_HOME" echo " * C++ Compiler = $OO_SDK_CPP_HOME" echo " * Java = $OO_SDK_JAVA_HOME" +echo " * Boost = $OO_SDK_BOOST_HOME" echo " * SDK Output directory = $OO_SDK_OUT" echo " * Auto deployment = $SDK_AUTO_DEPLOYMENT" echo " *" diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 223ed21..b507e32 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -134,10 +134,6 @@ endif LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib" -#ifneq "$(OFFICE_PROGRAM_PATH)" "" -#URE_MISC=$(OFFICE_PROGRAM_PATH)\misc -#endif - # use this for release version #EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1100000 #LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL @@ -240,7 +236,7 @@ endif COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs -LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_OFFICE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" ifeq "$(PROCTYPE)" "sparc64" @@ -249,10 +245,6 @@ LIBRARY_LINK_FLAGS+=-m64 EXE_LINK_FLAGS+=-m64 endif -ifneq "$(OFFICE_PROGRAM_PATH)" "" -URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc -endif - endif @@ -380,13 +372,9 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) #EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive -LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_OFFICE_LIB_DIR)" LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -ifneq "$(OFFICE_PROGRAM_PATH)" "" -URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc -endif - endif ########################################################################### @@ -464,12 +452,12 @@ SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore -SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_sal.dylib' -CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_cppu.dylib' -CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' -SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_salhelper$(COMID).dylib' -REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib' -STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib' +SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib' +CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib' +CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' +SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib' +REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib' +STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib' INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3 @@ -505,14 +493,10 @@ LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(G COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress -LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" +LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_OFFICE_LIB_DIR)" LINK_JAVA_LIBS=-framework JavaVM #LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/Libraries" -ifneq "$(OFFICE_PROGRAM_PATH)" "" -URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc -endif - endif ########################################################################### @@ -625,15 +609,15 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined #EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs -LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS) +LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_OFFICE_LIB_DIR)" $(PTHREAD_LIBS) LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -#ifneq "$(OFFICE_PROGRAM_PATH)" "" -#URE_MISC=$(OFFICE_PROGRAM_PATH)/share/misc -#endif - endif +# add additional boost specific settings +ifneq "$(OO_SDK_BOOST_HOME)" "" +STL_INCLUDES+= -I"$(OO_SDK_BOOST_HOME)" +endif # Add OSL_DEBUG_LEVEL to compiler the flags (for OSL_TRACE et. al.) ifeq "$(DEBUG)" "yes" diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index f57fce6..33174f5 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -193,8 +193,6 @@ INCLUDETOPDIRLIST= \ .IF "$(GUI)"=="WNT" INCLUDETOPDIRLIST += $(INCOUT)/systools -.ELSE -INCLUDETOPDIRLIST += $(INCOUT)/boost .ENDIF INCLUDEDIRLIST:={$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))} commit f6c713b7e38d4de5afdf508b8d6bfc6d1d27e000 Author: Jürgen Schmidt <[email protected]> Date: Tue Jun 11 15:00:40 2013 +0000 #122483# correct library path diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index ddc50a7..4e5240f 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -179,12 +179,22 @@ int main( int argc, char *argv[] ) value = getenv( ENVVARNAME ); + // workaround for finding wrong libsqlite3.dylib in the office installation + // For MacOS > 10.6 nss uses the system lib -> unresolved symbol _sqlite3_wal_checkpoint +#ifdef MACOSX + size = strlen( ENVVARNAME ) + strlen( "=/usr/lib:" ) + strlen( libpath ) + 1; +#else size = strlen( ENVVARNAME ) + strlen( "=" ) + strlen( libpath ) + 1; +#endif if ( value != NULL ) size += strlen( PATHSEPARATOR ) + strlen( value ); envstr = (char*) malloc( size ); strcpy( envstr, ENVVARNAME ); +#ifdef MACOSX + strcat( envstr, "=/usr/lib:" ); +#else strcat( envstr, "=" ); +#endif strcat( envstr, libpath ); if ( freeLibpath != 0 ) { @@ -196,10 +206,12 @@ int main( int argc, char *argv[] ) strcat( envstr, value ); } putenv( envstr ); + fprintf( stderr, "DYLD_LIBRARY_PATH=%s\n", envstr ); + } else { - fprintf( stderr, "Warning: no UNO installation found!\n" ); + fprintf( stderr, "Warning: no office installation found!\n" ); fflush( stderr ); } commit d8a724835732e8111a8798484d63202fc90f93f9 Author: Jürgen Schmidt <[email protected]> Date: Tue Jun 11 14:59:25 2013 +0000 #122483# set correct classpath, inlcude unoil.jar diff --git a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java index 3cd584c..6caeaa2 100644 --- a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java +++ b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java @@ -95,7 +95,8 @@ public final class UnoInfo { String[] jarFileNames = new String[] { "jurt.jar", "ridl.jar", - "juh.jar" }; + "juh.jar", + "unoil.jar" }; return getURLs( jarFileNames ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
