fixes, cleanup

carstene1ns · Dec 3, 2023 · 277b235 · 277b235
1 parent 9f52d0e
commit 277b235
Showing 1 changed file with 12 additions and 28 deletions.
diff --git a/liblcf/Jenkinsfile b/liblcf/Jenkinsfile
@@ -32,9 +32,7 @@ pipeline {
 							dir('lcf') {
 								git url: 'https://github.com/EasyRPG/liblcf.git'
 							}
-							sh """
-								rm -rf build-${PLATFORM}
-							"""
+							sh "rm -rf build-${PLATFORM}"
 						}
 					}
 					stage('Build') {
@@ -54,9 +52,7 @@ pipeline {
 					stage('Install') {
 						steps {
 							echo "Install for ${PLATFORM}"
-							sh """
-								cmake --install build-${PLATFORM} --prefix ${PLATFORM.toLowerCase()}
-							"""
+							sh "cmake --install build-${PLATFORM} --prefix ${PLATFORM.toLowerCase()}"
 						}
 					}
 				}
@@ -69,17 +65,15 @@ pipeline {
 				expression { params.PLATFORM_FILTER == 'Linux' }
 			} }
 			environment {
-				EASYRPG_BUILDSCRIPTS="${WORKSPACE}/../toolchain-linux"
+				EASYRPG_BUILDSCRIPTS="${WORKSPACE}/../toolchain-linux-static"
 			}
 			stages {
 				stage('Prepare') {
 					steps {
 						dir('lcf') {
 							git url: 'https://github.com/EasyRPG/liblcf.git'
 						}
-						sh """
-							rm -rf build-linux
-						"""
+						sh "rm -rf build-linux"
 					}
 				}
 				stage('Build') {
@@ -96,17 +90,13 @@ pipeline {
 				stage('Test') {
 					steps {
 						echo "Test for Linux"
-						sh """
-							cmake --build build-linux --target check
-						"""
+						sh "cmake --build build-linux --target check"
 					}
 				}
 				stage('Install') {
 					steps {
 						echo "Install for Linux"
-						sh """
-							cmake --install build-linux --prefix linux
-						"""
+						sh "cmake --install build-linux --prefix linux"
 					}
 				}
 			}
@@ -136,18 +126,16 @@ pipeline {
 							dir('lcf') {
 								git url: 'https://github.com/EasyRPG/liblcf.git'
 							}
-							bat """
-								if exist "build-${BITS}" rd /S /Q build-${BITS}
-
-								if ${BITS}==32 (SET arg=amd64_x86) else (SET arg=x64)
-								call %VCVARSALL2017% %arg%
-							"""
+							bat "if exist 'build-${BITS}' rd /S /Q 'build-${BITS}'"
 						}
 					}
 					stage('Build') {
 						steps {
 							echo "Build for Windows ${BITS} bit - ${CONFIG}"
 							bat label: 'cmake', script: """
+								if ${BITS}==32 (SET arg=amd64_x86) else (SET arg=x64)
+								call %VCVARSALL2017% %arg%
+
 								if ${CONFIG}==debug (SET type=Debug) else (SET type=RelWithDebInfo)
 								if ${BITS}==32 (SET triplet=x86-windows-static) else (SET triplet=x64-windows-static)
 								cmake . -GNinja -B${CONFIG} -DCMAKE_BUILD_TYPE=%type% ^
@@ -161,17 +149,13 @@ pipeline {
 					stage('Test') {
 						steps {
 							echo "Test for Windows ${BITS} bit - ${CONFIG}"
-							bat """
-								cmake --build ${CONFIG} --target check
-							"""
+							bat "cmake --build ${CONFIG} --target check"
 						}
 					}
 					stage('Install') {
 						steps {
 							echo "Install for Windows ${BITS} bit - ${CONFIG}"
-							bat """
-								cmake --build ${CONFIG} --target install
-							"""
+							bat "cmake --build ${CONFIG} --target install"
 						}
 					}
 				}