[Libreoffice-commits] core.git: 4 commits - configure.ac connectivity/Library_tdeabdrv1.mk Repository.mk scp2/AutoInstall.mk scp2/source shell/Module_shell.mk shell/Package_scripts.mk shell/Package_scripts_tde.mk
Jan-Marek Glogowski
glogow at fbihome.de
Mon Oct 12 09:21:58 PDT 2015
Repository.mk | 9 +++++++--
configure.ac | 32 +++++++++++++++++---------------
connectivity/Library_tdeabdrv1.mk | 1 +
scp2/AutoInstall.mk | 2 +-
scp2/source/kde/module_kde.scp | 4 +++-
scp2/source/ooo/file_ooo.scp | 7 +++++++
scp2/source/tde/module_tde.scp | 4 +++-
shell/Module_shell.mk | 1 +
shell/Package_scripts.mk | 4 ----
shell/Package_scripts_tde.mk | 16 ++++++++++++++++
10 files changed, 56 insertions(+), 24 deletions(-)
New commits:
commit f3b6107f4cc9544e58df76cb9d9e17c599040d49
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Oct 12 14:15:59 2015 +0200
Cleanup configure output
AC_MSG_NOTICE'ify some output, fix a test and change some
AC_MSG_CHECKING layout, where there was additional output
before the AC_MSG_RESULT.
Change-Id: Ib423bb6cb65fd4ad7bcba413c2574efb44054399
diff --git a/configure.ac b/configure.ac
index a3c4eca..eea4cba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7148,7 +7148,7 @@ if test "$enable_epm" = "yes"; then
AC_PATH_PROG(EPM, epm, no)
fi
if test "$EPM" = "no" -o "$EPM" = "internal"; then
- echo "EPM will be built."
+ AC_MSG_NOTICE([EPM will be built.])
BUILD_TYPE="$BUILD_TYPE EPM"
EPM=${WORKDIR}/UnpackedTarball/epm/epm
else
@@ -8296,9 +8296,9 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
AC_MSG_ERROR([GSSAPI needs OpenSSL, but --disable-openssl was given.])
fi
- AC_MSG_CHECKING([PostgreSQL C interface])
+ postgres_interface=""
if test "$with_system_postgresql" = "yes"; then
- AC_MSG_RESULT([external PostgreSQL])
+ postgres_interface="external PostgreSQL"
SYSTEM_POSTGRESQL=TRUE
if test "$_os" = Darwin; then
supp_path=''
@@ -8393,17 +8393,21 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
if test -n "$with_libpq_path"; then
SYSTEM_POSTGRESQL=TRUE
- AC_MSG_RESULT([external libpq])
+ postgres_interface="external libpq"
POSTGRESQL_LIB="-L${with_libpq_path}/lib/"
POSTGRESQL_INC=-I"${with_libpq_path}/include/"
else
SYSTEM_POSTGRESQL=
- AC_MSG_RESULT([internal])
+ postgres_interface="internal"
POSTGRESQL_LIB=""
POSTGRESQL_INC="%OVERRIDE_ME%"
BUILD_TYPE="$BUILD_TYPE POSTGRESQL"
fi
fi
+
+ AC_MSG_CHECKING([PostgreSQL C interface])
+ AC_MSG_RESULT([$postgres_interface])
+
if test "${SYSTEM_POSTGRESQL}" = "TRUE"; then
AC_MSG_NOTICE([checking system PostgreSQL prerequisites])
save_CFLAGS=$CFLAGS
@@ -8530,8 +8534,6 @@ if test "$with_system_curl" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_CURL=TRUE
- AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
-
# First try PKGCONFIG and then fall back
PKG_CHECK_MODULES(CURL, libcurl >= 7.19.4,, [:])
@@ -8544,17 +8546,18 @@ if test "$with_system_curl" = "yes"; then
CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
+ AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
case $curl_version in
dnl brackets doubled below because Autoconf uses them as m4 quote characters,
dnl so they need to be doubled to end up in the configure script
7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
+ AC_MSG_RESULT([yes])
;;
*)
AC_MSG_ERROR([no, you have $curl_version])
;;
esac
fi
- AC_MSG_RESULT([yes])
libo_MINGW_CHECK_DLL([libcurl])
libo_MINGW_TRY_DLL([libintl])
@@ -9901,7 +9904,6 @@ dnl ===================================================================
dnl Test which vclplugs have to be built.
dnl ===================================================================
R=""
-AC_MSG_CHECKING([which VCLplugs shall be built])
if test "$USING_X11" != TRUE; then
enable_gtk=no
enable_gtk3=no
@@ -9959,18 +9961,18 @@ fi
AC_SUBST(ENABLE_KDE4)
ENABLE_HEADLESS=""
-if test "x$with_x" = "xno" -o $CXX = "emcc"; then
+if test "x$with_x" = "xno" -o "$CXX" = "emcc"; then
ENABLE_HEADLESS="TRUE"
SCPDEFS="$SCPDEFS -DLIBO_HEADLESS"
R="headless"
fi
AC_SUBST(ENABLE_HEADLESS)
-if test -z "$R"; then
- AC_MSG_RESULT([none])
-else
- AC_MSG_RESULT([$R])
+build_vcl_plugins="$R"
+if test -z "$build_vcl_plugins"; then
+ build_vcl_plugins="none"
fi
+AC_MSG_NOTICE([VCLplugs to be built: $build_vcl_plugins])
dnl ===================================================================
dnl GCONF check
@@ -12685,7 +12687,7 @@ AC_SUBST(MPL_SUBSET)
dnl ===================================================================
dnl Setting up the environment.
dnl ===================================================================
-echo "setting up the build environment variables..."
+AC_MSG_NOTICE([setting up the build environment variables...])
AC_SUBST(COMPATH)
commit a9e7645cb96135609016533793580d1a94158af7
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Oct 12 10:43:48 2015 +0200
TDE: move stuff into the tde-integration package
Currently the package just contains the TDE shell backend library.
This moves the URL handler tde-url-open and the vcl plugin into
the integration package, like the KDE3 based kde-integration.
The TDE address book driver is left in the core package.
Change-Id: I2687b313d7f106bb344c65c50ae0a07b0140def0
diff --git a/Repository.mk b/Repository.mk
index 7e39aab..9d27892 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -146,7 +146,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \
$(if $(filter TRUE-TRUE,$(USING_X11)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
- $(if $(ENABLE_TDE),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
ui-previewer \
$(if $(filter WNT,$(OS)), \
@@ -223,6 +222,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,tde, \
$(if $(ENABLE_TDE),tdebe1) \
+ $(if $(USING_X11), \
+ $(if $(ENABLE_TDE),vclplug_tde) \
+ ) \
+))
+
+$(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
+ $(if $(ENABLE_TDE),tdefilepicker) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
@@ -426,7 +432,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
vclcanvas \
$(if $(USING_X11), \
vclplug_gen \
- $(if $(ENABLE_TDE),vclplug_tde) \
) \
writerperfect \
xmlscript \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7d2a347..3f6de8c 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b0f3382..ab8daaf 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -82,6 +82,13 @@ File gid_File_Bin_Kde_Open_Url
Styles = (FILELIST, PACKED);
End
+File gid_File_Bin_Tde_Open_Url
+ BIN_FILE_BODY;
+ Dir = FILELIST_DIR;
+ Name = "shell_scripts_tde.filelist";
+ Styles = (FILELIST, PACKED);
+End
+
#endif
#if defined UNX
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 24725de..8e273ab 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -19,6 +19,8 @@ Module gid_Module_Optional_Tde
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
Styles = ();
- Files = (auto_tde_ALL);
+ Files = (auto_tde_ALL,
+ gid_File_Bin_Tde_Open_Url
+ );
End
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 0c4875d..aa4700f 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Module_add_targets,shell,\
Package_scripts \
Package_scripts_gnome \
Package_scripts_kde \
+ Package_scripts_tde \
))
endif
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index e4f5a6e..1b310ca 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)
$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/open-url,open-url.sh))
-ifeq ($(ENABLE_TDE),TRUE)
-$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh))
-endif
-
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_tde.mk b/shell/Package_scripts_tde.mk
new file mode 100644
index 0000000..0d1111f
--- /dev/null
+++ b/shell/Package_scripts_tde.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,shell_scripts_tde,$(SRCDIR)/shell/source/unix/misc))
+
+ifeq ($(ENABLE_TDE),TRUE)
+$(eval $(call gb_Package_add_file,shell_scripts_tde,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh))
+endif
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit 4d4835cc55561b7ccdd628fa3a40d71fc9e9ff9e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Oct 12 14:12:27 2015 +0200
TDE: fix build of the address book driver
From the compile failures, it apparently uses boost headers.
Change-Id: I952847187f53e6c00ed39020c4922d427dca9189
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index 8301e5f..6bcf1c4 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_include,tdeabdrv1,\
$(eval $(call gb_Library_use_sdk_api,tdeabdrv1))
$(eval $(call gb_Library_use_externals,tdeabdrv1,\
+ boost_headers \
tde \
))
commit 805a861b398bbe5f22cb08705dfa006b44fe4e40
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Oct 12 10:38:35 2015 +0200
KDE4: add kde4-open-url to the integration package
Currently kde4-open-url is just installed, but not included in
the kde-integration package.
Change-Id: Ic114a463b97aaaf4cc7ff3062143698daf93513c
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 6fa6155..2bf6ac5 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -26,5 +26,7 @@ Module gid_Module_Optional_Kde
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = ();
- Files = (auto_kde_ALL);
+ Files = (auto_kde_ALL,
+ gid_File_Bin_Kde_Open_Url
+ );
End
More information about the Libreoffice-commits
mailing list