[Libreoffice-commits] core.git: external/Module_external.mk external/mysqlcppconn mysqlcppconn/binding_config.h mysqlcppconn/config.h mysqlcppconn/Library_mysqlcppconn.mk mysqlcppconn/Makefile mysqlcppconn/Module_mysqlcppconn.mk mysqlcppconn/patches mysqlcppconn/README mysqlcppconn/UnpackedTarball_mysqlcppconn.mk RepositoryModule_host.mk
Khaled Hosny
khaledhosny at eglug.org
Sat Oct 19 00:47:41 PDT 2013
RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/mysqlcppconn/Library_mysqlcppconn.mk | 77 ++++++
external/mysqlcppconn/Makefile | 7
external/mysqlcppconn/Module_mysqlcppconn.mk | 17 +
external/mysqlcppconn/README | 1
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 23 +
external/mysqlcppconn/binding_config.h | 5
external/mysqlcppconn/config.h | 39 +++
external/mysqlcppconn/patches/default_to_protocol_tcp.patch | 12 +
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch | 117 ++++++++++
mysqlcppconn/Library_mysqlcppconn.mk | 77 ------
mysqlcppconn/Makefile | 7
mysqlcppconn/Module_mysqlcppconn.mk | 21 -
mysqlcppconn/README | 1
mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 23 -
mysqlcppconn/binding_config.h | 5
mysqlcppconn/config.h | 39 ---
mysqlcppconn/patches/default_to_protocol_tcp.patch | 12 -
mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch | 117 ----------
20 files changed, 299 insertions(+), 303 deletions(-)
New commits:
commit 7495d220dd17c14fb48b384e117fcfa54d18cdac
Author: Khaled Hosny <khaledhosny at eglug.org>
Date: Fri Oct 18 22:57:07 2013 +0200
fdo#70393: move mysqlcppconn to a subdir of external
Change-Id: I5945fa432a9371854e25454feabcafabed7f7b7d
Reviewed-on: https://gerrit.libreoffice.org/6346
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 4164b9c..e03523b 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
- $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 92727a4..bb949c4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MARIADB,libmariadb) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
+ $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
similarity index 100%
rename from mysqlcppconn/Library_mysqlcppconn.mk
rename to external/mysqlcppconn/Library_mysqlcppconn.mk
diff --git a/mysqlcppconn/Makefile b/external/mysqlcppconn/Makefile
similarity index 71%
rename from mysqlcppconn/Makefile
rename to external/mysqlcppconn/Makefile
index ccb1c85..e4968cf 100644
--- a/mysqlcppconn/Makefile
+++ b/external/mysqlcppconn/Makefile
@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
diff --git a/mysqlcppconn/Module_mysqlcppconn.mk b/external/mysqlcppconn/Module_mysqlcppconn.mk
similarity index 92%
rename from mysqlcppconn/Module_mysqlcppconn.mk
rename to external/mysqlcppconn/Module_mysqlcppconn.mk
index 01acff0..6a45dd8 100644
--- a/mysqlcppconn/Module_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Module_mysqlcppconn.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,mysqlcppconn))
-ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
-
$(eval $(call gb_Module_add_targets,mysqlcppconn,\
UnpackedTarball_mysqlcppconn \
Library_mysqlcppconn \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/mysqlcppconn/README b/external/mysqlcppconn/README
similarity index 100%
rename from mysqlcppconn/README
rename to external/mysqlcppconn/README
diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
similarity index 74%
rename from mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
rename to external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 3f86236..ae0f267 100644
--- a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -11,13 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mysqlcppconn))
$(eval $(call gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,mysqlcppconn/config.h))
+$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,external/mysqlcppconn/config.h))
-$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_config.h))
+$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,external/mysqlcppconn/binding_config.h))
$(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
- mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
- mysqlcppconn/patches/default_to_protocol_tcp.patch \
+ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
+ external/mysqlcppconn/patches/default_to_protocol_tcp.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/mysqlcppconn/binding_config.h b/external/mysqlcppconn/binding_config.h
similarity index 100%
rename from mysqlcppconn/binding_config.h
rename to external/mysqlcppconn/binding_config.h
diff --git a/mysqlcppconn/config.h b/external/mysqlcppconn/config.h
similarity index 100%
rename from mysqlcppconn/config.h
rename to external/mysqlcppconn/config.h
diff --git a/mysqlcppconn/patches/default_to_protocol_tcp.patch b/external/mysqlcppconn/patches/default_to_protocol_tcp.patch
similarity index 100%
rename from mysqlcppconn/patches/default_to_protocol_tcp.patch
rename to external/mysqlcppconn/patches/default_to_protocol_tcp.patch
diff --git a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
similarity index 100%
rename from mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
rename to external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
More information about the Libreoffice-commits
mailing list