Renamed app to spp_template and updated build scripts.

This commit is contained in:
Patrick 2024-04-10 19:33:13 +02:00
parent 6a325e7a2c
commit 906a68bffa
5 changed files with 12 additions and 5 deletions

View File

@ -5,4 +5,4 @@ env = SConscript('external/scons-plus-plus/SConscript', exports = ['config'])
env.Append(CPPPATH = [Dir('private'), Dir('public')]) env.Append(CPPPATH = [Dir('private'), Dir('public')])
# app # app
env = SConscript('private/app/SConscript', exports = 'env', variant_dir = env['VARIANT_DIR'], src_dir = '.') env = SConscript('private/spp_template/SConscript', exports = 'env', variant_dir = env['VARIANT_DIR'], src_dir = '.')

10
build/Jenkinsfile vendored
View File

@ -20,6 +20,16 @@ pipeline {
sh 'rm -rf cache/*' sh 'rm -rf cache/*'
} }
} }
stage('Prepare') {
steps
{
script
{
// generate the compile commands for clang-tidy to work with and update repositories (mijin)
sh 'scons -Q --unity=disable --compiler=clang compile_commands.json --update_repositories'
}
}
}
stage('Clang-Tidy') { stage('Clang-Tidy') {
when { when {
expression { params.RUN_TESTS } expression { params.RUN_TESTS }

View File

@ -6,9 +6,6 @@ if [ ! -f ".clang-tidy" ] ; then
exit 1 exit 1
fi fi
# first generate the compile commands for clang-tidy to work with
scons -Q --unity=disable --compiler=clang compile_commands.json
mkdir -p cache/jenkins mkdir -p cache/jenkins
find private -name "*.cpp" > "cache/jenkins/clang-tidy-files" find private -name "*.cpp" > "cache/jenkins/clang-tidy-files"

View File

@ -9,7 +9,7 @@ src_files = Split("""
""") """)
prog_app = env.UnityProgram( prog_app = env.UnityProgram(
target = env['BIN_DIR'] + '/app', target = env['BIN_DIR'] + '/spp_template',
source = src_files, source = src_files,
dependencies = [lib_mijin] dependencies = [lib_mijin]
) )