diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-09-18 11:23:52 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-09-18 14:17:27 +0000 |
| commit | 903065dda1e574f4791ff40c31e39f14ba710424 (patch) | |
| tree | 1a8e0724031a3747465d61ae0b7e7c927b2e1292 /postprocess | |
| parent | b8a331fefc6332baa62144095d3f26cdb456d2c7 (diff) | |
switch build system to mork driver implementation
On all non windows platforms no mozilla is used any more.
On windows it used for O and OE address book access.
Once alternative implementation for it exists,
mozilla can be stripped there too.
Change-Id: I54144005e6a284326b45a34eb958d170e872471e
Reviewed-on: https://gerrit.libreoffice.org/637
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 11 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 13 |
2 files changed, 24 insertions, 0 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index a40841a622fb..c62d058e6060 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -376,12 +376,23 @@ my_components += \ .END .IF "$(OS)" != "IOS" && "$(OS)" != "ANDROID" + +.IF "$(OS)" == "WNT" + .IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \ "$(WITH_MOZILLA)" != "NO" my_components += component/connectivity/source/drivers/mozab/mozab .ELSE my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap .END + +.ELSE + +# new and shiny mork driver +my_components += component/connectivity/source/drivers/mork/mork + +.ENDIF + .ENDIF .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless" diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 3c63d1f7a586..bbbc2c32ae9f 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -351,6 +351,10 @@ MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu MY_DRIVERS += kab .END + + +# somebody would simplify that? ;-) +.IF "$(OS)" == "WNT" .IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \ "$(OS)" != "MACOSX" .IF "$(OS)" == "WNT" @@ -361,6 +365,15 @@ MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab2.xcu MY_DRIVERS += mozab2 .END .END + +.ELSE + +# new and shiny mork driver +MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu +MY_DRIVERS += mork + +.END + .IF "$(SYSTEM_LIBEXTTEXTCAT_DATA)" != "" MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu .ELSE |