strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debuglevels: simplify the build system, by complicating the OOo code ;)

Browse source 
Introduce DBGSV_(TRACE/WARNING/ERROR)_OUT, which controls the output channel for tools-level
traces/warnings/assertions, when no dbgsv.ini file is found (this is the increased OOo complexity).

Use this in installationtest.mk, instead of creating a dedicated dbgsv.ini file.

Yet to come: add support for DBGSV_ERROR_OUT to the GNU make build system. Which is the reason why
DBGSV_ERROR_OUT was introduced: Currently, running a GNU make based test pops up assertions as message
boxes. Before the change here, we would have needed to add dbgsv.ini support to the GNU make build system,
which sounds not like a funny a reasonable thing to do. So, instead, we will simply set DBGSV_ERROR_OUT,
which is much simpler and less error prone.
This commit is contained in:
Frank Schoenheit [fs] 2011-02-24 17:39:47 +01:00
parent 88eda2548e
commit 86f4a96d8c
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
solenv/inc/installationtest.mk
View file

@ -24,14 +24,20 @@
#***********************************************************************/ #***********************************************************************/
# relevant for non-product builds only, but built unconditionally # relevant for non-product builds only, but built unconditionally
DIAGNOSTICS_CONTROL_FILE=$(MISC)/$(TARGET)/dbgsvrc
DBGSV_INIT:=$(MAKEDIR)/$(DIAGNOSTICS_CONTROL_FILE)
.EXPORT: DBGSV_INIT
.IF "$(ABORT_ON_ASSERTION)" != "" .IF "$(ABORT_ON_ASSERTION)" != ""
SAL_DIAGNOSE_ABORT:=TRUE DBGSV_ERROR_OUT=abort
SAL_DIAGNOSE_ABORT=TRUE
.EXPORT: SAL_DIAGNOSE_ABORT .EXPORT: SAL_DIAGNOSE_ABORT
.ELSE
DBGSV_ERROR_OUT=shell
.ENDIF .ENDIF
.EXPORT: DBGSV_ERROR_OUT
# don't allow to overwrite DBGSV_ERROR_OUT with an INI file. Otherwise, people
# might be tempted to put an DBGSV_INIT into their .bash_profile which points to a file
# delcaring to ignore all assertions completely ...
DBGSV_INIT=
.EXPORT: DBGSV_INIT
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
my_file = file:/// my_file = file:///
@ -98,7 +104,7 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \
$(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
.END .END
cpptest .PHONY : $(DIAGNOSTICS_CONTROL_FILE) cpptest .PHONY :
$(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
$(CPPUNITTESTER) \ $(CPPUNITTESTER) \
@ -114,7 +120,7 @@ cpptest : $(MISC)/$(TARGET)/installation.flag
.END .END
.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
javatest_% .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE) javatest_% .PHONY : $(JAVATARGET)
$(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
@ -129,7 +135,7 @@ javatest_% .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE)
$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
javatest : $(MISC)/$(TARGET)/installation.flag javatest : $(MISC)/$(TARGET)/installation.flag
.END .END
javatest .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE) javatest .PHONY : $(JAVATARGET)
$(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
$(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
@ -148,13 +154,3 @@ javatest : $(MISC)/$(TARGET)/installation.flag
javatest .PHONY : javatest .PHONY :
@echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' @echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
.END .END
# relevant for non-product builds only, but built unconditionally
$(DIAGNOSTICS_CONTROL_FILE):
$(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)echo [output] > $@
.IF "$(ABORT_ON_ASSERTION)" != ""
$(COMMAND_ECHO)echo error=abort >> $@
.ELSE
$(COMMAND_ECHO)echo error=shell >> $@
.ENDIF