From fccd8a73ccdb92ec1211c520c34eae5d1359f8a9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 17 Mar 2017 20:11:55 +0200 Subject: [PATCH] Fix work with SonarQube. --HG-- branch : develop --- .travis.yml | 4 +-- sonar-project.properties | 59 +--------------------------------------- 2 files changed, 3 insertions(+), 60 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba4cd6a61..fb3037624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,11 +62,11 @@ script: - $CXX --version - | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - build-wrapper-linux-x86-64 --out-dir bw-outputs make -j$(nproc); + build-wrapper-linux-x86-64 --out-dir ../bw-outputs make -j$(nproc); export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$TRAVIS_BUILD_DIR/build/src/libs/vpropertyexplorer/bin:$TRAVIS_BUILD_DIR/build/src/libs/qmuparser/bin"; xvfb-run -a make --silent check TESTARGS="-silent"; cd ..; - sonar-scanner -X; + sonar-scanner; else make -j1; fi diff --git a/sonar-project.properties b/sonar-project.properties index 24e58fcec..12f4fb459 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -19,61 +19,4 @@ sonar.exclusions=**/ui_*.h # The build-wrapper output dir sonar.cfamily.build-wrapper-output=bw-outputs -# List of the module identifiers -sonar.modules=module1,module2,module3,module4,module5,module6,module7,module8,module9,module10,module11,module12,module13,module14 - -module1.sonar.projectName=Valentina app -module1.sonar.projectBaseDir=src/app/valentina -module1.sonar.sources=. - -module2.sonar.projectName=Tape app -module2.sonar.projectBaseDir=src/app/tape -module2.sonar.sources=. - -module3.sonar.projectName=Fervor static library -module3.sonar.projectBaseDir=src/libs/fervor -module3.sonar.sources=. - -module4.sonar.projectName=QMuparser - math parser library -module4.sonar.projectBaseDir=src/libs/qmuparser -module4.sonar.sources=. - -module5.sonar.projectName=VDXF static library -module5.sonar.projectBaseDir=src/libs/vdxf -module5.sonar.sources=. - -module6.sonar.projectName=VFormat static library -module6.sonar.projectBaseDir=src/libs/vformat -module6.sonar.sources=. - -module7.sonar.projectName=VGeometry static library -module7.sonar.projectBaseDir=src/libs/vgeometry -module7.sonar.sources=. - -module8.sonar.projectName=VLayout static library -module8.sonar.projectBaseDir=src/libs/vlayout -module8.sonar.sources=. - -module9.sonar.projectName=VMisc static library -module9.sonar.projectBaseDir=src/libs/vmisc -module9.sonar.sources=. - -module10.sonar.projectName=VObj static library -module10.sonar.projectBaseDir=src/libs/vobj -module10.sonar.sources=. - -module11.sonar.projectName=VPatternDB static library -module11.sonar.projectBaseDir=src/libs/vpatterndb -module11.sonar.sources=. - -module12.sonar.projectName=VPropertyExplorer - property explorer library -module12.sonar.projectBaseDir=src/libs/vpropertyexplorer -module12.sonar.sources=. - -module13.sonar.projectName=VTools static library -module13.sonar.projectBaseDir=src/libs/vtools -module13.sonar.sources=. - -module14.sonar.projectName=VWidgets static library -module14.sonar.projectBaseDir=src/libs/vwidgets -module14.sonar.sources=. +sonar.sources=src