Change cmake option from string to array

Author: ladisgin

server/proto/testgen.proto

@@ -219,7 +219,7 @@ enum ProjectConfigStatus {
 message ProjectConfigRequest {
     ProjectContext projectContext = 1;
     ConfigMode configMode = 2;
-    string cmakeOptions = 3;
+    repeated string cmakeOptions = 3;
 }
 
 message ProjectConfigResponse {

server/src/Server.cpp

@@ -605,9 +605,11 @@ Server::TestsGenServiceImpl::ConfigureProject(ServerContext *context,
         return UserProjectConfiguration::CheckProjectConfiguration(buildDirPath, writer);
     case ConfigMode::CREATE_BUILD_DIR:
         return UserProjectConfiguration::RunBuildDirectoryCreation(buildDirPath, writer);
-    case ConfigMode::GENERATE_JSON_FILES:
+    case ConfigMode::GENERATE_JSON_FILES: {
+        std::vector<string> cmakeOptions(request->cmakeoptions().begin(), request->cmakeoptions().end());
         return UserProjectConfiguration::RunProjectConfigurationCommands(
-            buildDirPath, projectContext.projectname(), request->cmakeoptions(), writer);
+                buildDirPath, projectContext.projectname(), cmakeOptions, writer);
+    }
     default:
         return Status(StatusCode::CANCELLED, "Invalid request type.");
     }

server/src/building/UserProjectConfiguration.cpp

@@ -46,12 +46,12 @@ Status UserProjectConfiguration::RunBuildDirectoryCreation(const fs::path &build
 Status
 UserProjectConfiguration::RunProjectConfigurationCommands(const fs::path &buildDirPath,
                                                           const string &projectName,
-                                                          const string &cmakeOptions,
+                                                          vector<string> cmakeOptions,
                                                           ProjectConfigWriter const &writer) {
     try {
         fs::path bearShPath = createBearShScript(buildDirPath);
-
-        ShellExecTask::ExecutionParameters cmakeParams(Paths::getCMake(), {cmakeOptions, ".."});
+        cmakeOptions.emplace_back("..");
+        ShellExecTask::ExecutionParameters cmakeParams(Paths::getCMake(), cmakeOptions);
         ShellExecTask::ExecutionParameters bearMakeParams(Paths::getBear(), {Paths::getMake(), MakefileUtils::threadFlag()});
 
 

server/src/building/UserProjectConfiguration.h

@@ -28,7 +28,7 @@ class UserProjectConfiguration {
 
     static Status RunProjectConfigurationCommands(const fs::path &buildDirPath,
                                                   const string &projectName,
-                                                  const string &cmakeOptions,
+                                                  vector<string> cmakeOptions,
                                                   ProjectConfigWriter const &writer);
 
 private:

vscode-plugin/media/wizard.html

@@ -110,7 +110,7 @@ <h2>🏗️Build Directory</h2>
         <h2>🎌CMake Options</h2>
         <p>Options passed to CMake command. </p>
         <label class="utbot-form__tab_label" for="cmakeOptions">CMake options</label>
-        <input class="utbot-form__tab_input" id="cmakeOptions" placeholder="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_EXPORT_LINK_COMMANDS=ON">
+        <textarea class="utbot-form__tab_input" id="cmakeOptions" placeholder="{{cmakeOptions}}"></textarea>
 
     </div>
 

vscode-plugin/package.json

@@ -473,8 +473,14 @@
 					"markdownDescription": "%unittestbot.paths.buildDirectory.description%"
 				},
 				"unittestbot.paths.cmakeOptions": {
-					"type": "string",
-					"default": "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_EXPORT_LINK_COMMANDS=ON",
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"default": [
+						"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
+						"-DCMAKE_EXPORT_LINK_COMMANDS=ON"
+					],
 					"markdownDescription": "%unittestbot.paths.cmakeOptions.description%"
 				},
 				"unittestbot.paths.testsDirectory": {

vscode-plugin/src/client/client.ts

@@ -379,7 +379,7 @@ export class Client {
         projectName: string,
         projectPath: string,
         buildDirRelativePath: string,
-        cmakeOptions: string,
+        cmakeOptions: Array<string>,
         configMode: ConfigMode,
         progressKey: utbotUI.ProgressKey,
         token: vs.CancellationToken,
@@ -392,7 +392,7 @@ export class Client {
             const projectConfigRequest = new ProjectConfigRequest();
             projectConfigRequest.setProjectcontext(projectContext);
             projectConfigRequest.setConfigmode(configMode);
-            projectConfigRequest.setCmakeoptions(cmakeOptions);
+            projectConfigRequest.setCmakeoptionsList(cmakeOptions);
             try {
                 const response = this.testsService.configureProject(projectConfigRequest, this.metadata);
                 await this.handleServerResponse(response, progressKey, token, resolve, reject, responseHandler);

vscode-plugin/src/config/defaultValues.ts

@@ -16,6 +16,8 @@ export class DefaultConfigValues {
     public static readonly POSSIBLE_BUILD_DIR_NAMES = ['out', 'build'];
     public static readonly POSSIBLE_TEST_DIR_NAMES = ['test'];
 
+    public static readonly DEFAULT_CMAKE_OPTIONS = ['-DCMAKE_EXPORT_COMPILE_COMMANDS=ON', '-DCMAKE_EXPORT_LINK_COMMANDS=ON'];
+
     public static getDefaultHost(): string {
         let host = Prefs.getGlobalHost();
         const sftHost = vsUtils.getFromSftpConfig("host");

vscode-plugin/src/config/prefs.ts

@@ -201,8 +201,8 @@ export class Prefs {
         return this.getLocalBuildDirPath();
     }
 
-    public static getCmakeOptions(): string {
-        return this.getAsset(Prefs.CMAKE_OPTIONS_PREF);
+    public static getCmakeOptions(): Array<string> {
+        return this.getAssetBase(Prefs.CMAKE_OPTIONS_PREF, defcfg.DefaultConfigValues.DEFAULT_CMAKE_OPTIONS);
     }
 
 
@@ -358,7 +358,8 @@ export class Prefs {
     }
 
     public static async setCmakeOptions(options: string): Promise<void> {
-        await this.setAsset(Prefs.CMAKE_OPTIONS_PREF, options);
+        const cmakeOptions = options.split("\n")
+        await this.setAsset(Prefs.CMAKE_OPTIONS_PREF, cmakeOptions);
     }
 
     public static getBuildDirectory(): string {

vscode-plugin/src/config/projectConfig.ts

@@ -20,7 +20,7 @@ export class ProjectConfig {
     private readonly projectName: string;
     private readonly projectPath: string;
     private readonly buildDirRelativePath: string;
-    private readonly cmakeOptions: string;
+    private readonly cmakeOptions: Array<string>;
 
     constructor(private readonly client: Client) {
         this.projectName = Prefs.getProjectName();

vscode-plugin/src/wizard/wizard.ts

@@ -191,6 +191,7 @@ export class UtbotWizardPanel {
             .setPredictedRemotePath(defcfg.DefaultConfigValues.getDefaultRemotePath())
             .setPredictedBuildDirectory(predictedBuildDirectory)
             .setPlatform(os.platform())
+            .setCmakeOptions(defcfg.DefaultConfigValues.DEFAULT_CMAKE_OPTIONS)
             .build();
     }
 }

vscode-plugin/src/wizard/wizardHtmlBuilder.ts

@@ -68,5 +68,9 @@ export class WizardHtmlBuilder {
         this.content = this.content.replace('{{os}}', platform);
         return this;
     }
+    public setCmakeOptions(cmakeOptions: Array<string>): WizardHtmlBuilder {
+        this.content = this.content.replace('{{cmakeOptions}}', cmakeOptions.join("\n"));
+        return this;
+    }
 
 }