Merge pull request #4011 from hvitved/csharp/asp-extraction-pre-finalize

C#: Move ASP extraction from auto builder to `pre-finalize.{sh,cmd}`

Author: hvitved

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

@@ -85,10 +85,7 @@ BuildScript IntermediateAttempt(BuildScript s) =>
                     break;
             }
 
-            return
-                attempt &
-                (() => new AspBuildRule().Analyse(this, false)) &
-                (() => new XmlBuildRule().Analyse(this, false));
+            return attempt;
         }
 
         /// <summary>

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

@@ -29,7 +29,6 @@ public class AutobuildOptions
         public readonly bool NugetRestore;
 
         public readonly Language Language;
-        public readonly bool Indexing;
 
         /// <summary>
         /// Reads options from environment variables.
@@ -54,8 +53,6 @@ public AutobuildOptions(IBuildActions actions, Language language)
             NugetRestore = actions.GetEnvironmentVariable(prefix + "NUGET_RESTORE").AsBool("nuget_restore", true);
 
             Language = language;
-
-            Indexing = !actions.GetEnvironmentVariable($"CODEQL_AUTOBUILDER_{Language.UpperCaseName}_NO_INDEXING").AsBool("no_indexing", false);
         }
     }
 

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

@@ -1,4 +1,4 @@
-using Semmle.Util.Logging;
+using Semmle.Util.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -190,21 +190,10 @@ public Autobuilder(IBuildActions actions, AutobuildOptions options)
             });
 
             CodeQLExtractorLangRoot = Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_ROOT");
-            SemmleDist = Actions.GetEnvironmentVariable("SEMMLE_DIST");
             SemmlePlatformTools = Actions.GetEnvironmentVariable("SEMMLE_PLATFORM_TOOLS");
 
             CodeQlPlatform = Actions.GetEnvironmentVariable("CODEQL_PLATFORM");
 
-            JavaHome =
-                Actions.GetEnvironmentVariable("CODEQL_JAVA_HOME") ??
-                Actions.GetEnvironmentVariable("SEMMLE_JAVA_HOME") ??
-                throw new InvalidEnvironmentException("The environment variable CODEQL_JAVA_HOME or SEMMLE_JAVA_HOME has not been set.");
-
-            Distribution =
-                CodeQLExtractorLangRoot ??
-                SemmleDist ??
-                throw new InvalidEnvironmentException($"The environment variable CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_ROOT or SEMMLE_DIST has not been set.");
-
             TrapDir =
                 Actions.GetEnvironmentVariable($"CODEQL_EXTRACTOR_{this.Options.Language.UpperCaseName}_TRAP_DIR") ??
                 Actions.GetEnvironmentVariable("TRAP_FOLDER") ??
@@ -275,15 +264,6 @@ protected BuildScript AutobuildFailure() =>
         /// </summary>
         public string? CodeQLExtractorLangRoot { get; }
 
-        /// <summary>
-        /// Value of SEMMLE_DIST environment variable.
-        /// </summary>
-        private string? SemmleDist { get; }
-
-        public string Distribution { get; }
-
-        public string JavaHome { get; }
-
         /// <summary>
         /// Value of SEMMLE_PLATFORM_TOOLS environment variable.
         /// </summary>
@@ -298,13 +278,20 @@ protected BuildScript AutobuildFailure() =>
         /// The absolute path of the odasa executable.
         /// null if we are running in CodeQL.
         /// </summary>
-        public string? Odasa => SemmleDist is null ? null : Actions.PathCombine(SemmleDist, "tools", "odasa");
+        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) => Options.Indexing && !(Odasa is null) ? builder.IndexCommand(Odasa, cmd) : builder.RunCommand(cmd);
+        public CommandBuilder MaybeIndex(CommandBuilder builder, string cmd) => Odasa is null ? builder.RunCommand(cmd) : builder.IndexCommand(Odasa, cmd);
     }
 }

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

@@ -1,7 +1,4 @@
 @echo off
 
-rem The autobuilder is already being traced
-set CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING=true
-
 type NUL && "%CODEQL_EXTRACTOR_CSHARP_ROOT%/tools/%CODEQL_PLATFORM%/Semmle.Autobuild.CSharp.exe"
 exit /b %ERRORLEVEL%

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

@@ -7,8 +7,4 @@ if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; th
     exit 1
 fi
 
-# The autobuilder is already being traced
-CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING="true"
-export CODEQL_AUTOBUILDER_CSHARP_NO_INDEXING
-
 "$CODEQL_EXTRACTOR_CSHARP_ROOT/tools/$CODEQL_PLATFORM/Semmle.Autobuild.CSharp" || exit $?

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

@@ -9,4 +9,7 @@ type NUL && "%CODEQL_DIST%\codeql" database index-files ^
     --language xml ^
     -- ^
     "%CODEQL_EXTRACTOR_CSHARP_WIP_DATABASE%"
+IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+type NUL && "%CODEQL_JAVA_HOME%\bin\java.exe" -jar "%CODEQL_EXTRACTOR_CSHARP_ROOT%\tools\extractor-asp.jar" .
 exit /b %ERRORLEVEL%

csharp/tools/autobuild.cmd

@@ -10,4 +10,6 @@ set -eu
     --size-limit 10m \
     --language xml \
     -- \
-    "$CODEQL_EXTRACTOR_CSHARP_WIP_DATABASE"
+    "$CODEQL_EXTRACTOR_CSHARP_WIP_DATABASE"
+
+"$CODEQL_JAVA_HOME/bin/java" -jar "$CODEQL_EXTRACTOR_CSHARP_ROOT/tools/extractor-asp.jar" .