diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-07-06 14:40:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-07-06 14:40:18 +0000 |
| commit | fc2d14be59dbc93b2e1916052e1e0e383825f1f5 (patch) | |
| tree | 7d48dbacad8f77ee49a88afcb4606d91c2b76f08 /odk/setsdkenv_unix.sh.in | |
| parent | 468a18eea90174305e33a8d9935bad72b1f89c76 (diff) | |
CWS-TOOLING: integrate CWS sdk311_DEV300
2009-06-09 10:22:56 +0200 jsc r272754 : #i101883# adapt number
2009-06-03 13:25:57 +0200 jsc r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion
2009-06-03 13:20:14 +0200 jsc r272558 : #i101883# ensure correct archive or package name
2009-06-02 14:56:40 +0200 jsc r272506 : #i101883# ensure correct archive or package name
2009-05-27 11:26:35 +0200 jsc r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310@272261 (milestone: OOO310:m12)
2009-05-26 15:15:13 +0200 jsc r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings
Diffstat (limited to 'odk/setsdkenv_unix.sh.in')
| -rw-r--r-- | odk/setsdkenv_unix.sh.in | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 44fb741eca1b..bb3c16222628 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -122,7 +122,7 @@ OO_SDK_OUT=$OO_SDK_HOME # Prepare appropriate output directory. if [ -n "${OO_SDK_OUTPUT_DIR}" ] then - OO_SDK_OUT=${OO_SDK_OUTPUT_DIR}/$OO_SDK_NAME + OO_SDK_OUT=${OO_SDK_OUTPUT_DIR}/${OO_SDK_NAME} export OO_SDK_OUT fi @@ -278,37 +278,44 @@ then export STLDEBUG fi -# For URE, prepare symbolic links for libraries: -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}" - -if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] +if [ "${platform}" = "MacOSX" ] then - rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" -fi +# For URE, prepare symbolic links for libraries: +# Only necessary on MacOSX, on other Unix systems the links are already prepared +# in the SDK installation. +# cleanup potential old links first + 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}" -if [ "${OO_SDK_URE_HOME}" ] -then - mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_URE_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" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_URE_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" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - - if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] + if [ -L "${OO_SDK_OUT}/${directoryname}/lib/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}" + rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" fi -fi +# prepare links + if [ "${OO_SDK_URE_HOME}" ] + then + mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" + ln -s "${OO_SDK_URE_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" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" + ln -s "${OO_SDK_URE_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" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${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 + # Prepare shell with all necessary environment variables. echo |