diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-21 21:20:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-21 21:20:44 +0000 |
| commit | 0562ba185b5c4783b8f59aa3a3ae8d1ef68011d3 (patch) | |
| tree | 774c46d5acec0579ba36c9fab7db57aa50083de5 | |
| parent | 0e263d61811480f3a9dbc6ad7c752f6cfae4e3fc (diff) | |
this should work in theory to use the new component registration stuff
| -rw-r--r-- | starmath/prj/build.lst | 2 | ||||
| -rw-r--r-- | starmath/qa/cppunit/makefile.mk | 26 |
2 files changed, 8 insertions, 20 deletions
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst index fa97e3c8c2d6..2246c6b7ccb8 100644 --- a/starmath/prj/build.lst +++ b/starmath/prj/build.lst @@ -1,4 +1,4 @@ -sm starmath : LIBXSLT:libxslt L10N:l10n svx NULL +sm starmath : LIBXSLT:libxslt L10N:l10n svx ure NULL sm starmath usr1 - all sm_mkout NULL sm starmath\inc nmake - all sm_inc NULL sm starmath\prj get - all sm_prj NULL diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk index 99a371a3b2c0..52dd969941f8 100644 --- a/starmath/qa/cppunit/makefile.mk +++ b/starmath/qa/cppunit/makefile.mk @@ -92,18 +92,7 @@ my_file = file:// ALLTAR: test -$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb - $(MKDIRHIER) $(@:d) - $(GNUCOPY) $? $@ - -$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb - $(MKDIRHIER) $(@:d) - $(GNUCOPY) $? $@ - -ure_components = \ - stocservices -test_components = $(ure_components) -test_components += \ +test_components = \ component/framework/util/fwk \ component/toolkit/util/tk \ component/sfx2/util/sfx \ @@ -134,13 +123,12 @@ $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/services.input STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR) .EXPORT : STAR_RESOURCEPATH -test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb +test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb @echo ---------------------------------------------------------- @echo - start unit test \#1 on library $(SHL1TARGETN) @echo ---------------------------------------------------------- - STAR_RESOURCEPATH="$(my_file)$(OUTDIR)/bin" $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \ - -env:UNO_SERVICES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb" \ - -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \ - -env:OOO_BASE_DIR="$(my_file)$(OUTDIR)/lib" \ - -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \ - -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)" + $(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)" \ + -env:OOO_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)" |