[Libreoffice-commits] .: mysqlc/Extension_mysql-connector-ooo.mk mysqlc/source RepositoryExternal.mk Repository.mk

[Libreoffice Gerrit user]

 Repository.mk                           |    2 +-
 RepositoryExternal.mk                   |    8 ++++----
 mysqlc/Extension_mysql-connector-ooo.mk |    6 ++----
 mysqlc/source/META-INF/manifest.xml     |    2 +-
 mysqlc/source/description.xml           |    4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 5f356bd99726818dc44b316be3327dad057f7cbe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 28 23:53:30 2013 +0100

    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

diff --git a/Repository.mk b/Repository.mk
index 6cb7c1c..069b662 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -572,7 +572,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     migrationoo3 \
     msforms \
     mtfrenderer \
-    mysqlc \
     nullcanvas \
     OGLTrans \
     passwordcontainer \
@@ -643,6 +642,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 
 $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
 	SunPresentationMinimizer \
+    mysqlc \
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 404732e..79039d6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -228,15 +228,15 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,OOOLIBS,\
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
 	mysqlcppconn \
 ))
 
+# note: this does not link mysqlcppconn, it is loaded via osl_loadModuleRelative
 define gb_LinkTarget__use_mysqlcppconn
 
-$(call gb_LinkTarget_use_libraries,$(1),\
-	mysqlcppconn \
-)
+$(call gb_LinkTarget_use_unpacked,$(1),mysqlcppconn)
+
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DCPPCONN_LIB_BUILD \
 )
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk
index 65f2b0d..23e769f 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 7c7ffb2..2a54d84 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 at 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 cd5c3c0..edd0b4d 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- at 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>