diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-24 17:39:47 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-24 17:39:47 +0100 |
| commit | 86f4a96d8cfe217ca5547174a8b0dff4e9fe5594 (patch) | |
| tree | 14d44ebae86f78e87fb3d0339bf557471872a2ec /solenv/inc/installationtest.mk | |
| parent | 88eda2548e9b4d7a7a90e2f128f17d585250278b (diff) | |
debuglevels: simplify the build system, by complicating the OOo code ;)
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.
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index f32400a593ec..96b09edebeff 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -24,14 +24,20 @@ #***********************************************************************/ # 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)" != "" - SAL_DIAGNOSE_ABORT:=TRUE + DBGSV_ERROR_OUT=abort + SAL_DIAGNOSE_ABORT=TRUE .EXPORT: SAL_DIAGNOSE_ABORT +.ELSE + DBGSV_ERROR_OUT=shell .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" my_file = file:/// @@ -98,7 +104,7 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \ $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END -cpptest .PHONY : $(DIAGNOSTICS_CONTROL_FILE) +cpptest .PHONY : $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ @@ -114,7 +120,7 @@ cpptest : $(MISC)/$(TARGET)/installation.flag .END .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)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ @@ -129,7 +135,7 @@ javatest_% .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE) $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag javatest : $(MISC)/$(TARGET)/installation.flag .END -javatest .PHONY : $(JAVATARGET) $(DIAGNOSTICS_CONTROL_FILE) +javatest .PHONY : $(JAVATARGET) $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ @@ -148,13 +154,3 @@ javatest : $(MISC)/$(TARGET)/installation.flag javatest .PHONY : @echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' .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 |