solenv/gbuild/gbuild.help.txt | 3 +--
solenv/gbuild/gbuild.mk | 35 ++++++++++++++---------------------
2 files changed, 15 insertions(+), 23 deletions(-)
New commits:
commit b42429f68cb83fcfc5de102b0922b05ecd6c528e
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Mar 20 22:53:27 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 22 08:42:25 2024 +0100
Determine OSL_DEBUG_LEVEL directly from dbglevel
...and reorder the code a bit, so that the dbglevel-releated code is
separated
from the gb_ENABLE_SYMBOLS_FOR-related code
Change-Id: I80649b32fd6cceb8df1e4e2e29e98508e28f338b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165136
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 42a2617b92c1..a36b2b758479 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -84,31 +84,30 @@ ifneq ($(strip $(TIMELOG)$(timelog)),)
gb_TIMELOG := 1
endif
+ifeq ($(strip $(dbglevel)),)
+ifeq ($(debug),)
+dbglevel := 0
+else
+dbglevel := 1
+endif
+endif
+
gb_ENABLE_SYMBOLS_FOR := $(ENABLE_SYMBOLS_FOR)
# enable_symbols (presumably from the command line)
ifneq ($(strip $(enable_symbols)),)
gb_ENABLE_SYMBOLS_FOR := $(enable_symbols)
endif
-
-# note: ENABLE_BREAKPAD turns on symbols
-ifneq ($(strip $(ENABLE_BREAKPAD)),)
-gb_ENABLE_SYMBOLS_FOR := all
-endif
-
-gb_DEBUGLEVEL := 0
-ifneq ($(strip $(debug)),)
-gb_DEBUGLEVEL := 1
ifeq ($(origin debug),command line)
gb_ENABLE_SYMBOLS_FOR := all
endif
-endif
-
-ifneq ($(strip $(dbglevel)),)
-gb_DEBUGLEVEL := $(strip $(dbglevel))
ifeq ($(origin dbglevel),command line)
gb_ENABLE_SYMBOLS_FOR := all
endif
+
+# note: ENABLE_BREAKPAD turns on symbols
+ifneq ($(strip $(ENABLE_BREAKPAD)),)
+gb_ENABLE_SYMBOLS_FOR := all
endif
# handle special cases
@@ -206,7 +205,7 @@ gb_CPUDEFS += -D$(CPUNAME)
gb_GLOBALDEFS := \
-D_REENTRANT \
- -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
+ -DOSL_DEBUG_LEVEL=$(dbglevel) \
$(gb_OSDEFS) \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
commit 8e10fd30cf7ef5774c54dc2dce0f8e00b279b106
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Mar 20 22:34:39 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 22 08:42:18 2024 +0100
$(ENABLE_DBGUTIL) implies $(debug) (aka $(ENABLE_DEBUG))
...so no need to check the former in addition to the latter (which is done
a few
lines up)
Change-Id: Iefe1ccbd3d22ca4e97425d20d1ff21f68d641b2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165135
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d842e0af0b86..42a2617b92c1 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -103,9 +103,6 @@ ifeq ($(origin debug),command line)
gb_ENABLE_SYMBOLS_FOR := all
endif
endif
-ifeq ($(ENABLE_DBGUTIL),TRUE)
-gb_DEBUGLEVEL := 1
-endif
ifneq ($(strip $(dbglevel)),)
gb_DEBUGLEVEL := $(strip $(dbglevel))
commit 21d51ae1a41dca6198a3d8563873cbeccb960a26
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Mar 20 22:25:48 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Mar 22 08:42:10 2024 +0100
Drop upper-case ENABLE_SYMBOLS, consolidate on lower-case enable_symbols
Change-Id: I6bb6046968a74c49cc8441a1529f9934c90ed50c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165134
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 1ced8090a458..647bd74afea1 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -111,8 +111,7 @@ INTERACTIVE VARIABLES:
valgrind or a debugger:
BUILDTOOLTRACE='$(DEVENV) /debugexe' PARALLELISM=1 make
debug If not empty, build as with --enable-debug.
- ENABLE_SYMBOLS / enable_symbols
- If not empty, build as with --enable-symbols.
+ enable_symbols If not empty, build as with --enable-symbols.
dbglevel 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.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 5b76a58bdada..d842e0af0b86 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -86,10 +86,7 @@ endif
gb_ENABLE_SYMBOLS_FOR := $(ENABLE_SYMBOLS_FOR)
-# ENABLE_SYMBOLS (presumably from the command line)
-ifneq ($(strip $(ENABLE_SYMBOLS)),)
-gb_ENABLE_SYMBOLS_FOR := $(ENABLE_SYMBOLS)
-endif
+# enable_symbols (presumably from the command line)
ifneq ($(strip $(enable_symbols)),)
gb_ENABLE_SYMBOLS_FOR := $(enable_symbols)
endif
