[Libreoffice-commits] .: 10 commits - makefile.rc solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Oct 13 05:40:50 PDT 2010
makefile.rc | 1 +
solenv/bin/checkdll.sh | 4 ++--
solenv/bin/gsicheck | 4 ++--
solenv/bin/localize | 4 ++--
solenv/bin/localize_sl | 4 ++--
solenv/bin/rpm-wrapper | 6 +++---
solenv/bin/soirpm.sh | 2 +-
solenv/inc/minor.mk | 4 ++--
solenv/inc/postset.mk | 3 ++-
9 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit 2ab0f2b4363c70dc0c732010ca70a77455fb16a8
Merge: a410592... 85815d7...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 13 14:37:21 2010 +0200
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/bootstrap
commit a4105924560d81d691c9723a2a06d38f15338108
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 13 11:59:32 2010 +0200
Remove dmake also from solenv.
diff --git a/makefile.rc b/makefile.rc
index 82c5802..c7cef87 100644
--- a/makefile.rc
+++ b/makefile.rc
@@ -71,6 +71,7 @@ clean .PHONY:
.IF "$(BUILD_DMAKE)"!="NO"
-echo cleaning up dmake...
-$(GNUMAKE) -C dmake clean
+ -rm -f solenv/*/bin/dmake*
.ENDIF
#
commit 484a222c40a4b7728b80596c49c272a132668f96
Merge: 804b560... cc6a84b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Oct 13 11:30:47 2010 +0200
Merge commit 'ooo/OOO330_m10'
Conflicts:
solenv/inc/minor.mk
diff --cc solenv/inc/minor.mk
index 081bc79,23f622f..9b71bf1
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
- RSCREVISION=330m9(Build:1)
-RSCREVISION=330m10(Build:9533)
-BUILD=9533
++RSCREVISION=330m10(Build:1)
+BUILD=1
- LAST_MINOR=m9
+ LAST_MINOR=m10
SOURCEVERSION=OOO330
commit cc6a84bdb3c0158131d62cc16a62d65410aac68c
Author: Release Engineering <releng at openoffice.org>
Date: Fri Oct 8 10:09:56 2010 +0200
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 6172439..23f622f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m9(Build:9529)
-BUILD=9529
-LAST_MINOR=m9
+RSCREVISION=330m10(Build:9533)
+BUILD=9533
+LAST_MINOR=m10
SOURCEVERSION=OOO330
commit 6bb5625279098109c90a4b68ad41fe98b0113a16
Merge: 34d9bb1... 7c11efd...
Author: obo <obo at openoffice.org>
Date: Fri Oct 8 08:45:29 2010 +0200
CWS-TOOLING: integrate CWS hb22
commit 34d9bb16add183433488858bd45992629a87222e
Merge: f8c90fc... 5e7df9a...
Author: obo <obo at openoffice.org>
Date: Fri Oct 8 08:35:58 2010 +0200
CWS-TOOLING: integrate CWS ooo330l10n4
commit 5e7df9a40e448ec1a71b939c169b2e1f0f0236fa
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Oct 5 19:12:27 2010 +0200
ooo330l10n4: added sq ta
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 7741384..f16ccb5 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-
# Default ISO code used when no languages specified
# This language will be always included!
defaultlangiso=en-US
@@ -118,6 +117,7 @@ sa-IN \
si \
sc \
sd \
+sq \
sk \
sl \
sh \
@@ -129,6 +129,7 @@ sw \
sw-TZ \
te-IN \
ti-ER \
+ta \
ta-IN \
th \
tn \
commit 7c11efda2db4436c26d971ffb383ecc67c998bb3
Merge: 6656fe6... 777b837...
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Mon Sep 20 17:13:53 2010 +0200
merged OOO330_m8
commit 6656fe66cbc1a85039c6f1675e895642a0a702a6
Merge: e77fae2... 3fe3a16...
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Fri Sep 10 17:42:43 2010 +0200
merged changes by sb
commit 3fe3a16cfcb053e1565b8e12c238b0e8ce84b4bd
Author: sb <sb at openoffice.org>
Date: Thu Sep 9 10:48:03 2010 +0200
hb22: #b6982587# treat null LD_LIBRARY_PATH like unset one
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index f1aae46..c836198 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -51,12 +51,12 @@ if [ -x $checkdll ]; then
shift # remove the trailing ---
case `uname -s` in
- Darwin) case "${DYLD_LIBRARY_PATH+X}" in
+ Darwin) case "${DYLD_LIBRARY_PATH:+X}" in
X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
*) DYLD_LIBRARY_PATH=$libpath;;
esac
export DYLD_LIBRARY_PATH;;
- *) case "${LD_LIBRARY_PATH+X}" in
+ *) case "${LD_LIBRARY_PATH:+X}" in
X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
*) LD_LIBRARY_PATH=$libpath;;
esac
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
index 9b898c9..fb2f65c 100755
--- a/solenv/bin/gsicheck
+++ b/solenv/bin/gsicheck
@@ -5,9 +5,9 @@ exit 1
fi
if [ "${OS?}" = MACOSX ]; then
- export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+ 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}
+ 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
diff --git a/solenv/bin/localize b/solenv/bin/localize
index e14b149..ef5550e 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -7,9 +7,9 @@ fi
# localize.pl calls localize_sl in solver bin directory which depends on dynamic
# libraries in solver lib directory but has no correct RPATH (or equivalent):
if [ "${OS?}" = MACOSX ]; then
- export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+ 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}
+ 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
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
index df8205c..af7f835 100755
--- a/solenv/bin/localize_sl
+++ b/solenv/bin/localize_sl
@@ -5,9 +5,9 @@ exit 1
fi
if [ "${OS?}" = MACOSX ]; then
- export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+ 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}
+ 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
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1a285dd..f4234a9 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -35,15 +35,15 @@
set -e
if [ "$OUTPATH" = "unxlngi6" ]
then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
${BUILD_TOOLS?}/rpmbuild "$@"
else
if [ "$OUTPATH" = "unxlngx6" ]
then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
${BUILD_TOOLS?}/rpmbuild "$@"
else
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
${BUILD_TOOLS?}/rpm "$@"
fi
fi
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
old mode 100755
new mode 100644
index 6c7595d..f984bbe
--- a/solenv/bin/soirpm.sh
+++ b/solenv/bin/soirpm.sh
@@ -28,5 +28,5 @@
LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
# echo $(dirname $LIBRPMBUILD)
LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm "$@"
-# LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
# ${BUILD_TOOLS?}/rpm "$@"
More information about the Libreoffice-commits
mailing list