Merge pull request #15 from project-tsurugi/remove-tsubakuro-jni

Remove to use tsubakuro-jni
project-tsurugi · Aug 28, 2023 · 2122f63 · 2122f63
2 parents ff576da + 2ced015
commit 2122f63
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 40 deletions.
diff --git a/buildSrc/src/main/groovy/tsubakuro-examples.app-conventions.gradle b/buildSrc/src/main/groovy/tsubakuro-examples.app-conventions.gradle
@@ -3,22 +3,10 @@ plugins {
     id 'application'
 }
 
-configurations {
-    nativeLib
-}
-
 dependencies {
     implementation "com.tsurugidb.tsubakuro:tsubakuro-session:${tsubakuroVersion}"
     implementation "com.tsurugidb.tsubakuro:tsubakuro-connector:${tsubakuroVersion}"
     implementation "com.tsurugidb.tsubakuro:tsubakuro-explain:${tsubakuroVersion}"
 
     implementation 'org.slf4j:slf4j-simple:1.7.32'
-
-    nativeLib "com.tsurugidb.tsubakuro:tsubakuro-jni:${tsubakuroVersion}"
-}
-
-task copyNativeLib(type: Copy) {
-    from  configurations.nativeLib
-    into "${buildDir}/native"
-    rename "tsubakuro-jni-${tsubakuroVersion}.so", 'libtsubakuro.so'
 }
diff --git a/modules/cases/build.gradle b/modules/cases/build.gradle
@@ -10,43 +10,34 @@ tasks.register('runDateTime', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.datetime.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
 
 tasks.register('runIssue', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
 
 tasks.register('runMS', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.multipleSelect.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
diff --git a/modules/clients/build.gradle b/modules/clients/build.gradle
@@ -10,16 +10,13 @@ tasks.register('runExample', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
 
-    dependsOn copyNativeLib
-
     jvmArgs '-Dcom.sun.management.jmxremote.port=9999'
     jvmArgs '-Dcom.sun.management.jmxremote.authenticate=false'
     jvmArgs '-Dcom.sun.management.jmxremote.ssl=false'
@@ -29,22 +26,18 @@ tasks.register('runDataStore', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.datastore.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
 
 tasks.register('runDiagnostic', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.diagnostics.JMXClient'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
@@ -57,13 +50,10 @@ tasks.register('runBook', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.book.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
diff --git a/modules/tpcc/build.gradle b/modules/tpcc/build.gradle
@@ -6,16 +6,13 @@ tasks.register('runTpcc', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.tpcc.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'com.tsurugidb.tsubakuro.jniverify', 'false'
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
 
 startScripts {

diff --git a/modules/tpccLoader/build.gradle b/modules/tpccLoader/build.gradle
@@ -14,16 +14,13 @@ tasks.register('runTpccLoader', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.tpccLoader.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'com.tsurugidb.tsubakuro.jniverify', 'false'
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }
 
 startScripts {

diff --git a/modules/tpch/build.gradle b/modules/tpch/build.gradle
@@ -10,13 +10,10 @@ tasks.register('runTpch', JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     mainClass = 'com.tsurugidb.tsubakuro.examples.tpch.Main'
 
-    systemProperty 'com.tsurugidb.tsubakuro.jnilib', "${buildDir}/native/libtsubakuro.so"
     systemProperty 'tsurugi.dbname', findProperty('tsurugi.dbname') ?: 'ipc:tsurugi'
 
     systemProperty 'org.slf4j.simpleLogger.defaultLogLevel', findProperty('loglevel') ?: 'info'
     systemProperty 'org.slf4j.simpleLogger.showThreadName', 'false'
     systemProperty 'org.slf4j.simpleLogger.showShortLogName', 'true'
     systemProperty 'org.slf4j.simpleLogger.levelInBrackets', 'true'
-
-    dependsOn copyNativeLib
 }