diff --git a/.gitlab-ci-filelist.sh b/.gitlab-ci-filelist.sh index b261273fdc20c2ad3be0f88516bddd1c40479f23..f28f73194aeedb63efe6d0b055a27e45ea3e19f4 100755 --- a/.gitlab-ci-filelist.sh +++ b/.gitlab-ci-filelist.sh @@ -6,8 +6,6 @@ then fi BUILDDIR=${BUILDDIR-=build} -SRCDIR_TO_ANALYZE="$BUILDDIR include src tests" - echo $PWD rm -f filelist.txt @@ -17,7 +15,7 @@ find $BUILDDIR -name '*\.[ch]' >> filelist.txt #echo "wrappers/python/examples/pypastix/enum.py" >> filelist.txt # Remove all CMakeFiles generated file -#sed -i '/CMakeFiles/d' filelist.txt +sed -i '/CMakeFiles/d' filelist.txt # Remove installed files sed -i '/^install.*/d' filelist.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index cd0ad071cc8e6f4ea8e354f6a985221a420a3c0d..8f565e9bad9b622c8d74bdabd91ff47a368ce704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,8 +69,8 @@ include(GenSPMPkgConfig) include(AddSourceFiles) # The current version number -set (SPM_VERSION_MAJOR 0) -set (SPM_VERSION_MINOR 1) +set (SPM_VERSION_MAJOR 1) +set (SPM_VERSION_MINOR 0) set (SPM_VERSION_MICRO 0) set( SPM_VERSION "${SPM_VERSION_MAJOR}.${SPM_VERSION_MINOR}.${SPM_VERSION_MICRO}" ) diff --git a/tools/analysis.sh b/tools/analysis.sh index 78db99d4f14da623d79054ab0e821eb37c5ef3ef..0ec0039d64e1a5c75312033add6de7c08da777a8 100755 --- a/tools/analysis.sh +++ b/tools/analysis.sh @@ -23,7 +23,6 @@ lcov_cobertura.py spm.lcov --output spm-coverage.xml # Undefine this because not relevant in our configuration export UNDEFINITIONS="-UWIN32 -UWIN64 -U_MSC_EXTENSIONS -U_MSC_VER -U__SUNPRO_C -U__SUNPRO_CC -U__sun -Usun -U__cplusplus" -export UNDEFINITIONS="$UNDEFINITIONS -UPARSEC_PROF_DRY_BODY -UPARSEC_PROF_TRACE -UPARSEC_PROF_GRAPHER -UPARSEC_SIM -UPARSEC_DEBUG_NOISIER -DPINS_ENABLE" # to get it displayed and captured by gitlab to expose the badge on the main page cat ./spm-gcov.log @@ -52,7 +51,7 @@ sonar.projectDescription=Parallel Sparse direct Solver sonar.projectVersion=master sonar.language=c -sonar.sources=$BUILDDIR, include, src, tests +sonar.sources=$BUILDDIR/src, $BUILDDIR/tests, include, src, tests sonar.inclusions=`cat filelist.txt | xargs echo | sed 's/ /, /g'` sonar.sourceEncoding=UTF-8 sonar.c.errorRecoveryEnabled=true