[Libreoffice-commits] .: 2 commits - connectivity/source desktop/scripts

[Caolán McNamara]

 connectivity/source/commontools/makefile.mk |    4 ++--
 connectivity/source/drivers/ado/makefile.mk |   10 +++++-----
 desktop/scripts/soffice.sh                  |    6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 43e663cc493485f95b01945eccc47bc3298f6a41
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 5 13:15:05 2011 +0100

    set some more files to use exceptions

diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index cab2160..2412538 100755
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
@@ -86,12 +86,12 @@ EXCEPTIONSFILES=\
         $(SLO)$/DriversConfig.obj                       \
         $(SLO)$/formattedcolumnvalue.obj                \
         $(SLO)$/BlobHelper.obj							\
-        $(SLO)$/warningscontainer.obj
+        $(SLO)$/warningscontainer.obj                   \
+        $(SLO)$/dbconversion.obj
 
 SLOFILES=\
         $(EXCEPTIONSFILES)								\
         $(SLO)$/AutoRetrievingBase.obj					\
-        $(SLO)$/dbconversion.obj
 
 
 
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 02b72a7..8e65a87 100755
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -70,13 +70,13 @@ EXCEPTIONSFILES= \
         $(SLO)$/AStatement.obj							\
         $(SLO)$/APreparedStatement.obj					\
         $(SLO)$/AResultSetMetaData.obj					\
-        $(SLO)$/ADriver.obj								\
-        $(SLO)$/Aservices.obj
+        $(SLO)$/ADriver.obj                             \
+        $(SLO)$/Aservices.obj                           \
+        $(SLO)$/Awrapado.obj                            \
+        $(SLO)$/adoimp.obj
 
 SLOFILES=\
-        $(EXCEPTIONSFILES)								\
-        $(SLO)$/Awrapado.obj							\
-        $(SLO)$/adoimp.obj
+        $(EXCEPTIONSFILES)
 # --- Library -----------------------------------
 
 SHL1TARGET=	$(ADO_TARGET)$(DLLPOSTFIX)
commit 1222aa9de25574737f3dba7e92aedcca794220a8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 5 11:33:11 2011 +0100

    don't use G_SLICE for helgrind case

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index dd17fe9..41abecd 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -75,8 +75,10 @@ fi
 if [ "$VALGRIND" != "" ]; then
     VALGRINDCHECK="valgrind --tool=$VALGRIND --trace-children=yes --trace-children-skip=*/java --error-exitcode=101"
     export VALGRINDCHECK
-    G_SLICE=always-malloc
-    export G_SLICE
+    if [ "$VALGRIND" = "memcheck" ]; then
+        G_SLICE=always-malloc
+        export G_SLICE
+    fi
 fi
 
 case "`uname -s`" in