[Libreoffice-commits] .: 2 commits - sc/AllLangResTarget_sc.mk sc/qa

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Tue Mar 29 13:33:40 PDT 2011


 sc/AllLangResTarget_sc.mk |    1 -
 sc/qa/unit/makefile.mk    |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1f8018df3000545988405097735f2052aed041ac
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 29 15:33:30 2011 -0500

    realpath is not very nice with nonexistent path....

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 8039494..611df16 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\
 	-I$(OUTDIR)/inc \
 	-I$(WORKDIR)/inc/sc \
 	-I$(realpath $(SRCDIR)/sc/inc) \
-	-I$(realpath $(SRCDIR)/sc/source/ui/wrtsh) \
 	-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
 	-I$(realpath $(SRCDIR)/sc/source/ui/navipi) \
 	-I$(realpath $(SRCDIR)/sc/source/ui/docshell) \
commit 4664b35ad80681a285cc59734f1f1987c3ea225a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 29 13:42:44 2011 -0500

    use --xxx instead of -xxx for command line options

diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index 75eac52..d252433 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -114,7 +114,7 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
     @echo ----------------------------------------------------------
     @echo - start unit test \#1 on library $(SHL1TARGETN)
     @echo ----------------------------------------------------------
-    $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+    $(CPPUNITTESTER) $(SHL1TARGETN) --headless --invisible \
         '-env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb $(my_file)$(SOLARBINDIR)$/types.rdb' \
         '-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'\
         -env:URE_INTERNAL_LIB_DIR="$(my_file)$(SOLARSHAREDBIN)" \


More information about the Libreoffice-commits mailing list