Merge pull request #8322 from hvitved/csharp/remove-odasa-legacy

C#: Remove legacy `odasa` support

Author: hvitved

csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs

@@ -240,7 +240,7 @@ private static CommandBuilder GetRestoreCommand(IBuildActions actions, string? d
         private static BuildScript GetBuildScript(Autobuilder builder, string? dotNetPath, IDictionary<string, string>? environment, string projOrSln)
         {
             var build = new CommandBuilder(builder.Actions, null, environment);
-            var script = builder.MaybeIndex(build, DotNetCommand(builder.Actions, dotNetPath)).
+            var script = build.RunCommand(DotNetCommand(builder.Actions, dotNetPath)).
                 Argument("build").
                 Argument("--no-incremental");
 

csharp/autobuilder/Semmle.Autobuild.CSharp/DotNetRule.cs

@@ -17,10 +17,6 @@ BuildScript GetCommand(string? solution)
                 {
                     standalone = builder.Actions.PathCombine(builder.CodeQLExtractorLangRoot, "tools", builder.CodeQlPlatform, "Semmle.Extraction.CSharp.Standalone");
                 }
-                else if (builder.SemmlePlatformTools is not null)
-                {
-                    standalone = builder.Actions.PathCombine(builder.SemmlePlatformTools, "csharp", "Semmle.Extraction.CSharp.Standalone");
-                }
                 else
                 {
                     return BuildScript.Failure;

csharp/autobuilder/Semmle.Autobuild.CSharp/StandaloneBuildRule.cs

@@ -190,19 +190,15 @@ protected Autobuilder(IBuildActions actions, AutobuildOptions options)
             });
 
             CodeQLExtractorLangRoot = Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_ROOT");
-            SemmlePlatformTools = Actions.GetEnvironmentVariable("SEMMLE_PLATFORM_TOOLS");
-
             CodeQlPlatform = Actions.GetEnvironmentVariable("CODEQL_PLATFORM");
 
             TrapDir =
                 Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR") ??
-                Actions.GetEnvironmentVariable("TRAP_FOLDER") ??
-                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR or TRAP_FOLDER has not been set.");
+                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR has not been set.");
 
             SourceArchiveDir =
                 Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR") ??
-                Actions.GetEnvironmentVariable("SOURCE_ARCHIVE") ??
-                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR or SOURCE_ARCHIVE has not been set.");
+                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_SOURCE_ARCHIVE_DIR has not been set.");
         }
 
         protected string TrapDir { get; }
@@ -264,34 +260,9 @@ protected BuildScript AutobuildFailure() =>
         /// </summary>
         public string? CodeQLExtractorLangRoot { get; }
 
-        /// <summary>
-        /// Value of SEMMLE_PLATFORM_TOOLS environment variable.
-        /// </summary>
-        public string? SemmlePlatformTools { get; }
-
         /// <summary>
         /// Value of CODEQL_PLATFORM environment variable.
         /// </summary>
         public string? CodeQlPlatform { get; }
-
-        /// <summary>
-        /// The absolute path of the odasa executable.
-        /// null if we are running in CodeQL.
-        /// </summary>
-        public string? Odasa
-        {
-            get
-            {
-                var semmleDist = Actions.GetEnvironmentVariable("SEMMLE_DIST");
-                return semmleDist is null ? null : Actions.PathCombine(semmleDist, "tools", "odasa");
-            }
-        }
-
-        /// <summary>
-        /// Construct a command that executed the given <paramref name="cmd"/> wrapped in
-        /// an <code>odasa --index</code>, unless indexing has been disabled, in which case
-        /// <paramref name="cmd"/> is run directly.
-        /// </summary>
-        public CommandBuilder MaybeIndex(CommandBuilder builder, string cmd) => Odasa is null ? builder.RunCommand(cmd) : builder.IndexCommand(Odasa, cmd);
     }
 }

csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs

@@ -58,7 +58,7 @@ public BuildScript Analyse(Autobuilder builder, bool auto)
                 if (vsTools is not null)
                     command.CallBatFile(vsTools.Path);
 
-                builder.MaybeIndex(command, scriptPath);
+                command.RunCommand(scriptPath);
                 return command.Script;
             });
         }

csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandAutoRule.cs

@@ -26,7 +26,7 @@ public BuildScript Analyse(Autobuilder builder, bool auto)
                     var vsTools = MsBuildRule.GetVcVarsBatFile(builder);
                     if (vsTools is not null)
                         command.CallBatFile(vsTools.Path);
-                    builder.MaybeIndex(command, builder.Options.BuildCommand);
+                    command.RunCommand(builder.Options.BuildCommand);
 
                     return command.Script;
                 });

csharp/autobuilder/Semmle.Autobuild.Shared/BuildCommandRule.cs

@@ -70,7 +70,7 @@ public BuildCommand(string exe, string? argumentsOpt, bool silent, string? worki
                 this.environment = environment;
             }
 
-            public override string ToString() => exe + " " + arguments;
+            public override string ToString() => arguments.Length > 0 ? exe + " " + arguments : exe;
 
             public override int Run(IBuildActions actions, Action<string, bool> startCallback, Action<int, string, bool> exitCallBack)
             {

csharp/autobuilder/Semmle.Autobuild.Shared/BuildScript.cs

@@ -45,11 +45,6 @@ public CommandBuilder(IBuildActions actions, string? workingDirectory = null, ID
             this.silent = silent;
         }
 
-        private void OdasaIndex(string odasa)
-        {
-            RunCommand(odasa, "index --auto");
-        }
-
         public CommandBuilder CallBatFile(string batFile, string? argumentsOpt = null)
         {
             NextCommand();
@@ -59,21 +54,6 @@ public CommandBuilder CallBatFile(string batFile, string? argumentsOpt = null)
             return this;
         }
 
-        /// <summary>
-        /// Perform odasa index on a given command or BAT file.
-        /// </summary>
-        /// <param name="odasa">The odasa executable.</param>
-        /// <param name="command">The command to run.</param>
-        /// <param name="argumentsOpt">Additional arguments.</param>
-        /// <returns>this for chaining calls.</returns>
-        public CommandBuilder IndexCommand(string odasa, string command, string? argumentsOpt = null)
-        {
-            OdasaIndex(odasa);
-            QuoteArgument(command);
-            Argument(argumentsOpt);
-            return this;
-        }
-
         private static readonly char[] specialChars = { ' ', '\t', '\n', '\v', '\"' };
         private static readonly char[] cmdMetacharacter = { '(', ')', '%', '!', '^', '\"', '<', '>', '&', '|' };
 

csharp/autobuilder/Semmle.Autobuild.Shared/CommandBuilder.cs

@@ -95,7 +95,7 @@ BuildScript GetNugetRestoreScript() =>
                     command.RunCommand("set Platform=&& type NUL", quoteExe: false);
                 }
 
-                builder.MaybeIndex(command, msBuild);
+                command.RunCommand(msBuild);
                 command.QuoteArgument(projectOrSolution.FullPath);
 
                 command.Argument("/p:UseSharedCompilation=false");