diff --git a/java/android/app/build.gradle b/java/android/app/build.gradle index a0353e01f..5be63ebd0 100644 --- a/java/android/app/build.gradle +++ b/java/android/app/build.gradle @@ -76,19 +76,21 @@ def FD_MODEL = [ 'dest': 'src/main/assets/models' ], [ - 'src': 'https://bj.bcebos.com/paddlehub/fastdeploy/uie-nano.tgz', + 'src' : 'https://bj.bcebos.com/paddlehub/fastdeploy/uie-nano.tgz', 'dest': 'src/main/assets/models' ] ] def FD_JAVA_SDK = [ [ - 'src' : 'https://bj.bcebos.com/fastdeploy/test/fastdeploy-android-sdk-latest-dev.aar', - 'dest': 'libs' + 'src' : 'https://bj.bcebos.com/fastdeploy/dev/android/fastdeploy-android-sdk-with-text-0.0.0.aar', + 'dest': 'libs', + 'name': 'fastdeploy-android-sdk-latest-dev.aar' ], [ 'src' : 'https://bj.bcebos.com/fastdeploy/test/bdasr_V3_20210628_cfe8c44.aar', - 'dest': 'libs' + 'dest': 'libs', + 'name': 'bdasr_V3_20210628_cfe8c44.aar' ] ] @@ -116,10 +118,7 @@ task downloadAndExtractModels(type: DefaultTask) { } if (copyFiles) { println "[INFO] Taring ${cachePath}/${modelName} -> ${model.dest}/${modelPrefix}" - copy { - from tarTree("${cachePath}/${modelName}") - into "${model.dest}" - } + copy { from(tarTree("${cachePath}/${modelName}")) into("${model.dest}") } } else { println "[INFO] ${model.dest}/${modelPrefix} already exists!" } @@ -134,26 +133,25 @@ task downloadAndExtractSDKs(type: DefaultTask) { doLast { String cachePath = "cache" if (!file("${cachePath}").exists()) { - mkdir "${cachePath}" + mkdir("${cachePath}") } FD_JAVA_SDK.eachWithIndex { sdk, index -> String[] sdkPaths = sdk.src.split("/") - String sdkName = sdkPaths[sdkPaths.length - 1] + String cacheName = sdkPaths[sdkPaths.length - 1] + String sdkName = sdk.name + boolean copyFiles = false if (!file("${sdk.dest}/${sdkName}").exists()) { // Download the target SDK if not exists - if (!file("${cachePath}/${sdkName}").exists()) { - println "[INFO] Downloading ${sdk.src} -> ${cachePath}/${sdkName}" - ant.get(src: sdk.src, dest: file("${cachePath}/${sdkName}")) + if (!file("${cachePath}/${cacheName}").exists()) { + println "[INFO] Downloading ${sdk.src} -> ${cachePath}/${cacheName}" + ant.get(src: sdk.src, dest: file("${cachePath}/${cacheName}")) } copyFiles = true } if (copyFiles) { - println "[INFO] Coping ${cachePath}/${sdkName} -> ${sdk.dest}/${sdkName}" - copy { - from "${cachePath}/${sdkName}" - into "${sdk.dest}" - } + println "[INFO] Rename ${cachePath}/${cacheName} -> ${sdk.dest}/${sdkName}" + copy { from("${cachePath}/${cacheName}") into("${sdk.dest}") rename("${cacheName}", "${sdkName}") } } else { println "[INFO] ${sdk.dest}/${sdkName} already exists!" } diff --git a/java/android/fastdeploy/build.gradle b/java/android/fastdeploy/build.gradle index d6d4abb7c..29e6b57d9 100644 --- a/java/android/fastdeploy/build.gradle +++ b/java/android/fastdeploy/build.gradle @@ -49,8 +49,9 @@ dependencies { def FD_CXX_LIB = [ [ - 'src' : 'https://bj.bcebos.com/fastdeploy/test/fastdeploy-android-latest-shared-dev.tgz', - 'dest': 'libs' + 'src' : 'https://bj.bcebos.com/fastdeploy/dev/android/fastdeploy-android-with-text-0.0.0-shared.tgz', + 'dest': 'libs', + 'name': 'fastdeploy-android-latest-shared-dev' ] ] @@ -63,26 +64,47 @@ task downloadAndExtractLibs(type: DefaultTask) { if (!file("${cachePath}").exists()) { mkdir "${cachePath}" } + FD_CXX_LIB.eachWithIndex { lib, index -> + String[] libPaths = lib.src.split("/") + String sdkName = lib.name String libName = libPaths[libPaths.length - 1] - libName = libName.split("\\.")[0] + libName = libName.substring(0, libName.indexOf("tgz") - 1) + String cacheName = cachePath + "/" + "${libName}.tgz" + + String libDir = lib.dest + "/" + libName + String sdkDir = lib.dest + "/" + sdkName + boolean copyFiles = false - if (!file("${lib.dest}/${libName}").exists()) { - if (!file("${cachePath}/${libName}.tgz").exists()) { - println "[INFO] Downloading ${lib.src} -> ${cachePath}/${libName}.tgz" - ant.get(src: lib.src, dest: file("${cachePath}/${libName}.tgz")) + if (!file("${sdkDir}").exists()) { + // Download lib and rename to sdk name later. + if (!file("${cacheName}").exists()) { + println "[INFO] Downloading ${lib.src} -> ${cacheName}" + ant.get(src: lib.src, dest: file("${cacheName}")) } copyFiles = true } + if (copyFiles) { - println "[INFO] Taring ${cachePath}/${libName}.tgz -> ${lib.dest}/${libName}" - copy { - from tarTree("${cachePath}/${libName}.tgz") - into "${lib.dest}" + println "[INFO] Taring ${cacheName} -> ${libDir}" + copy { from(tarTree("${cacheName}")) into("${lib.dest}") } + if (!libName.equals(sdkName)) { + if (file("${sdkDir}").exists()) { + delete("${sdkDir}") + println "[INFO] Remove old ${sdkDir}" + } + mkdir "${sdkDir}" + println "[INFO] Coping ${libDir} -> ${sdkDir}" + copy { from("${libDir}") into("${sdkDir}") } + delete("${libDir}") + println "[INFO] Removed ${libDir}" + println "[INFO] Update ${sdkDir} done!" } } else { - println "[INFO] ${lib.dest}/${libName} already exists!" + println "[INFO] ${sdkDir} already exists!" + println "[WARN] Please delete ${cacheName} and ${sdkDir} " + + "if you want to UPDATE ${sdkName} c++ lib. Then, rebuild this sdk." } } }