[Libreoffice-commits] .: 3 commits - solenv/gbuild

[David Tardon]

 solenv/gbuild/gbuild.mk |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

New commits:
commit a9ee50d38ddde938a9342dca5801253537f11b8c
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 5 14:28:02 2011 +0200

    do not define NDEBUG on debug level 1

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8fbe218..b94295f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -208,15 +208,13 @@ ifneq ($(strip $(SOLAR_JAVA)),)
 gb_GLOBALDEFS += -DSOLAR_JAVA
 endif
 
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_GLOBALDEFS += \
-	-DDEBUG \
-
-else
+ifeq ($(gb_DEBUGLEVEL),0)
 gb_GLOBALDEFS += \
 	-DOPTIMIZE \
 	-DNDEBUG \
-
+else ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
+gb_GLOBALDEFS += \
+	-DDEBUG \
 endif
 
 ifneq ($(strip $(ENABLE_GTK)),)
commit de5727cfb416f68d2203db4af5c9e1075dd8fe1a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 5 14:23:30 2011 +0200

    fix typo

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index ce3c3fe..8fbe218 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -347,7 +347,7 @@ INTERACTIVE VARIABLES:
 
        ENABLE_PCH      If not empty, use precompiled headers (Windows only).
        CFLAGS          Add as compiler flags for plain c compilation.
-       CXXFLAGSX       Add as compiler flags for c++ compilation.
+       CXXFLAGS        Add as compiler flags for c++ compilation.
        gb_FULLDEPS     Generate and use dependencies (on by default, handle with care).
        gb_COLOR        Use ASCII color output.
        gb_TITLES       Show progress in terminal title.
commit 29c4b0ed1e63c58f62290854c4c4a77069d604b0
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 5 14:22:52 2011 +0200

    update the dbglevel comment

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index ebbf690..ce3c3fe 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -335,11 +335,16 @@ INTERACTIVE VARIABLES:
                        If not empty, build with debug symbols. Automatically
                        enabled by DEBUG/debug.
        DBGLEVEL / dbglevel
-                       If not empty, force the debug level to the specified value.
+                       If not empty, force the debug level to the specified value. The
+                       debug level is passed to the source code through OSL_DEBUG_LEVEL
+                       macro.
                        0 = no debug
                        1 = symbols + no optimizations
-                       2 = symbols + no optimizations + extra debug output
-                           (OSL_DEBUG_LEVEL is set to 2)
+                       2 = symbols + no optimizations + extra debug output. OSL_TRACE
+                           starts being active on this level.
+                       3... = symbols + no optimizations + extra debug output (usually
+                              extremely verbose). Levels > 2 are not used very much.
+
        ENABLE_PCH      If not empty, use precompiled headers (Windows only).
        CFLAGS          Add as compiler flags for plain c compilation.
        CXXFLAGSX       Add as compiler flags for c++ compilation.