summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-01-22 18:50:33 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2010-01-22 18:50:33 +0100
commit154463ac8c2cdf76a57fefcc13a310f3a7eff794 (patch)
tree4429f512b8c29ab2ee83813e744d2bb489fb7206
parent3406b75aaec59100b015b9bcd2efe303f2a2f78b (diff)
cws l10ntools: #i107386# #i107993# #ii107992# #i107991# #i108587# Added some buildtypes , fix for broken localize_sl regarding UPDMINOREXT , pmladeks localize.pl ooo enforcer patch
-rwxr-xr-xsolenv/bin/localize4
-rwxr-xr-xsolenv/bin/localize_sl18
2 files changed, 20 insertions, 2 deletions
diff --git a/solenv/bin/localize b/solenv/bin/localize
index 74a75ecc3aee..e14b149226b5 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -12,9 +12,9 @@ else
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
fi
-if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then
exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
else
- exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
+ exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
fi
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
new file mode 100755
index 000000000000..df8205cf6d22
--- /dev/null
+++ b/solenv/bin/localize_sl
@@ -0,0 +1,18 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+ echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ "${OS?}" = MACOSX ]; then
+ export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+else
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+fi
+
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx ]; then
+ exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+else
+ exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@"
+fi
+