diff --git a/SConstruct b/SConstruct index aa53139..bd9986d 100644 --- a/SConstruct +++ b/SConstruct @@ -5,4 +5,4 @@ env = SConscript('external/scons-plus-plus/SConscript', exports = ['config']) env.Append(CPPPATH = [Dir('private'), Dir('public')]) # 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 = '.') diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 058b591..7f6d136 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -20,6 +20,16 @@ pipeline { 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') { when { expression { params.RUN_TESTS } diff --git a/build/scripts/clang-tidy.sh b/build/scripts/clang-tidy.sh index 4560c70..cb95eb9 100644 --- a/build/scripts/clang-tidy.sh +++ b/build/scripts/clang-tidy.sh @@ -6,9 +6,6 @@ if [ ! -f ".clang-tidy" ] ; then exit 1 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 find private -name "*.cpp" > "cache/jenkins/clang-tidy-files" diff --git a/private/app/SConscript b/private/spp_template/SConscript similarity index 82% rename from private/app/SConscript rename to private/spp_template/SConscript index 0547c2b..b85dbb8 100644 --- a/private/app/SConscript +++ b/private/spp_template/SConscript @@ -9,7 +9,7 @@ src_files = Split(""" """) prog_app = env.UnityProgram( - target = env['BIN_DIR'] + '/app', + target = env['BIN_DIR'] + '/spp_template', source = src_files, dependencies = [lib_mijin] ) diff --git a/private/app/main.cpp b/private/spp_template/main.cpp similarity index 100% rename from private/app/main.cpp rename to private/spp_template/main.cpp