[Libreoffice-commits] .: configure.in connectivity/Module_connectivity.mk postprocess/packcomponents postprocess/packregistry scp2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 18 07:17:46 PDT 2012
configure.in | 31 +++++++++++++++++++++++++------
connectivity/Module_connectivity.mk | 17 ++++++++++-------
postprocess/packcomponents/makefile.mk | 11 +++++++++++
postprocess/packregistry/makefile.mk | 13 +++++++++++++
scp2/source/ooo/file_library_ooo.scp | 8 ++++++++
scp2/source/ooo/module_hidden_ooo.scp | 4 ++++
6 files changed, 71 insertions(+), 13 deletions(-)
New commits:
commit 903065dda1e574f4791ff40c31e39f14ba710424
Author: David Ostrovsky <david at ostrovsky.org>
Date: Tue Sep 18 11:23:52 2012 +0200
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 at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/configure.in b/configure.in
index 75b9175..9aaa2eb 100644
--- a/configure.in
+++ b/configure.in
@@ -695,7 +695,7 @@ AC_ARG_ENABLE(pch,
AC_ARG_ENABLE(mozilla,
AS_HELP_STRING([--enable-mozilla],
- [LibreOffice can include a strangely hacked up Mozilla binary for your
+ [LibreOffice can include a strangely hacked up Mozilla binary on Windows
platform, to build with this version, use this option.])
)
@@ -4502,6 +4502,18 @@ if test $_os = Darwin -a "$enable_mozilla" = no; then
fi
dnl ===================================================================
+dnl --enable-mozilla is supported only on Windows
+dnl ===================================================================
+
+if test "$_os" != "WINNT" ; then
+ if test "$enable_mozilla" = "yes"; then
+ AC_MSG_ERROR([--enable-mozilla is only available on Windows])
+ fi
+
+fi
+
+
+dnl ===================================================================
dnl .NET needs special treatment
dnl (does the above comment really mean .NET, or is it misusing
dnl that to mean Visual Studio .NET 2003 ? And does this also
@@ -7865,12 +7877,19 @@ fi
AC_SUBST(SYSTEM_ODBC_HEADERS)
AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
-if test "$enable_mozilla" = "no"; then
- AC_MSG_RESULT([no])
-elif test "$with_system_mozilla" = "yes"; then
- AC_MSG_RESULT([no, not possible with system-mozilla])
+if test "$_os" = "WINNT"; then
+ if test "$enable_mozilla" = "no"; then
+ AC_MSG_RESULT([no])
+ elif test "$with_system_mozilla" = "yes"; then
+ AC_MSG_RESULT([no, not possible with system-mozilla])
+ else
+ AC_MSG_RESULT([yes])
+ fi
else
- AC_MSG_RESULT([yes])
+# on all other platforms Mozilla addressbook connectivity
+# is unconditionally built
+# new and shiny mork driver
+ AC_MSG_RESULT([yes])
fi
dnl ===================================================================
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index a05df43..50727ee 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -38,14 +38,12 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_flat \
Configuration_mysql \
Configuration_odbc \
- Executable_mork_helper \
Library_calc \
Library_dbase \
Library_dbpool2 \
Library_dbtools \
Library_file \
Library_flat \
- Library_mork \
Library_mysql \
Library_odbc \
Library_odbcbase \
@@ -117,26 +115,31 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
+# mozab only on windows
+ifeq ($(OS),WNT)
+
ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA)),$(filter MACOSX,$(OS))),YES),YES)
$(eval $(call gb_Module_add_targets,connectivity,\
Library_mozbootstrap \
))
else
-
$(eval $(call gb_Module_add_targets,connectivity,\
Library_mozab \
Library_mozabdrv \
))
-ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mozab \
))
-else
+endif
+
+else # the new and shiny mork driver ;-)
+
$(eval $(call gb_Module_add_targets,connectivity,\
- Configuration_mozab2 \
+ Executable_mork_helper \
+ Configuration_mork \
+ Library_mork \
))
-endif
endif
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a40841a..c62d058 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 3c63d1f..bbbc2c3 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
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 8a20d07..2ee2f0b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -890,6 +890,8 @@ File gid_File_Lib_Mcnttype
#endif
End
+#if defined(WNT)
+
#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
// #i91209#
STD_LIB_FILE(gid_File_Lib_Mozab,mozab2)
@@ -910,6 +912,12 @@ End
#endif
+#else
+
+STD_LIB_FILE(gid_File_Lib_Mork,mork)
+
+#endif
+
STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter)
STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index aa4ff72..c265fd9 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -379,9 +379,13 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Hsqldb_2,
gid_File_Lib_Jdbc,
gid_File_Lib_Mcnttype,
+#if defined(WNT)
gid_File_Lib_Mozab_2,
gid_File_Lib_Mozabdrv,
gid_File_Lib_Mozbootstrap,
+#else
+ gid_File_Lib_Mork,
+#endif
gid_File_Lib_Mysql,
gid_File_Lib_Odbc,
gid_File_Lib_Officebean,
More information about the Libreoffice-commits
mailing list