diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-05-03 17:53:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-05-08 18:02:11 +0200 |
| commit | ad4b51948f2c0e1276e62902a2be463576224eec (patch) | |
| tree | 9adc9b04c3783fb1b842c3e92f8f56f82603ace9 | |
| parent | afb8e873911141a2c2e4989c9281d3fb0093ecc4 (diff) | |
| download | mariadb-git-ad4b51948f2c0e1276e62902a2be463576224eec.tar.gz | |
Revert "Connect: remove Mongo dependencies"
This reverts commit 72fa9dabadb4b0011f483ccbf1ef59e62d0ef1e0
but doesn't recover deleted jars - they still exist in
mysql-test/connect/std_data, no need to have them twice.
Also it removes a redundant copy on JavaWrappers.jar
| -rw-r--r-- | storage/connect/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | storage/connect/JavaWrappers.jar | bin | 19192 -> 0 bytes |
2 files changed, 14 insertions, 3 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 43902613ce8..e06b59804fb 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -272,8 +272,14 @@ IF(CONNECT_WITH_JDBC) JdbcInterface.java ApacheInterface.java MariadbInterface.java MysqlInterface.java OracleInterface.java PostgresqlInterface.java Mongo2Interface.java Mongo3Interface.java - JavaWrappers.jar) + mysql-test/connect/std_data/JavaWrappers.jar) add_definitions(-DJAVA_SUPPORT) + IF(CONNECT_WITH_MONGO) + SET(CONNECT_SOURCES ${CONNECT_SOURCES} + mysql-test/connect/std_data/Mongo2.jar + mysql-test/connect/std_data/Mongo3.jar) + add_definitions(-DMONGO_SUPPORT) + ENDIF() ELSE() SET(JDBC_LIBRARY "") ENDIF() @@ -404,8 +410,13 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND) SET (JAVA_SOURCES JdbcInterface.java) add_jar(JdbcInterface ${JAVA_SOURCES}) INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/JavaWrappers.jar + ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/JavaWrappers.jar ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine) + IF(CONNECT_WITH_MONGO) + INSTALL(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/Mongo2.jar + ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/Mongo3.jar + DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine) + ENDIF() ENDIF() - diff --git a/storage/connect/JavaWrappers.jar b/storage/connect/JavaWrappers.jar Binary files differdeleted file mode 100644 index 33b29e7685b..00000000000 --- a/storage/connect/JavaWrappers.jar +++ /dev/null |