RepositoryExternal.mk | 10 +++++-----
cppuhelper/source/unorc | 2 +-
filter/Configuration_filter.mk | 3 +--
i18npool/CustomTarget_localedata.mk | 2 +-
scp2/inc/macros.inc | 2 +-
scp2/source/base/postgresqlsdbc.scp | 2 +-
scp2/source/extensions/file_extensions.scp | 4 ++--
scp2/source/ooo/file_ooo.scp | 12 ++++++------
scp2/source/ooo/ure.scp | 2 +-
scp2/source/python/file_python.scp | 2 +-
solenv/gbuild/AllLangResTarget.mk | 10 ----------
solenv/gbuild/Configuration.mk | 19 +++++++------------
solenv/gbuild/CppunitTest.mk | 4 ++--
solenv/gbuild/Gallery.mk | 2 +-
solenv/gbuild/Pagein.mk | 24 +++++++++++++-----------
solenv/gbuild/Rdb.mk | 22 ++++++++++++----------
solenv/gbuild/TargetLocations.mk | 7 ++-----
testtools/CustomTarget_bridgetest.mk | 8 ++++----
testtools/CustomTarget_uno_test.mk | 6 +++---
19 files changed, 64 insertions(+), 79 deletions(-)
New commits:
commit 36a619e7e5303294c6d1dffd75e6cee5ee668d0f
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon May 27 16:31:01 2013 +0200
gbuild: bin obsoleted gb_Configuration__get_source
Change-Id: If6f125b83114643430fcc02a2ec7f59ab406da7b
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index b671626..b986390 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -257,8 +257,7 @@ endef
# $(call filter_Configuration_add_ui_filter,configuration,prefix,xcufile)
define filter_Configuration_add_ui_filter
ifeq ($(WITH_LANG),)
-$(filter_XcuFilterUiTarget) : \
- $(call gb_Configuration__get_source,$(1),$(2)/$(3))
+$(filter_XcuFilterUiTarget) : $(SRCDIR)/$(2)/$(3)
else
$(call gb_XcuMergeTarget_XcuMergeTarget,$(2)/$(3),$(1),$(2),$(3))
$(filter_XcuFilterUiTarget) : \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index ca62c72..a82d3e1 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -40,9 +40,6 @@
# => *.po
# => XcsTarget (schema)
-# TODO: This is obsolete--we do not have multiple repos anymore. Drop
-# the first arugment of gb_Configuration__get_source and clean up its
-# uses. Or just replace it by $(SRCDIR)/... .
# Per-repo pattern rules for each repository do not work for all targets
# because the prerequisites of some targets need to have the stem mangled
# and this does not seem to be possible in GNU make because when the stem is
@@ -54,7 +51,6 @@
# Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget
# fails: XcuModuleTarget XcuLangpackTarget XcuResTarget
#
-gb_Configuration__get_source = $(SRCDIR)/$(2)
# The main LibreOffice registry (cf. officecfg/Configuration_officecfg.mk):
gb_Configuration_PRIMARY_REGISTRY_NAME := registry
@@ -158,7 +154,7 @@ $(call gb_XcuDataTarget_get_clean_target,%) :
# XcuModuleTarget class
define gb_XcuDataSource_for_XcuModuleTarget
-$(call gb_Configuration__get_source,$(1),$(basename $(subst -,.,$(basename
$(2)))).xcu)
+$(SRCDIR)/$(basename $(subst -,.,$(basename $(1)))).xcu
endef
define gb_XcsTarget_for_XcuModuleTarget
@@ -253,7 +249,7 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
# $(call gb_XcuMergeTarget_XcuMergeTarget,target,configuration,prefix,xcufile)
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
- $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
+ $(SRCDIR)/$(3)/$(4) \
$(wildcard $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
$(call gb_XcuMergeTarget_get_target,$(1)) : \
POFILES := $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
@@ -291,8 +287,7 @@ $(call gb_XcuResTarget_get_clean_target,%) :
# this depends either on the source or on the merge target (if WITH_LANG)
define gb_XcuResTarget_XcuResTarget
ifeq ($(strip $(gb_WITH_LANG)),)
-$(call gb_XcuResTarget_get_target,$(1)) : \
- $(call gb_Configuration__get_source,$(2),$(3)/$(4))
+$(call gb_XcuResTarget_get_target,$(1)) : $(SRCDIR)/$(3)/$(4)
else
$(call gb_XcuResTarget_get_target,$(1)) : \
$(call gb_XcuMergeTarget_get_target,$(3)/$(4))
@@ -338,7 +333,7 @@ define gb_Configuration_add_schema
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcsTarget_get_clean_target,$(2)/$(3))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
- $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
+ $(SRCDIR)/$(2)/$(3) \
$(call gb_Configuration_get_preparation_target,$(1))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter
$(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
@@ -364,7 +359,7 @@ define gb_Configuration_add_data
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3))
$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \
- $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
+ $(SRCDIR)/$(2)/$(3) \
$(call gb_Configuration_get_preparation_target,$(1)) \
$(call gb_XcsTarget_for_XcuTarget,$(3))
$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter
$(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
@@ -398,7 +393,7 @@ define gb_Configuration_add_spool_module
$(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3))
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
- $(call gb_XcuDataSource_for_XcuModuleTarget,$(1),$(2)/$(3)) \
+ $(call gb_XcuDataSource_for_XcuModuleTarget,$(2)/$(3)) \
$(call gb_Configuration_get_preparation_target,$(1)) \
$(call gb_XcsTarget_for_XcuModuleTarget,$(3))
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter
$(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
@@ -492,7 +487,7 @@ endef
# apparently extensions package the XcuMergeTarget directly...
# trivial convenience function to get the right file:
ifeq ($(gb_WITH_LANG),)
-gb_XcuFile_for_extension = $(call gb_Configuration__get_source,,$(1))
+gb_XcuFile_for_extension = $(SRCDIR)/$(1)
else
gb_XcuFile_for_extension = $(call gb_XcuMergeTarget_get_target,$(1))
endif
commit 6f2715fe3508a87fe51222a29f98403f0d8eae55
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri May 24 14:55:47 2013 +0200
gbuild: install pagein files directly from workdir
Change-Id: I51e632ab96a5a569446c1a46ffce5cc3d85eadf9
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9ce5fcf..7679da7 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -646,35 +646,35 @@ File gid_File_Txt_Pagein_Calc
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "pagein-calc";
+ Name = "Pagein/pagein-calc";
End
File gid_File_Txt_Pagein_Common
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "pagein-common";
+ Name = "Pagein/pagein-common";
End
File gid_File_Txt_Pagein_Draw
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "pagein-draw";
+ Name = "Pagein/pagein-draw";
End
File gid_File_Txt_Pagein_Impress
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "pagein-impress";
+ Name = "Pagein/pagein-impress";
End
File gid_File_Txt_Pagein_Writer
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Styles = (PACKED);
- Name = "pagein-writer";
+ Name = "Pagein/pagein-writer";
End
#endif
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index e0ce242..2d94f55 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -18,6 +18,9 @@ gb_Pagein__make_library_path = $(call
gb_Pagein__get_libdir,$(1))$(call gb_Libra
gb_Pagein__make_path = \
$(if $(call gb_Pagein__is_library,$(1)),$(call
gb_Pagein__make_library_path,$(1)),$(1))
+gb_Pagein__get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
+gb_Pagein__get_final_target = $(WORKDIR)/Pagein/pagein-$(1).final
+
define gb_Pagein__command
$(call gb_Output_announce,$(2),$(true),PAG,5)
$(call gb_Helper_abbreviate_dirs,\
@@ -31,24 +34,23 @@ endef
$(call gb_Pagein_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PAG,5)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Pagein_get_target,$*) $(call
gb_Pagein_get_outdir_target,$*))
+ rm -f $(call gb_Pagein__get_final_target,$*) $(call
gb_Pagein_get_target,$*))
$(call gb_Pagein_get_target,%) :
$(call gb_Pagein__command,$@,$*,$^)
-
-gb_Pagein_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
+
+$(call gb_Pagein__get_final_target,%) :
+ touch $@
define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
-$$(eval $$(call gb_Module_register_target,$(call
gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call
gb_Pagein_get_outdir_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call
gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_target,$(1)),$(1))
-$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
-$(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call
gb_Pagein_get_outdir_target,$(1))).dir
-
-$(call gb_Helper_install,$(call gb_Pagein_get_outdir_target,$(1)), \
- $(call gb_Pagein_get_install_target,$(1)), \
+$(call gb_Pagein__get_final_target,$(1)) : $(call gb_Pagein_get_target,$(1))
+$$(eval $$(call gb_Module_register_target,$(call
gb_Pagein__get_final_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call
gb_Pagein_get_target,$(1)))
+
+$(call gb_Helper_install,$(call gb_Pagein__get_final_target,$(1)), \
+ $(call gb_Pagein__get_install_target,$(1)), \
$(call gb_Pagein_get_target,$(1)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index ff23882..007e730 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -22,7 +22,6 @@
gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT)
gb_CliNativeLibrary_get_target =
$(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT)
gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
-gb_Pagein_get_outdir_target = $(OUTDIR)/bin/pagein-$(1)
gb_PackagePart_get_destinations = \
$(INSTDIR) \
$(OUTDIR)/bin \
@@ -148,7 +147,7 @@ gb_Module_get_subsequentcheck_target =
$(WORKDIR)/Module/subsequentcheck/$(1)
gb_Module_get_target = $(WORKDIR)/Module/$(1)
gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
-gb_Pagein_get_target = $(WORKDIR)/Pagein/$(1)
+gb_Pagein_get_target = $(WORKDIR)/Pagein/pagein-$(1)
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1).filelist
gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1).filelist
commit 529b1ea6f4583a136d04ae19af6efee2b6e45946
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri May 24 13:22:21 2013 +0200
gbuild: install .res files directly from workdir
Change-Id: I95e4f150c21f991f629530eebf19748c2768f856
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index deb4c31..3659dc2 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -95,7 +95,7 @@
#define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc
#endif
-#define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res))
+#define RESFILENAME(name,lang)
STRING(CONCAT4(ResTarget/,name,lang,.res))
#define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang))
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index fef707e..d9fdbca 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -370,9 +370,6 @@ $(call gb_ResTarget_get_clean_target,%) :
rm -f \
$(call gb_ResTarget_get_target,$*) \
$(call gb_ResTarget_get_imagelist_target,$*) \
- $(if $(gb_RUNNABLE_INSTDIR),, \
- $(call gb_ResTarget_get_outdir_target,$*) \
- ) \
$(call gb_ResTarget_get_unittest_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
@@ -413,13 +410,6 @@ $(call gb_ResTarget_get_unittest_target,$(1)) : $(call
gb_ResTarget_get_target,$
$(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call
gb_ResTarget_get_unittest_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call
gb_ResTarget_get_unittest_target,$(1)),$(call
gb_ResTarget_get_target,$(1)),$(1))
-ifeq ($(gb_RUNNABLE_INSTDIR),)
-$(call gb_AllLangResTarget_get_target,$(2)) : $(call
gb_ResTarget_get_outdir_target,$(1))
-$(call gb_ResTarget_get_outdir_target,$(1)) : $(call
gb_ResTarget_get_target,$(1))
-$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call
gb_ResTarget_get_outdir_target,$(1))).dir
-$(call gb_Deliver_add_deliverable,$(call
gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
-endif
-
endef
define gb_ResTarget_add_file
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 984397d..ff23882 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -35,7 +35,6 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/xml \
gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
-gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
gb_ResTarget_get_unittest_target = \
$(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
commit b469cd235bba961abc71d26ddc97423906a2d67e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri May 24 12:24:27 2013 +0200
gbuild: use xml .rdb files directly from workdir
Change-Id: I876a41dc77a59841c39b2c1fa43f22c20940dbf2
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f8d3f0f..1cc32cf 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 1700bdd..d6bf696 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 9ff1600..b026f89 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 172f7f3..5cef251 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 01ea8b1..aaca36a 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 17a5e32..9ce5fcf 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 67dab4e..48807c9 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 e4d5336..57f347d 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 48de328..25afb39 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 b19d0cb..45f2602 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 47d4d20..afb6681 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 ed92463..984397d 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 3f3312f..f7f3a1a 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 89e098e..1c04c9a 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
