From 519d4866ab93149aff725ff977eb2ce49dc24bf0 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Thu, 21 Apr 2022 00:50:40 +0800 Subject: [PATCH] feat: grep jars within cp --- README.md | 5 ++- backend/build.gradle | 32 +++++++++--------- backend/buildlibs/simple-ypk-packer-0.3.0.jar | Bin 0 -> 6445 bytes backend/grepcp.list | 3 ++ 4 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 backend/buildlibs/simple-ypk-packer-0.3.0.jar create mode 100644 backend/grepcp.list diff --git a/README.md b/README.md index 7fcf942..aeefeb6 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,12 @@ #### 介绍 idea开发合约的示例。 -#### 软件架构 -软件架构说明 - #### 配置cp 的lib 做一个软链接，将cp-bundle的build/output 软链接到 backend/cplibs。 +#### 配置grepcp.list +用于手动指定不打包的jar。 格式为每行一个jar名。 #### 前端sdk说明 diff --git a/backend/build.gradle b/backend/build.gradle index ac97704..4630380 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -1,9 +1,8 @@ buildscript { dependencies { - classpath files("buildlibs/simpleypkpacker.jar") + classpath files("buildlibs/simple-ypk-packer-0.3.0.jar") } } - plugins { id 'java' id 'java-library' @@ -34,8 +33,8 @@ sourceSets { } dependencies { - api 'org.apache.logging.log4j:log4j-core:2.14.1' - api 'org.apache.logging.log4j:log4j-api:2.14.1' + api 'org.apache.logging.log4j:log4j-core:2.17.2' + api 'org.apache.logging.log4j:log4j-api:2.17.2' implementation fileTree(dir: 'cplibs', include: '*.jar') implementation fileTree(dir: 'cplibs/lib/', include: '*.jar') testImplementation 'junit:junit:4.13.2' @@ -59,24 +58,25 @@ task copyAssets(type: Copy) { from "../front" into "./build/output/assets/" } -task mergeJar(dependsOn: ["sourcesJar", "jar"]) { - doLast { - org.bdware.datanet.YPKPacker.mergeJar("./backend/build/libs/$project.name-${project.version}.jar", - "./backend/build/libs/$project.name-${project.version}-sources.jar", - "./backend/build/libs/$project.name-${project.version}-all.jar") - } -} -task copyJar(type: Copy, dependsOn: ["mergeJar", ":backend:copyLibs"]) { - from "./build/libs/$project.name-${project.version}-all.jar" +task copyJar(type: Copy, dependsOn: [":backend:jar", ":backend:copyLibs"]) { + from "./build/libs/$project.name-${project.version}.jar" into "./build/output" rename { String fileName -> "sc-example.jar" } doFirst { println "copyJar start" } } +def reltivePath = "./backend" +//reltivePath="." +def currVersion = "0.1.0" +task grepCP (dependsOn:["copyJar"]){ + doLast { + org.bdware.datanet.YPKPacker.grepCPLibWithFilter("${reltivePath}/cplibs/libs","${reltivePath}/build/output/libs","${reltivePath}/grepcp.list") + } +} -task buildZip(type: Zip, dependsOn: ["copyAssets", "copyJar", "copyYJS"]) { +task buildZip(type: Zip, dependsOn: ["copyAssets", "copyJar", "copyYJS","grepCP"]) { from './build/output/' duplicatesStrategy = DuplicatesStrategy.INCLUDE archiveFileName = 'contractexample.zip' @@ -85,6 +85,6 @@ task buildZip(type: Zip, dependsOn: ["copyAssets", "copyJar", "copyYJS"]) { task buildYPK(dependsOn: ["buildZip"]) { doLast { - org.bdware.datanet.YPKPacker.staticPack("./backend/build/contractexample.zip", "./backend/build/contractexample.ypk") + org.bdware.datanet.YPKPacker.staticPack("${reltivePath}/build/contractexample.zip", "${reltivePath}/build/contractexample-${currVersion}.ypk") } -} +} \ No newline at end of file diff --git a/backend/buildlibs/simple-ypk-packer-0.3.0.jar b/backend/buildlibs/simple-ypk-packer-0.3.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..ea9fb086814c55d106f12f1833fb0dc6d572b94f GIT binary patch literal 6445 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 KU*bq~|Lb34Lq$FS literal 0 HcmV?d00001 diff --git a/backend/grepcp.list b/backend/grepcp.list new file mode 100644 index 0000000..2a31198 --- /dev/null +++ b/backend/grepcp.list @@ -0,0 +1,3 @@ +log4j-core-2.14.1.jar +log4j-api-2.14.1.jar +yjs.jar \ No newline at end of file