huangxiao 2 주 전
부모
커밋
876897ca67

+ 20 - 0
ci-cd/bin/linux/envCheck.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# 环境变量检查
+
+# Java Home
+if [ -z "$javaHome" ]; then
+    echo "错误: javaHome环境变量未设置"
+    exit 1
+fi
+
+# Maven Home
+if [ -z "$mavenHome" ]; then
+    echo "错误: mavenHome环境变量未设置"
+    exit 1
+fi
+
+# Maven Settings
+if [ -z "$settings" ]; then
+    echo "错误: settings环境变量未设置"
+    exit 1
+fi

+ 0 - 13
ci-cd/bin/linux/javacBuild.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-. ./env.sh
-# 配置文件路径
-export config=$1
-# 执行的规则
-export china=$2
-
-echo Build
-$javaHome/bin/javac -Xlint:deprecation -d $target -encoding UTF-8 $project/tool/tool-ci-cd/src/main/java/JavaSourceCompiler.java $project/tool/tool-ci-cd/src/main/java/Build.java
-
-echo Run
-$javaHome/bin/java -Dfile.encoding=UTF-8 -cp $target Build

+ 0 - 10
ci-cd/bin/linux/jshellBuild.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. ./env.sh
-# 配置文件路径
-export config=$1
-# 执行的规则
-export china=$2
-
-echo Run
-$javaHome/bin/jshell -s < ../Build.jsh

+ 4 - 0
ci-cd/bin/linux/maven.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+. $(dirname $(realpath "${BASH_SOURCE[0]}"))/envCheck.sh || exit $?
+
+$javaHome/bin/java -Dfile.encoding=UTF-8 -Dmaven.multiModuleProjectDirectory=. -Dmaven.home=$mavenHome -Dclassworlds.conf="${mavenHome}/bin/m2.conf" -cp "${mavenHome}/boot/*" org.codehaus.classworlds.Launcher -s $settings "$@"

+ 6 - 0
ci-cd/bin/linux/mavenCompileAndExecJava.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo ----- Build -----
+$(dirname $(realpath "${BASH_SOURCE[0]}"))/maven.sh -q -f $1 -DskipTests=true compile
+$(dirname $(realpath "${BASH_SOURCE[0]}"))/mavenExecJava.sh $@
+$(dirname $(realpath "${BASH_SOURCE[0]}"))/maven.sh -q -f $1 -DskipTests=true clean

+ 1 - 3
ci-cd/bin/linux/mavenDownloadJar.sh

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-. ./env.sh
-
-$javaHome/bin/java -Dfile.encoding=UTF-8 -Dmaven.multiModuleProjectDirectory=. -Dmaven.repo.local=$maven -Dmaven.home=$mavenHome -Dclassworlds.conf="${mavenHome}/bin/m2.conf" -cp "${mavenHome}/boot/*" org.codehaus.classworlds.Launcher -s $settings dependency:get -DgroupId=$1 -DartifactId=$2 -Dversion=$3
+$(dirname $(realpath "${BASH_SOURCE[0]}"))/maven.sh -q dependency:get -DgroupId=$1 -DartifactId=$2 -Dversion=$3

+ 5 - 0
ci-cd/bin/linux/mavenExecJava.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo ----- Start -----
+$(dirname $(realpath "${BASH_SOURCE[0]}"))/maven.sh -q -f $1 -DskipTests=true exec:java -Dexec.mainClass="$2" -Dexec.args="$3 $4 $5 $6 $7 $8 $9"
+echo ----- End   -----

+ 0 - 3
ci-cd/build/env_dev/env.bat

@@ -9,8 +9,5 @@ set mavenHome=D:/Professional/maven/apache-maven-3.8.4
 :: Maven Settings
 set settings=%~dp0settings.xml
 
-:: 当前路径
-set "THIS_BAT_PATH=%~dp0"
-
 :: CI-CD的路径
 set CI_CD_PATH=%~dp0..\..\