diff options
| author | Release Engineers <releng@openoffice.org> | 2009-08-06 07:01:05 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-08-06 07:01:05 +0000 |
| commit | 72b0b03c84387f4a783c9991f09bb0fd42c7349a (patch) | |
| tree | 698be33f6064af739719bfeee8e4f1274e90c1f1 /odk/setsdkenv_unix.sh.in | |
| parent | cbe90db8b0736df296d38e134771c7e6ca237368 (diff) | |
CWS-TOOLING: integrate CWS jsc320
2009-07-31 11:40:04 +0200 jsc r274518 : #103926# apply patch
2009-07-16 17:17:01 +0200 jsc r274063 : #i103311# check new Solaris compiler version ox5100
2009-07-07 17:20:41 +0200 jsc r273811 : cleanup
2009-07-07 15:21:26 +0200 jsc r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
2009-07-07 15:07:05 +0200 jsc r273798 : #i98322# correct link
2009-07-07 09:43:57 +0200 jsc r273773 : #i98322# correct link path
2009-07-06 15:49:07 +0200 jsc r273749 : #i98322# correct typo
2009-07-06 14:17:27 +0200 jsc r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
2009-07-03 13:54:58 +0200 jsc r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
2009-07-02 13:12:02 +0200 jsc r273643 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:11:30 +0200 jsc r273642 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:05:35 +0200 jsc r273640 : #i103260# correct typo for windows
2009-07-02 13:01:34 +0200 jsc r273639 : #i103260# provide regview with path as argument
2009-07-01 07:18:01 +0200 jsc r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 08:01:13 +0200 jsc r273485 : #98322# include import purpenvhelper lib under windows
2009-06-10 15:07:29 +0200 jsc r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49)
2009-05-27 09:36:23 +0200 jsc r272329 : #i98322# create link for purpenvhelper library in SDK
2009-05-27 09:35:41 +0200 jsc r272328 : #i98322# create link for purpenvhelpr library in SDK
2009-05-14 16:19:41 +0200 jsc r271900 : increase version number in SDK header image
2009-05-14 16:11:05 +0200 jsc r271899 : #i101408# new version 3.2
2009-05-14 15:33:47 +0200 jsc r271894 : #i99163# apply patch to correct wrong tags for autodoc
2009-05-14 14:49:58 +0200 jsc r271889 : #i99707# apply patch to remove unused code
Diffstat (limited to 'odk/setsdkenv_unix.sh.in')
| -rw-r--r-- | odk/setsdkenv_unix.sh.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index bb3c16222628..0f6ef22519cd 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -143,7 +143,7 @@ case ${sdk_platform} in soext=so exampleout=SOLARISexample.out stldebug=_debug - LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/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_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -179,7 +179,7 @@ case ${sdk_platform} in exampleout=LINUXexample.out platform=Linux stldebug=_stldebug - LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/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_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -197,7 +197,7 @@ case ${sdk_platform} in exampleout=FREEBSDexample.out platform=FreeBSD stldebug=_stldebug - LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/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_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH if [ -e "/sbin/sysctl" ] @@ -288,7 +288,8 @@ then rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" + "${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 @@ -307,6 +308,8 @@ then "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" ln -s "${OO_SDK_URE_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" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] then |