mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always have UNO_SERVICES/TYPES set in in-build uno ini file

Browse Source 
...so that 16f856a5ca "Adapt climaker to
cppu::bootstrap_InitialComponentContext removal" does not fail.  Starting uno
processes from within the build should thus use URE_MORE_SERVICES/TYPES now,
too.

Change-Id: I0a7cfacc804814a2688e54275ebc3e39540d307c
This commit is contained in:
Stephan Bergmann
2012-12-20 14:58:13 +01:00
parent 6cd49f7f22
commit b1a4afa3b4
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppuhelper/source/unorc
View File

@@ -18,3 +18,5 @@
[Bootstrap] [Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN} URE_INTERNAL_LIB_DIR=${ORIGIN}
UNO_SERVICES=${ORIGIN}/../xml/ure/services.rdb ${URE_MORE_SERVICES}
UNO_TYPES=${ORIGIN}/../bin/ure/types.rdb ${URE_MORE_TYPES}

17
testtools/CustomTarget_bridgetest.mk
View File

@@ -48,8 +48,8 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
"-s com.sun.star.test.bridge.CppTestObject" \ "-s com.sun.star.test.bridge.CppTestObject" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" \ "--singleaccept" \
"-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))'" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"-env:UNO_TYPES='$(call gb_Helper_make_url,$(call gb_UnoApiMerge_get_target,ure/types)) $(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
> $@) > $@)
$(if $(filter-out WNT,$(OS)),chmod +x $@) $(if $(filter-out WNT,$(OS)),chmod +x $@)
@@ -60,8 +60,8 @@ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
echo \ echo \
"UNO_SERVICES='$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))'" \ "URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"UNO_TYPES='$(call gb_Helper_make_url,$(call gb_UnoApiMerge_get_target,ure/types)) $(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \ "URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
"java" \ "java" \
"-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \ "-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
"com.sun.star.comp.bridge.TestComponentMain" \ "com.sun.star.comp.bridge.TestComponentMain" \
@@ -77,10 +77,9 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \ "LD_LIBRARY_PATH=$(OUTDIR)/lib" \
"$(call gb_Executable_get_target_for_build,uno)" \ "$(call gb_Executable_get_target_for_build,uno)" \
"-s com.sun.star.test.bridge.BridgeTest" \ "-s com.sun.star.test.bridge.BridgeTest" \
"-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))'" \
"-env:UNO_TYPES='$(call gb_Helper_make_url,$(call gb_UnoApiMerge_get_target,ure/types)) $(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \
"-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \ "-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
"-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \ "-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
> $@) > $@)
$(if $(filter-out WNT,$(OS)),chmod +x $@) $(if $(filter-out WNT,$(OS)),chmod +x $@)
@@ -91,8 +90,8 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_
echo "$(call gb_Executable_get_target_for_build,uno)" \ echo "$(call gb_Executable_get_target_for_build,uno)" \
"-s com.sun.star.test.bridge.BridgeTest --" \ "-s com.sun.star.test.bridge.BridgeTest --" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))'" \ "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))" \
"-env:UNO_TYPES='$(call gb_Helper_make_url,$(call gb_UnoApiMerge_get_target,ure/types)) $(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)'" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
> $@) > $@)
$(if $(filter-out WNT,$(OS)),chmod +x $@) $(if $(filter-out WNT,$(OS)),chmod +x $@)

15
testtools/CustomTarget_uno_test.mk
View File

@@ -29,9 +29,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
# this target is phony to run it every time # this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test) .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
# NOTE: the dependency on ure/services.rdb is also there because we need some # NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
# of the URE libs from stoc and this is the easiest way to ensure they # required due to the settings for URE_SERVICES and URE_TYPES in
# are available when the test is run .-) # cppuhelper/source/unorc; the dependency on ure/services.rdb is also there
# because we need some of the URE libs from stoc and this is the easiest way to
# ensure they are available when the test is run .-)
$(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Executable_get_target_for_build,uno) \ $(call gb_Executable_get_target_for_build,uno) \
$(call gb_InternalUnoApi_get_target,bridgetest) \ $(call gb_InternalUnoApi_get_target,bridgetest) \
@@ -40,10 +42,11 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Rdb_get_outdir_target,uno_services) \ $(call gb_Rdb_get_outdir_target,uno_services) \
$(call gb_Rdb_get_outdir_target,ure/services) \ $(call gb_Rdb_get_outdir_target,ure/services) \
$(call gb_UnoApiMerge_get_target,ure/types) $(call gb_UnoApiMerge_get_target,ure/types)
$(call gb_Executable_get_target_for_build,uno) \ $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_target_for_build,uno) \
-s com.sun.star.test.bridge.BridgeTest \ -s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \ -- com.sun.star.test.bridge.CppTestObject \
-env:UNO_SERVICES='$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))' \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \
-env:UNO_TYPES='$(call gb_Helper_make_url,$(call gb_UnoApiMerge_get_target,ure/types)) $(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)' -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: # vim:set shiftwidth=4 tabstop=4 noexpandtab: