diff options
| author | sb <sb@openoffice.org> | 2010-09-10 13:10:07 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-10 13:10:07 +0200 |
| commit | c096e86385f35a6d8485325ad0c3ae52f70cacef (patch) | |
| tree | b722e568c4aa0b42bd429adbf0dd420f4dd6fb58 /solenv/inc | |
| parent | cc1e8cca21d9dea91a0eabbaffe38d8f98173dad (diff) | |
sb129: #i113189# change UNO components to use passive registration
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/installationtest.mk | 10 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 6806e15c69e7..30c6168c2647 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -89,11 +89,11 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \ echo "$$my_tmp" > $@ .END -cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb +cpptest .PHONY : $(RM) -r $(MISC)/$(TARGET)/user $(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ - -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ + -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ $(my_cppenv) $(OOO_CPPTEST_ARGS) @@ -103,12 +103,6 @@ cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb cpptest : $(MISC)/$(TARGET)/installation.flag .END -$(MISC)/$(TARGET)/services.rdb : - $(MKDIRHIER) $(@:d) - $(RM) $@ - $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \ - -c remotebridge.uno -c uuresolver.uno - .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" javatest .PHONY : $(JAVATARGET) $(RM) -r $(MISC)/$(TARGET)/user diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 68bbc797d8af..c24ab9d72d2c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1354,6 +1354,17 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar CPPUNIT_CFLAGS = .END +COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ +COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ +.IF "$(OS)" == "WNT" +COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ +.ELSE +COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +.END +COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ +COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: +COMPONENTPREFIX_INBUILD = vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/ + # workaround for strange dmake bug: # if the previous block was a rule or a target, "\#" isn't recognized # as an escaped "#". if it was an assignment, escaping works... |