From b469cd235bba961abc71d26ddc97423906a2d67e Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Fri, 24 May 2013 12:24:27 +0200 Subject: gbuild: use xml .rdb files directly from workdir Change-Id: I876a41dc77a59841c39b2c1fa43f22c20940dbf2 --- RepositoryExternal.mk | 10 +++++----- cppuhelper/source/unorc | 2 +- i18npool/CustomTarget_localedata.mk | 2 +- scp2/source/base/postgresqlsdbc.scp | 2 +- scp2/source/extensions/file_extensions.scp | 4 ++-- scp2/source/ooo/file_ooo.scp | 2 +- scp2/source/ooo/ure.scp | 2 +- scp2/source/python/file_python.scp | 2 +- solenv/gbuild/CppunitTest.mk | 4 ++-- solenv/gbuild/Gallery.mk | 2 +- solenv/gbuild/Rdb.mk | 22 ++++++++++++---------- solenv/gbuild/TargetLocations.mk | 3 +-- testtools/CustomTarget_bridgetest.mk | 8 ++++---- testtools/CustomTarget_uno_test.mk | 6 +++--- 14 files changed, 36 insertions(+), 35 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f8d3f0feede7..1cc32cf120ef 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2899,7 +2899,7 @@ define gb_Executable__register_climaker $(call gb_Executable_add_runtime_dependencies,climaker,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ - $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ + $(call gb_Rdb_get_target_for_build,ure/services) \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -2931,7 +2931,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ $(call gb_Library_get_target,vclplug_svp) \ )) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ - $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ + $(call gb_Rdb_get_target_for_build,ure/services) \ $(call gb_UnoApi_get_target,offapi) \ $(call gb_UnoApi_get_target,udkapi) \ ) @@ -2970,8 +2970,8 @@ define gb_Executable__register_saxparser $(call gb_Executable_add_runtime_dependencies,saxparser,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ - $(call gb_Rdb_get_outdir_target_for_build,saxparser) \ - $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ + $(call gb_Rdb_get_target_for_build,saxparser) \ + $(call gb_Rdb_get_target_for_build,ure/services) \ $(call gb_UnoApi_get_target,udkapi) \ ) endef @@ -2984,7 +2984,7 @@ define gb_Executable__register_uno $(call gb_Executable_add_runtime_dependencies,uno,\ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ - $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ + $(call gb_Rdb_get_target_for_build,ure/services) \ $(call gb_UnoApi_get_target,udkapi) \ ) endef diff --git a/cppuhelper/source/unorc b/cppuhelper/source/unorc index 1700bdd7d60f..d6bf69679ffd 100644 --- a/cppuhelper/source/unorc +++ b/cppuhelper/source/unorc @@ -18,5 +18,5 @@ [Bootstrap] URE_INTERNAL_LIB_DIR=${ORIGIN} -UNO_SERVICES=${ORIGIN}/../xml/ure/services.rdb ${URE_MORE_SERVICES} +UNO_SERVICES=${URE_MORE_SERVICES} UNO_TYPES=${ORIGIN}/../bin/udkapi.rdb ${URE_MORE_TYPES} diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index 9ff16004591f..b026f893a85f 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \ $$(call gb_Helper_abbreviate_dirs, \ $$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ - -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target_for_build,saxparser)) \ + -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser)) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \ rm $$@.tmp) diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp index 172f7f30d470..5cef25165f7a 100644 --- a/scp2/source/base/postgresqlsdbc.scp +++ b/scp2/source/base/postgresqlsdbc.scp @@ -39,7 +39,7 @@ End File gid_File_PostgresqlSdbc_Rdb TXT_FILE_BODY; Dir = gid_Brand_Dir_Program_Services; - Name = "postgresql-sdbc.rdb"; + Name = "Rdb/postgresql-sdbc.rdb"; Styles = (PACKED); End diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 01ea8b184ffe..aaca36a8fdd4 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -234,7 +234,7 @@ STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShel File gid_File_Rdb_Scriptproviderforbeanshell TXT_FILE_BODY; - Name = "scriptproviderforbeanshell.rdb"; + Name = "Rdb/scriptproviderforbeanshell.rdb"; Dir = gid_Brand_Dir_Program_Services; Styles = (PACKED); End @@ -251,7 +251,7 @@ STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScr File gid_File_Rdb_Scriptproviderforjavascript TXT_FILE_BODY; - Name = "scriptproviderforjavascript.rdb"; + Name = "Rdb/scriptproviderforjavascript.rdb"; Dir = gid_Brand_Dir_Program_Services; Styles = (PACKED); End diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 17a5e322c0d4..9ce5fcfb56e2 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -688,7 +688,7 @@ End File gid_Starregistry_Services_Rdb TXT_FILE_BODY; - Name = "services.rdb"; + Name = "Rdb/services.rdb"; Dir = gid_Brand_Dir_Program_Services; Styles = (PACKED); End diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 67dab4ef51c5..48807c9c13c1 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -574,7 +574,7 @@ End File gid_File_Misc_ServicesRdb TXT_FILE_BODY; Dir = GID_DIR_URE_SHARE_MISC; - Name = "/ure/services.rdb"; + Name = "Rdb/ure/services.rdb"; Styles = (PACKED); End diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index e4d5336df41d..57f347d9b594 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -52,7 +52,7 @@ STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader ) File gid_File_Pyuno_Rdb TXT_FILE_BODY; Dir = gid_Brand_Dir_Program_Services; - Name = "pyuno.rdb"; + Name = "Rdb/pyuno.rdb"; Styles = (PACKED); End diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 48de32881c1d..25afb392518a 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -220,8 +220,8 @@ $$(call gb_Output_error,gb_CppunitTest_use_service_rdb: use gb_CppunitTest_use_r endef define gb_CppunitTest_use_rdb -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Rdb_get_outdir_target,$(2)) -$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(call gb_Rdb_get_outdir_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Rdb_get_target_for_build,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(call gb_Rdb_get_target_for_build,$(2)) endef diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index b19d0cba63a9..45f26025ddff 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -48,7 +48,7 @@ define gb_Gallery__make_env_args "-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/unittest/install)" \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(gb_Configuration_registry)) \ module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool)" \ -"-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target_for_build,ure/services)) \ +"-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \ $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\ $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \ "-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\ diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 47d4d203ef50..afb668196fd2 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -7,6 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +gb_Rdb__get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb +gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final + define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -27,23 +30,22 @@ $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsl $(call gb_Rdb_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RDB,1) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*)) - -gb_Rdb_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb + rm -f $(call gb_Rdb__get_final_target,$*) $(call gb_Rdb_get_target,$*)) + +$(call gb_Rdb__get_final_target,%) : + touch $@ define gb_Rdb_Rdb $(call gb_Rdb_get_target,$(1)) : COMPONENTS := -$(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \ - | $(dir $(call gb_Rdb_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1)) +$(call gb_Rdb__get_final_target,$(1)) : $(call gb_Rdb_get_target,$(1)) +$$(eval $$(call gb_Module_register_target,$(call gb_Rdb__get_final_target,$(1)),$(call gb_Rdb_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_target,$(1))) -$$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_target,$(1))) endef define gb_Rdb_install -$(call gb_Helper_install,$(call gb_Rdb_get_outdir_target,$(1)), \ - $(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb_get_install_target,$(1))), \ +$(call gb_Helper_install,$(call gb_Rdb__get_final_target,$(1)), \ + $(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb__get_install_target,$(1))), \ $(call gb_Rdb_get_target,$(1))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index ed9246355f57..984397d8f10f 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -35,8 +35,6 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/xml \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) -gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb -gb_Rdb_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/$(1).rdb gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res @@ -163,6 +161,7 @@ gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(gb_Precompil gb_PropertiesTranslateTarget_get_target = $(WORKDIR)/PropertiesTranslateTarget/$(1).properties gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb +gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index 3f3312f1e349..f7f3a1aceb2e 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -33,7 +33,7 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "--singleaccept" \ "-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \ - "-env:URE_MORE_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_target,uno_services))" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) @@ -45,7 +45,7 @@ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Helper_abbreviate_dirs,\ echo \ - "URE_MORE_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_target,uno_services))" \ "URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ "java" \ "-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \ @@ -64,7 +64,7 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te "-s com.sun.star.test.bridge.BridgeTest" \ "-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \ "-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \ - "-env:URE_MORE_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_target,uno_services))" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ "-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \ > $@) @@ -78,7 +78,7 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_ "-s com.sun.star.test.bridge.BridgeTest --" \ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \ "-env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \ - "-env:URE_MORE_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_target,uno_services))" \ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index 89e098eb9d8d..1c04c9ac8beb 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -15,15 +15,15 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test)) $(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_Executable_get_runtime_dependencies,uno) \ $(call gb_InternalUnoApi_get_target,bridgetest) \ - $(call gb_Rdb_get_outdir_target,uno_services) \ - $(call gb_Rdb_get_outdir_target,ure/services) \ + $(call gb_Rdb_get_target,uno_services) \ + $(call gb_Rdb_get_target,ure/services) \ $(call gb_UnoApi_get_target,udkapi) $(call gb_Helper_abbreviate_dirs,\ $(call gb_Executable_get_command,uno) \ -s com.sun.star.test.bridge.BridgeTest \ -- com.sun.star.test.bridge.CppTestObject \ -env:LO_BUILD_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ - -env:URE_MORE_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_target,uno_services)) \ -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)) # vim:set shiftwidth=4 tabstop=4 noexpandtab: -- cgit v1.2.3