refactor

Author: Timothy Mothra Lee (from Dev Box)

.github/workflows/codeql-daily.yml

@@ -80,69 +80,34 @@ jobs:
           debug: true
 
       - name: Build C++ code
-        shell: pwsh
-        id: build-cpp
+        shell: cmd
         run: |
-          # Use vswhere to find the path to the latest installed Visual Studio Build Tools
-          $vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-          if (-not $vsPath) {
-            Write-Host "Could not find Visual Studio Build Tools installation."
-            exit 1
-          }
-          $vcvarsPath = Join-Path $vsPath 'VC\Auxiliary\Build\vcvars64.bat'
-          if (-not (Test-Path $vcvarsPath)) {
-            Write-Host "Could not find vcvars64.bat at $vcvarsPath"
-            exit 1
-          }
-
-          REM Prepare the build script as a string
-          $buildScript = @'
-          REM Set required environment variables
-          set APPINSIGHTS_WIN10_SDK_PATH="C:\Program Files (x86)\Windows Kits\10"
-          set APPINSIGHTS_VS_PATH=%VsInstallRoot%
+          "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath > vs.txt
+          set /p VSPATH=<vs.txt
+          set VCVARS=%VSPATH%\VC\Auxiliary\Build\vcvars64.bat
+          call "%VCVARS%"
+          set APPINSIGHTS_WIN10_SDK_PATH=C:\Program Files (x86)\Windows Kits\10
+          set APPINSIGHTS_VS_PATH=%VSPATH%
           set JAVA_HOME=%JAVA_HOME_17_X64%
-
           set sourceDir=etw/native/src/main/cpp
           set headerDir=etw/native/src/main/headers
           set cppFile=%sourceDir%/etw_provider.cpp
-
           echo Analyzing C++ file: %cppFile%
-
-          REM Create compile_commands.json for CodeQL to use
           echo [ > compile_commands.json
           echo   { >> compile_commands.json
           echo     "directory": "%CD%/%sourceDir%", >> compile_commands.json
           echo     "command": "cl.exe /W4 /EHsc /sdl /std:c++14 /I\"%APPINSIGHTS_WIN10_SDK_PATH%/include/10.0.22621.0/um\" /I\"%JAVA_HOME%/include\" /I\"%JAVA_HOME%/include/win32\" /I\"%CD%/%headerDir%\" /c %cppFile%", >> compile_commands.json
           echo     "file": "%cppFile%" >> compile_commands.json
           echo   } >> compile_commands.json
           echo ] >> compile_commands.json
-
-          REM Create a simple C++ file in the same directory to ensure the compiler is called
           echo // Simple file to ensure compiler is run > codeql_trigger.cpp
-          echo #include <windows.h> >> codeql_trigger.cpp
-          echo #include <jni.h> >> codeql_trigger.cpp
+          echo #include ^<windows.h^> >> codeql_trigger.cpp
+          echo #include ^<jni.h^> >> codeql_trigger.cpp
           echo #include "etw_provider.h" >> codeql_trigger.cpp
           echo int main() { return 0; } >> codeql_trigger.cpp
-
-          REM Use a try/catch block to handle errors without failing the job
-          REM (not available in batch, so use errorlevel)
-          REM List files for debugging
-          echo C++ files that will be analyzed:
           dir %sourceDir% /s /b *.cpp
           dir %headerDir% /s /b *.h
-
-          REM Try a minimal compile to help CodeQL recognize the files
-          echo Running minimal compile...
-          echo Using JAVA_HOME: %JAVA_HOME%
-          if exist %JAVA_HOME%/include (
-            echo JNI include path exists: %JAVA_HOME%/include
-          ) else (
-            echo WARNING: JNI include path doesn't exist: %JAVA_HOME%/include
-          )
-
-          REM Compile with explicit include paths
           cl.exe /c codeql_trigger.cpp /I"%headerDir%" /I"%sourceDir%" /I"%JAVA_HOME%/include" /I"%JAVA_HOME%/include/win32" /EHsc
-
           if %errorlevel%==0 (
             echo C++ preparation completed successfully
             echo CPP_BUILD_SUCCEEDED=true>>%GITHUB_ENV%
@@ -151,14 +116,6 @@ jobs:
             echo Proceeding with CodeQL analysis anyway
             echo CPP_BUILD_SUCCEEDED=false>>%GITHUB_ENV%
           )
-          '@
-
-          REM Write the batch script to a file
-          $batchFile = 'run-cpp-build.bat'
-          Set-Content -Path $batchFile -Value $buildScript -NoNewline
-
-          REM Call vcvars64.bat and then the batch file (fix quoting for spaces)
-          & cmd /c "`"$vcvarsPath`" && $batchFile"
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3