From 8bda059b8117593fac19e34cafb41c5d0be76a54 Mon Sep 17 00:00:00 2001
From: Mathieu Suen <mathieu.suen@sonarsource.com>
Date: Tue, 10 Aug 2021 09:19:18 +0200
Subject: [PATCH] SONAR-15104 Add cfamily info for Azure and Manual tutorial

---
 .../components/tutorials/azure-pipelines/commands/ClangGCC.tsx | 2 ++
 .../commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap    | 3 +++
 .../components/tutorials/manual/commands/ClangGCCCommand.tsx   | 2 ++
 .../__tests__/__snapshots__/CLangGCCCommand-test.tsx.snap      | 1 +
 sonar-core/src/main/resources/org/sonar/l10n/core.properties   | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx
index 1baf28d923c..41b5e9bdf97 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx
@@ -22,6 +22,7 @@ import * as React from 'react';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import { getHostUrl } from 'sonar-ui-common/helpers/urls';
 import CodeSnippet from '../../../common/CodeSnippet';
+import { CompilationInfo } from '../../components/CompilationInfo';
 import RenderOptions from '../../components/RenderOptions';
 import SentenceWithHighlights from '../../components/SentenceWithHighlights';
 import { BuildTools, OSs } from '../../types';
@@ -146,6 +147,7 @@ unzip build-wrapper.zip`,
                   highlightKeys={['build_wrapper']}
                 />
                 <CodeSnippet snippet={codeSnippetDownload[os].scriptBuild} />
+                <CompilationInfo />
               </li>
             </ul>
             <li>
diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap
index 24e43f76355..09b4ed03122 100644
--- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap
@@ -97,6 +97,7 @@ unzip build-wrapper.zip"
         <CodeSnippet
           snippet="./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make clean all"
         />
+        <CompilationInfo />
       </li>
     </ul>
     <li>
@@ -213,6 +214,7 @@ unzip build-wrapper.zip"
         <CodeSnippet
           snippet="./build-wrapper-macos-x86/build-wrapper-macos-x86 --out-dir bw-output xcodebuild -project myproject.xcodeproj -configuration Release clean build"
         />
+        <CompilationInfo />
       </li>
     </ul>
     <li>
@@ -329,6 +331,7 @@ Expand-Archive -Path 'build-wrapper.zip' -DestinationPath '.'"
         <CodeSnippet
           snippet="build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir bw-output MSBuild.exe /t:Rebuild"
         />
+        <CompilationInfo />
       </li>
     </ul>
     <li>
diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ClangGCCCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ClangGCCCommand.tsx
index a49fed27b0d..19cba151e1b 100644
--- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ClangGCCCommand.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ClangGCCCommand.tsx
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
+import { CompilationInfo } from '../../components/CompilationInfo';
 import { OSs } from '../../types';
 import DownloadBuildWrapper from './DownloadBuildWrapper';
 import DownloadScanner from './DownloadScanner';
@@ -39,6 +40,7 @@ export default function ClangGCCCustom(props: ClangGCCCustomProps) {
       <DownloadBuildWrapper os={os} />
       <DownloadScanner os={os} />
       <ExecBuildWrapper os={os} />
+      <CompilationInfo />
       <ExecScanner host={host} component={component} os={os} token={token} cfamily={true} />
     </div>
   );
diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/CLangGCCCommand-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/CLangGCCCommand-test.tsx.snap
index b4cb5128d1b..4e542d9dd0a 100644
--- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/CLangGCCCommand-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/CLangGCCCommand-test.tsx.snap
@@ -11,6 +11,7 @@ exports[`should render correctly 1`] = `
   <ExecBuildWrapper
     os="linux"
   />
+  <CompilationInfo />
   <ExecScanner
     cfamily={true}
     component={
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 859905b76d5..f9ea058a2a3 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3491,7 +3491,7 @@ onboarding.tutorial.ci_outro.refresh=This page will then refresh with your analy
 onboarding.tutorial.ci_outro.refresh.why=If the page doesn't refresh after a while, please double-check the analysis configuration, and check your logs.
 onboarding.tutorial.ci_outro.waiting_for_fist_analysis=Waiting for the first analysis to come in...
 onboarding.tutorial.other.project_key.sentence=Create a {file} file in your repository and paste the following code:
-onboarding.tutorial.cfamilly.compilation_database_info=If you have trouble using the build wrapper, you can try using a {link}
+onboarding.tutorial.cfamilly.compilation_database_info=If you have trouble using the build wrapper, you can try using a {link}.
 onboarding.tutorial.cfamilly.compilation_database_info.link=compilation database
 onboarding.tutorial.cfamilly.speed_caching=You can also speed up your analysis by enabling {link}.
 onboarding.tutorial.cfamilly.speed_caching.link=multi-threading and caching
-- 
2.39.5