[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Caolán McNamara (via logerrit)]

 postprocess/CustomTarget_registry.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d88965e7cca19205f5ef5ebd10ae8a8459ecb49
Author: Caolán McNamara 
AuthorDate: Wed Mar 22 19:51:50 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Mar 23 08:48:49 2023 +

instdir/share/registry/res/registry_de.xcd is effectively empty

I find with GNU Make 4.3 and find 4.9.0 I get a
workdir/CustomTarget/postprocess/registry/registry_de.list with no
entries, though my libreoffice-7.3 build has a populated one and this
makefile is the same as in that version.

Change-Id: I45ffb381c4c962cd80c3e07e7539d993f86101d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149351
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 2a7099daa2da..8111fca4e2ab 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -623,7 +623,7 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),AWK)
$(call gb_Helper_abbreviate_dirs,\
$(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \
--name *.xcu -size +0c \
+-name "*.xcu" -size +0c \
| LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print ""} \
{print ""$$0""} \
@@ -641,7 +641,7 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
 $(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
 $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
 $(call gb_XcuResTarget_get_target,updchk/$*/))\
--name *.xcu \
+-name "*.xcu" \
| LC_ALL=C $(SORT) \
| $(gb_AWK) 'BEGIN{print ""} \
{print ""$$0""} \

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Julien Nabet (via logerrit)]

 postprocess/CustomTarget_registry.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit be2a605af8c39dc4e655f7ba5702abebd608bf0d
Author: Julien Nabet 
AuthorDate: Mon Nov 25 20:06:01 2019 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 29 09:10:38 2019 +0100

tdf#128974: TB Addressbook not available directly as existing database (Win)

When Seamonkey has been removed with:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f
"Remove Seamonkey based address book driver"

mork driver was erroneously skipped.

+ deal with "default" and "default-release" profiles
See https://support.mozilla.org/gl/questions/1264072 for some background 
info.

Change-Id: I85822b58b12f2f2ea5233426791ed73698e67276
Reviewed-on: https://gerrit.libreoffice.org/83710
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 579c608cf7fb..c33417c6b2a7 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -280,8 +280,7 @@ postprocess_FILES_main += \
$(call 
gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
 \
$(call 
gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu
 postprocess_DRIVERS += dbase flat odbc mysql_jdbc
-ifeq (WNT,$(OS))
-else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 postprocess_FILES_main += $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/mork)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 postprocess_DRIVERS += mork
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Mike Kaganski]

 postprocess/CustomTarget_registry.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e542234eb36750afc188ea878ba0e5ac09f8698
Author: Mike Kaganski 
Date:   Wed Jun 13 03:54:13 2018 +0200

Pattern words are the first argument for filter

https://www.gnu.org/software/make/manual/html_node/Text-Functions.html

Change-Id: I2d3ec3ab30f06b71a1f9983c0d5dc018b4307e4b
Reviewed-on: https://gerrit.libreoffice.org/55729
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index a0dfad039a6d..bc120e444939 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -353,7 +353,7 @@ else
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/Paths-internallibnumbertextdata.xcu
 endif
 
-ifneq ($(filter $(CPUNAME),POWERPC INTEL ARM HPPA GODSON M68K SPARC S390),)
+ifneq ($(filter POWERPC INTEL ARM HPPA GODSON M68K SPARC S390,$(CPUNAME)),)
 postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/Common-32bit.xcu
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Rene Engelhard]

 postprocess/CustomTarget_registry.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f705883c2a5bfaf24d355b9a41bd613e71fc72e4
Author: Rene Engelhard 
Date:   Sun May 6 11:48:05 2018 +0200

CustomTarget_registry.mk: add new $(SYSTEM_LIBNUMBERTEXT_DATA) to sed...

Change-Id: Ib35c95f792a49d952ca9f226fbd181831d22a1da

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index b0a816efed44..7548789e9766 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -557,6 +557,7 @@ postprocess_main_SED := \
-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' 
\
-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
+   -e 's,$${SYSTEM_LIBNUMBERTEXT_DATA},$(SYSTEM_LIBNUMBERTEXT_DATA),g' \
 
 $(call gb_XcdTarget_get_target,main.xcd) \
: $(BUILDDIR)/config_host.mk.stamp \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Stephan Bergmann]

 postprocess/CustomTarget_registry.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5e19fa2ffe890731bdc5a7b0a3b281696f36cbe2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 27 12:34:30 2015 +0200

Restrict the install:module=neon_gnomevfs hack to --with-webdav=neon

...as the underlying problem, according to
https://bz.apache.org/ooo/show_bug.cgi?id=84676 mixing neon and the 
hidden
embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is
unreliable, presumably does not affect --with-webdav=serf

Change-Id: I2abfeaeac5174a735f46b2838bd84dda0af9a487

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 5a2c36e..eb2e517 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -329,10 +329,12 @@ postprocess_DRIVERS += ado
 endif
 ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+ifeq ($(WITH_WEBDAV),neon)
 ifeq ($(ENABLE_GNOMEVFS),TRUE)
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu
 endif
 endif
+endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
 postprocess_FILES_main += $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Michael Stahl]

 postprocess/CustomTarget_registry.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d657a976f5ac73da5277612b4bdf6a25641e2797
Author: Michael Stahl mst...@redhat.com
Date:   Thu Aug 6 22:48:14 2015 +0200

postprocess: d'oh generated files are in $(BUILDDIR)

Change-Id: Id9dee9cfe065b30c2ae9bade1098d16e2c659c23

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 5fa8eda..5a2c36e 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -569,7 +569,7 @@ postprocess_main_SED := \
-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
 
 $(call gb_XcdTarget_get_target,main.xcd) \
-   : $(SRCDIR)/config_host.mk.stamp \
+   : $(BUILDDIR)/config_host.mk.stamp \
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,main,$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Michael Stahl]

 postprocess/CustomTarget_registry.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit da011e057e036c3f042bfdd64fed703ead9d9ec9
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 5 17:01:36 2015 +0200

postprocess: try to get the right version number in About dialog

Add a dependency from main.xcd to config_host.mk to rebuild it when the
version number changes.

Change-Id: I6878d58def57942f117b0b6e49a6c03abbeca5af
Reviewed-on: https://gerrit.libreoffice.org/17539
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 5681889..5fa8eda 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -568,13 +568,15 @@ postprocess_main_SED := \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' 
\
-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
 
-$(call gb_XcdTarget_get_target,main.xcd) : \
+$(call gb_XcdTarget_get_target,main.xcd) \
+   : $(SRCDIR)/config_host.mk.stamp \
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,main,$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@)  \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-   $(SRCDIR)/solenv/bin/packregistry.xslt $ \
+   $(SRCDIR)/solenv/bin/packregistry.xslt \
+   $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/main.list \
|  sed $(postprocess_main_SED)  $@ \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Christian Lohmaier]

 postprocess/CustomTarget_registry.mk |   35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

New commits:
commit faa9a681e730e5028c5fefa90938726ff9abe31d
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Thu May 22 15:51:54 2014 +0200

using xargs for string manipulation is somewhat of an abuse

(and breaks the build on windows/cygwin for some reason, although
running the find/xargs command by itself works just fine)
So just use awk instead and have a nicer solution without breaking the
build

Change-Id: I24b9f52c0b84c2e8019f3f6719a307fe508fb755

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 1eb591b..0bc71a9 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -595,27 +595,28 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
 # find shell command below (see issue 110041):
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
-   $(call gb_Helper_abbreviate_dirs, \
-   echo 'list'  $@ \
-( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) 
-name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo 
'filename{}/filename')  $@ \
-echo '/list'  $@ \
+   $(call gb_Helper_abbreviate_dirs,\
+   find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
+-name *.xcu -size +0c \
+   | awk 'BEGIN{print list} \
+   {print filename$$0/filename} \
+  END  {print /list}'  $@ \
)
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
-   echo 'list'  $@ \
-$(call gb_Helper_abbreviate_dirs, \
-   (find $(call gb_XcuResTarget_get_target,registry/$*/) -name 
*.xcu -print0 | xargs -n1 -0 -I '{}' echo 'filename{}/filename')  $@ \
-   $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
-   $(foreach driver,$(postprocess_DRIVERS), \
-(find $(call 
gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I 
'{}' echo 'filename{}/filename')  $@ \
-   ) \
-   ) \
-   $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
-(find $(call gb_XcuResTarget_get_target,updchk/$*/) 
-name *.xcu -print0 | xargs -n1 -0 -I '{}' echo 'filename{}/filename')  
$@ \
-   ) \
-   ) \
-echo '/list'  $@
+   $(call gb_Helper_abbreviate_dirs,\
+   find $(call gb_XcuResTarget_get_target,registry/$*/)\
+$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+$(foreach driver,$(postprocess_DRIVERS),\
+$(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
+$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+$(call gb_XcuResTarget_get_target,updchk/$*/))\
+-name *.xcu \
+   | awk 'BEGIN{print list} \
+   {print filename$$0/filename} \
+  END  {print /list}'  $@ \
+   )
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Maxim Monastirsky]

 postprocess/CustomTarget_registry.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 214de0e5124b44df0f37fdf89271a527667590dc
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Mon May 19 08:53:16 2014 +0300

fdo#78815 Fix report builder toolbox controller

Change-Id: Iecbf84b29500729e228d22c8e50b119d1fb471c5

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index c4a4495..1eb591b 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -396,7 +396,8 @@ postprocess_FILES_reportbuilder := \
$(postprocess_MOD)/org/openoffice/Setup-reportbuilder.xcu \
$(postprocess_MOD)/org/openoffice/Office/Accelerators-reportbuilder.xcu 
\
$(postprocess_MOD)/org/openoffice/Office/DataAccess-reportbuilder.xcu \
-   $(postprocess_MOD)/org/openoffice/Office/Embedding-reportbuilder.xcu
+   $(postprocess_MOD)/org/openoffice/Office/Embedding-reportbuilder.xcu \
+   $(postprocess_MOD)/org/openoffice/Office/UI/Controller-reportbuilder.xcu
 endif
 
 postprocess_DEPS_writer := main
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk scp2/source

[Lionel Elie Mamane]

 postprocess/CustomTarget_registry.mk |6 +++---
 scp2/source/base/postgresqlsdbc.scp  |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 45b1211d575b680534d7848a39ccad9efd9549dc
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sat Feb 22 22:39:32 2014 +0100

fdo#69309 rename share/registry/postgresqlsdbc.xcd to postgresql.xcd

Change-Id: Ie7c9200310ab24e4d2636849b133e515f266d5c9

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 9f8d187..388793e 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -431,9 +431,9 @@ postprocess_FILES_xsltfilter := \
$(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu)
 
 ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
-postprocess_XCDS += postgresqlsdbc.xcd
-postprocess_DEPS_postgresqlsdbc := main
-postprocess_FILES_postgresqlsdbc := $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
+postprocess_XCDS += postgresql.xcd
+postprocess_DEPS_postgresql := main
+postprocess_FILES_postgresql := $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
 postprocess_DRIVERS += postgresql
 endif
 
diff --git a/scp2/source/base/postgresqlsdbc.scp 
b/scp2/source/base/postgresqlsdbc.scp
index 172f7f3..d27cf43 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -46,7 +46,7 @@ End
 File gid_File_PostgresqlSdbc_Xcd
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Registry;
-Name = postgresqlsdbc.xcd;
+Name = postgresql.xcd;
 Styles = (PACKED);
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Bjoern Michaelsen]

 postprocess/CustomTarget_registry.mk |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 76fc71a989b0059c78f4898694e7fa57ebed9248
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Feb 16 00:25:12 2014 +0100

add missing postprocess deps

- these sometimes break a highly parallel build

Change-Id: Ia30041d2d2ce69900db0476313a0bf2baf6da7a5

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 064228e..9f8d187 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -524,13 +524,16 @@ $(call gb_XcdTarget_get_target,Langpack-$(1).xcd) : \
$(call 
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \
-   $(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu)
+   $(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu) \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \
-   $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list
+   $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \
-   $(call gb_Configuration_get_target,fcfg_langpack)
+   $(call gb_Configuration_get_target,fcfg_langpack) \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_XcdTarget_get_target,registry_$(1).xcd) : \
$(call 
gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list
@@ -540,7 +543,8 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
$(foreach driver,$(postprocess_DRIVERS),$(call 
gb_Configuration_get_target,$(driver))) \
) \
-   $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call 
gb_Configuration_get_target,updchk))
+   $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call 
gb_Configuration_get_target,updchk)) \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 endef
 $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call 
postprocess_lang_deps,$(lang
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Bjoern Michaelsen]

 postprocess/CustomTarget_registry.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c3d648117835df405ff8414c51821d2a0ed1519
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Oct 30 02:56:28 2013 +0100

make postprocess handle commas in OOO_VENDOR correctly

Change-Id: I560d561ba10cdaa113a154ce9bed27de65d6d8eb

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 8040051..b78ff02 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -554,7 +554,7 @@ postprocess_main_SED := \
-e 
's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
 \
-e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' 
\
-e 
's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \
-   -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(OOO_VENDOR),The Document 
Foundation),g' \
+   -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst 
$(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \
-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
-e 
's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Matúš Kukan]

 postprocess/CustomTarget_registry.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5560169074b1b68860df87b68b785c3988cbd0fd
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Oct 2 22:33:56 2013 +0200

fix path to .xcu files in --enable-online-update build

Change-Id: Id305df9d963276c13b0920bdfa24287c8792d25a

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 0d1c10d..4b04f9c 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -456,8 +456,8 @@ ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
 postprocess_XCDS += onlineupdate.xcd
 postprocess_DEPS_onlineupdate := main
 postprocess_FILES_onlineupdate := \
-   $(postprocess_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \
-   $(postprocess_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu
+   $(call 
gb_XcuModuleTarget_get_target,extensions/source/update/check)/org/openoffice/Office/Addons-onlineupdate.xcu
 \
+   $(call 
gb_XcuModuleTarget_get_target,extensions/source/update/check)/org/openoffice/Office/Jobs-onlineupdate.xcu
 endif
 
 ifeq ($(ENABLE_OPENGL),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk

[Tor Lillqvist]

 postprocess/CustomTarget_registry.mk |2 ++
 postprocess/Rdb_services.mk  |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 8bafd5471ed2e85a82f412a742feae76b2fd7d70
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 22 09:52:49 2013 +0300

mork and mozab only on DESKTOP

Change-Id: Idf8539992cbc52e848c2e7768551c156764b5cea

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 10af27b..8b9dd00 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -288,10 +288,12 @@ postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr
 postprocess_DRIVERS += mozab
 endif
 else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 postprocess_DRIVERS += mork
 endif
 endif
+endif
 ifeq (MACOSX,$(OS))
 postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 6f14a88..adf3837 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -294,10 +294,12 @@ endif
 
 else
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/mork/mork \
connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
 ))
+endif # DESKTOP
 
 endif # WNT
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk

[Bjoern Michaelsen]

 postprocess/CustomTarget_registry.mk |2 
 postprocess/Rdb_services.mk  |  120 ++-
 2 files changed, 64 insertions(+), 58 deletions(-)

New commits:
commit fa6d8e68f169c30e574dcb26dc30d4a6f1884e75
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Aug 21 01:30:52 2013 +0200

fix connectivity bits in postprocess

Conflicts:
postprocess/Rdb_services.mk

Change-Id: I843a5ccc0408e267cc2f333044f5b7ba39d1bdea
Reviewed-on: https://gerrit.libreoffice.org/5570
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index c05072e..10af27b 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -287,7 +287,7 @@ ifeq ($(WITH_MOZAB4WIN),YES)
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
 postprocess_DRIVERS += mozab
 endif
-else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
+else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
 postprocess_DRIVERS += mork
 endif
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 5374b10..6f14a88 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -122,14 +122,12 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(filter-out X86_64,$(CPUNAME)), \
avmedia/source/quicktime/avmediaQuickTime \
) \
-   connectivity/source/drivers/macab/macab1 \
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
fpicker/source/aqua/fps_aqua \
shell/source/backends/macbe/macbe1 \
vcl/vcl.macosx \
) \
$(if $(filter WNT,$(OS)), \
-   connectivity/source/drivers/ado/ado \
dtrans/source/generic/dtrans \
dtrans/util/dnd \
dtrans/util/ftransl \
@@ -185,9 +183,6 @@ $(eval $(call gb_Rdb_add_components,services,\
canvas/source/directx/directx9canvas \
canvas/source/directx/gdipluscanvas \
) \
-   $(if $(ENABLE_EVOAB2), \
-   connectivity/source/drivers/evoab2/evoab \
-   ) \
$(if $(ENABLE_GCONF), \
shell/source/backends/gconfbe/gconfbe1 \
) \
@@ -207,9 +202,6 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_VLC), \
avmedia/source/vlc/avmediavlc \
) \
-   $(if $(ENABLE_KAB), \
-   connectivity/source/drivers/kab/kab1 \
-   ) \
$(if $(ENABLE_KDE), \
shell/source/backends/kdebe/kdebe1 \
) \
@@ -226,51 +218,89 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_TDE), \
shell/source/backends/kdebe/tdebe1 \
) \
-   $(if $(ENABLE_TDEAB), \
-   connectivity/source/drivers/kab/tdeab1 \
-   ) \
$(if $(ENABLE_JAVA), \
xmerge/source/bridge/XMergeBridge \
scripting/java/ScriptFramework \
scripting/java/ScriptProviderForJava \
smoketest/org/libreoffice/smoketest/smoketest \
wizards/com/sun/star/wizards/form/form \
-   connectivity/source/drivers/hsqldb/hsqldb \
-   connectivity/source/drivers/jdbc/jdbc \
wizards/com/sun/star/wizards/query/query \
wizards/com/sun/star/wizards/report/report \
wizards/com/sun/star/wizards/table/table \
) \
-   $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \
-   connectivity/source/drivers/firebird/firebird_sdbc \
-   ) \
 ))
 
 ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 
 $(eval $(call gb_Rdb_add_components,services,\
-connectivity/source/drivers/calc/calc \
-dbaccess/source/ext/macromigration/dbmm \
-dbaccess/source/filter/xml/dbaxml \
-dbaccess/util/dba \
-dbaccess/util/dbu \
-dbaccess/util/sdbt \
-forms/util/frm \
-reportdesign/util/rpt \
-reportdesign/util/rptui \
-reportdesign/util/rptxml \
-connectivity/source/drivers/dbase/dbase \
-connectivity/source/cpool/dbpool2 \
-connectivity/source/dbtools/dbtools \
-connectivity/source/drivers/flat/flat \
-connectivity/source/drivers/mysql/mysql \
-connectivity/source/manager/sdbc2 \
-shell/source/backends/localebe/localebe1 \
+   extensions/source/bibliography/bib \
+   extensions/source/dbpilots/dbp \
+   extensions/source/propctrlr/pcr \
+   connectivity/source/cpool/dbpool2 \
+   connectivity/source/dbtools/dbtools \
+   

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[David Ostrovsky]

 postprocess/CustomTarget_registry.mk |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit f20313f9ad1803a2cee313b2c2075349b07ec6ad
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Jul 18 20:53:59 2013 +0200

fdo#65761 yet another gbuildification bug

Change-Id: I88bdd3f0e1cc49b21579043ceaf42616fe2f2493

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 85abfd0..08e2e6e 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -60,15 +60,6 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 postprocess_FILES_calc += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
 postprocess_DRIVERS += calc
-ifeq (WNT,$(OS))
-ifeq ($(WITH_MOZAB4WIN),YES)
-postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
-postprocess_DRIVERS += mozab
-endif
-else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
-postprocess_DRIVERS += mork
-endif
 endif
 
 postprocess_DEPS_cjk := main
@@ -291,6 +282,15 @@ postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
 postprocess_DRIVERS += dbase flat mysql odbc
+ifeq (WNT,$(OS))
+ifeq ($(WITH_MOZAB4WIN),YES)
+postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
+postprocess_DRIVERS += mozab
+endif
+else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
+postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
+postprocess_DRIVERS += mork
+endif
 endif
 ifeq (MACOSX,$(OS))
 postprocess_FILES_main += \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[David Ostrovsky]

 postprocess/CustomTarget_registry.mk |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 61e8d865fd2f3de9668c3176747362e4aaf0054e
Author: David Ostrovsky da...@ostrovsky.org
Date:   Sat Mar 2 18:46:26 2013 +0100

respect DBCONNECTIVITY option for shipping mork driver

Change-Id: If91a3fa6ad8bd1e359e472efacad9d3051cde17c

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index f2c798d..b88e4ef 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -63,6 +63,15 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 postprocess_FILES_calc += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
 postprocess_DRIVERS += calc
+ifeq (WNT,$(OS))
+ifeq ($(WITH_MOZAB4WIN),YES)
+postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
+postprocess_DRIVERS += mozab
+endif
+else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
+postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
+postprocess_DRIVERS += mork
+endif
 endif
 
 postprocess_DEPS_cjk := main
@@ -339,16 +348,6 @@ postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Dr
 postprocess_DRIVERS += kab
 endif
 
-ifeq (WNT,$(OS))
-ifeq ($(WITH_MOZAB4WIN),YES)
-postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
-postprocess_DRIVERS += mozab
-endif
-else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
-postprocess_DRIVERS += mork
-endif
-
 ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Stephan Bergmann]

 postprocess/CustomTarget_registry.mk |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 31a3893974c6b54ada6102ee4128444373f0489a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Feb 26 17:17:17 2013 +0100

Missing dependencies on xsltproc

Change-Id: I6b8608c1bcb820b718b83d47a97212bcc9de3542

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 19be15c..f2c798d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -547,7 +547,8 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call 
postprocess_lang_deps,$(l
 # Rules
 #
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.xcd :
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.xcd : \
+| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet 
--stringparam prefix $(call gb_XcuModuleTarget_get_outdir_target) -o $@ \
@@ -558,7 +559,8 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
echo 'listdependency 
file=main/filenameLangpack-$*.xcu/filename/list'  $@
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd :
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.xcd : 
\
+| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet 
--stringparam prefix $(call gb_CustomTarget_get_workdir,postprocess/registry)/ \
@@ -580,7 +582,8 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
 echo '/list'  $@ \
)
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.xcd :
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.xcd : \
+| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet 
--stringparam prefix $(call gb_CustomTarget_get_workdir,postprocess/registry)/ \
@@ -623,7 +626,8 @@ ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
 endif
echo '/list'  $@
 
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd :
+$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.xcd : \
+| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCD,3)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet 
--stringparam prefix $(OUTDIR)/xml/ \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits