summaryrefslogtreecommitdiff
path: root/mysqlc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-28 23:53:30 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-28 23:57:28 +0100
commit5f356bd99726818dc44b316be3327dad057f7cbe (patch)
tree1f94463781231d12a0d41e5d5981e32cd0084d87 /mysqlc
parentb02d799732594eee67cab0f86dc3b09182f628a5 (diff)
mysqlc: tweak gbuild conversion:
- the mysqlc library did link against the mysqlcppconn only when a SYSTEM_MYSQL_CPPCONN is used - mysqlc is an EXTENSIONLIB, mysqlcppconn is PLAINLIBS_NONE - one N was missing in Extension makefile, and use gb_Extension_add_library to put in mysqlcppconn - manifest.xml, description.xml: update PLACEHOLDERS Change-Id: If45714f81056a6c1a4cb3380b50cc3dcc0443bb8
Diffstat (limited to 'mysqlc')
-rw-r--r--mysqlc/Extension_mysql-connector-ooo.mk6
-rw-r--r--mysqlc/source/META-INF/manifest.xml2
-rw-r--r--mysqlc/source/description.xml4
3 files changed, 5 insertions, 7 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk
index 65f2b0d5cd97..23e769f97f64 100644
--- a/mysqlc/Extension_mysql-connector-ooo.mk
+++ b/mysqlc/Extension_mysql-connector-ooo.mk
@@ -17,10 +17,8 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\
$(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
))
-ifeq ($(SYSTEM_MYSQL_CPPCON),NO)
-$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
- $(call gb_Library_get_target,mysqlcppcon) \
-))
+ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
+$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn))
endif
# HACK: comes from Library_mysql.mk
diff --git a/mysqlc/source/META-INF/manifest.xml b/mysqlc/source/META-INF/manifest.xml
index 7c7ffb25fbe7..2a54d8410b66 100644
--- a/mysqlc/source/META-INF/manifest.xml
+++ b/mysqlc/source/META-INF/manifest.xml
@@ -19,7 +19,7 @@
-->
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
- manifest:full-path="mysqlc.unoSHARED_EXTENSION"/>
+ manifest:full-path="mysqlc.uno@SHARED_EXTENSION@"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="registry/data/org/openoffice/Office/DataAccess/Drivers.xcu"/>
</manifest:manifest>
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
index cd5c3c0cd1c4..edd0b4d75941 100644
--- a/mysqlc/source/description.xml
+++ b/mysqlc/source/description.xml
@@ -19,9 +19,9 @@
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <identifier value="UPDATED_IDENTIFIER"/>
+ <identifier value="com.sun.star.mysql-connector-ooo-@PLATFORM@"/>
<version value="1.0.1" />
- <platform value="UPDATED_SUPPORTED_PLATFORM" />
+ <platform value="@PLATFORM@" />
<display-name>
<name lang="en-US">MySQL Connector</name>
</display-name>