From 8c3e156c1f81a9afed932dd87c799b215b20f0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BA=91=E5=BF=97?= Date: Wed, 23 Dec 2020 11:19:18 +0800 Subject: [PATCH] no need --- build-config/build_jar.sh | 31 ------------------ build-config/product-pub.gradle | 24 -------------- build-config/product-third-gui.gradle | 41 ------------------------ build-config/product-third-server.gradle | 33 ------------------- 4 files changed, 129 deletions(-) delete mode 100755 build-config/build_jar.sh delete mode 100644 build-config/product-pub.gradle delete mode 100644 build-config/product-third-gui.gradle delete mode 100644 build-config/product-third-server.gradle diff --git a/build-config/build_jar.sh b/build-config/build_jar.sh deleted file mode 100755 index d109acf0..00000000 --- a/build-config/build_jar.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -#echo " 本脚本参数说明，支持一个参数，当前模块目录" -bootModule=$1 -echo "bootModule is :" $bootModule -# 准备 bootjar 依赖目录 -rm -rf $bootModule/$bootModule-gui/libs $bootModule/$bootModule-server/libs -mkdir -p $bootModule/$bootModule-gui/libs $bootModule/$bootModule-server/libs - -# 编译各个模块 -for dir in $(ls .) -do - if [[ -d $dir && -f $dir/build.gradle && $dir != 'build-config' && $dir != $bootModule ]] ; then - - # 清理 - if [[ -d $dir/$dir-pub ]] ; then rm -rf $dir/$dir-pub/build ;fi - if [[ -d $dir/$dir-gui ]] ; then rm -rf $dir/$dir-gui/build ;fi - if [[ -d $dir/$dir-server ]] ; then rm -rf $dir/$dir-server/build ;fi - rm -rf $dir/.gradle $dir/.idea - echo "gradle home is =" $PATH - $GRADLE_HOME/bin/gradle $gradleArgs --daemon --parallel -x test -DbuildProduct=true -b $dir/build.gradle jar --s - - # 拷贝gui server公用jar到对应的目录。 - if [[ -d $dir/$dir-pub ]] ; then echo $bootModule/$bootModule-gui/libs/ $bootModule/$bootModule-server/libs | xargs -n 1 cp -f $dir/$dir-pub/build/libs/*.jar ;fi - if [[ -d $dir/$dir-gui ]] ; then cp -f $dir/$dir-gui/build/libs/*.jar $bootModule/$bootModule-gui/libs;fi - if [[ -d $dir/$dir-server ]] ; then cp -f $dir/$dir-server/build/libs/*.jar $bootModule/$bootModule-server/libs;fi - - if [ 0 -ne $? ] ; then echo "$dir build failed, please check the error log! "; exit 1 ; fi - echo -e "\033[32m----------------- $dir 模块编译成功 ---------------------- \033[0m" - fi -done -echo "BUILD SUCCESSFUL " `date` diff --git a/build-config/product-pub.gradle b/build-config/product-pub.gradle deleted file mode 100644 index 656108bf..00000000 --- a/build-config/product-pub.gradle +++ /dev/null @@ -1,24 +0,0 @@ -import org.codehaus.groovy.runtime.GStringImpl - -//共享的非业务功能模块，禁止将其它业务功能模块添加进来 -// 该产品 gui 和 appServer都需要的依赖 -ext { - gridntBase = "${devVersion}" as GStringImpl -// gridntBase = "2.1.0" - svgshowVersion = "2.1.0" - protectVersion = "2.1.1" - mybatisPlus = "3.2.0" - debugProduct = System.getProperty("debugProduct") ?: false -} -dependencies { - //-------网聪 开发中的模块---------------------------------------------------------------------------------------- - implementation "com.gridnt:gridnt-base-pub:${gridntBase}" - - //-------网聪正式发布的共享模块------------------------------------------------------------------------------------- - - - //-------第三依赖 ----------------------------------------------------------------------- - implementation "org.springframework.boot:spring-boot-starter-logging:${springBoot}" - -} - diff --git a/build-config/product-third-gui.gradle b/build-config/product-third-gui.gradle deleted file mode 100644 index 097d443a..00000000 --- a/build-config/product-third-gui.gradle +++ /dev/null @@ -1,41 +0,0 @@ -apply plugin: "org.openjfx.javafxplugin" -//apply plugin: "com.github.ayltai.spring-graalvm-native-plugin" -javafx { - version = "11.0.2" -// version = "15.0.1" - modules = ["javafx.base", "javafx.controls", "javafx.fxml", "javafx.graphics", "javafx.media" - , "javafx.swing", "javafx.web" - ] -} - - -//共享的功能模块 -dependencies { - //------- 一、网聪 开发中的模块---------------------------------------------------------------------------------------- - - implementation "com.gridnt:gridnt-base-gui:${gridntBase}" - - //------- 1.1 网聪产品间共享的业务功能模块------------------------------------------------------------------------------ - if (debugProduct) { - // 构建产品，产品全功能运行 - compile fileTree(dir: "libs", include: ["*.jar"]) - - } - - - //------- 二、网聪正式发布工具类 共享模块-------------------------------------------------------------------------------- - - implementation "com.gridnt:springboot-javafx-support:${devVersion}" - - - //-------独有的第三依赖------------------------------------------------------------------------------------------- - implementation "org.yaml:snakeyaml:1.27" - - //---------- 测试 --------------------------------------------------------------------------------------------- - - testCompile "org.springframework.boot:spring-boot-starter-test:${springBoot}" - - //-------runtime----------------------------------------------------------------------------------------------- - testCompile "org.springframework.boot:spring-boot-devtools:${springBoot}" - -} \ No newline at end of file diff --git a/build-config/product-third-server.gradle b/build-config/product-third-server.gradle deleted file mode 100644 index d0346ab7..00000000 --- a/build-config/product-third-server.gradle +++ /dev/null @@ -1,33 +0,0 @@ -ext { - mybatisPlus = "3.4.1" -} - -dependencies { - - //------- 一、网聪 开发中的模块---------------------------------------------------------------------------------------- - - implementation "com.gridnt:gridnt-base-server:${gridntBase}" - - //------- 1.1 网聪产品间共享的业务功能模块--------------------------------------------------------------- - if (debugProduct) { - // 构建产品，产品全功能运行 - compile fileTree(dir: "libs", include: ["*.jar"]) - - - } - - //------- 二、网聪正式发布工具类 共享模块-------------------------------------------------------------------------------- - - - //-------产品独有的第三依赖------------------------------------------------------------------------------------------- - - implementation "org.springframework.boot:spring-boot-starter-data-redis:${springBoot}" - implementation "com.fasterxml.jackson.core:jackson-databind:2.12.0" - - //-------runtime----------------------------------------------------------------------------------------------- - - //---------- 测试 --------------------------------------------------------------------------------------------- - testCompile "org.springframework.boot:spring-boot-starter-test:${springBoot}" - - -} \ No newline at end of file