Split runtime component in two for base/native vs JIT additions (#1450)

Fixes #1442

Signed-off-by: Dave Thaler <dthaler@microsoft.com>

Signed-off-by: Dave Thaler <dthaler@microsoft.com>

docs/GettingStarted.md

@@ -351,7 +351,7 @@ If using Visual Studio as your IDE, your project can add a reference to the
 (You can also manually download the nuget package from the
 [latest release](https://github.com/microsoft/ebpf-for-windows/releases).)
 
-If you [installed eBPF for Windows via the MSI](https://github.com/microsoft/ebpf-for-windows/blob/main/docs/InstallEbpf.md)
+If you [installed eBPF for Windows via the MSI](InstallEbpf.md)
 and checked the Development checkbox, installation was completed for you.
 Otherwise, after installing the nuget package, as a one-time operation, you will
 currently need to run the `export_program_info.exe` tool to complete the install. This

docs/InstallEbpf.md

@@ -11,6 +11,16 @@ Do the following from within the VM:
 1. Download the .msi file from the latest [release](https://github.com/microsoft/ebpf-for-windows/releases)
 2. Execute the .msi file you downloaded
 
+The following components are shown in the MSI to select from:
+
+* Runtime: this is the base eBPF runtime, and is required by the other components.  If you select only this
+  component, only [native code generation](NativeCodeGeneration.md) is enabled.
+* JIT: this adds support for JIT-compiled eBPF programs and (in a Debug build only) interpreted eBPF programs.
+* Development: this adds headers and libraries used for development.  If you only want to use eBPF for development
+  rather than running programs, you can [use the NuGet package](GettingStarted.md#using-ebpf-in-development)
+  instead of the MSI.
+* Testing: this adds tests for the eBPF runtime for use by eBPF runtime developers.
+
 ### Method 2 (Install files you built yourself)
 This method uses a machine that
 has already built the binaries for x64/Debug or x64/Release.

scripts/install_ebpf.psm1

@@ -111,9 +111,11 @@ function Start-eBPFComponents
         }
     }
 
-    # Start user mode service.
-    Start-Service "eBPFSvc" -ErrorAction Stop | Write-Log
-    Write-Host "eBPFSvc service started."
+    if (Test-Path -Path "ebpfsvc.exe") {
+        # Start user mode service.
+        Start-Service "eBPFSvc" -ErrorAction Stop | Write-Log
+        Write-Host "eBPFSvc service started."
+    }
 }
 
 #

tools/setup/CMakeLists.txt

@@ -36,7 +36,6 @@ install(
   FILES
     "${EBPFFORWINDOWS_PROGRAM_DATA}/bpftool.exe"
     "${EBPFFORWINDOWS_PROGRAM_DATA}/bpf2c.exe"
-    "${EBPFFORWINDOWS_PROGRAM_DATA}/ebpfsvc.exe"
     "${EBPFFORWINDOWS_PROGRAM_DATA}/export_program_info.exe"
 
     "${EBPFFORWINDOWS_PROGRAM_DATA}/EbpfApi.dll"
@@ -77,6 +76,21 @@ install(
     "Runtime"
 )
 
+#
+# JIT support
+#
+
+install(
+  FILES
+    "${EBPFFORWINDOWS_PROGRAM_DATA}/ebpfsvc.exe"
+
+  DESTINATION
+    "."
+
+  COMPONENT
+    "JIT"
+)
+
 #
 # Development
 #
@@ -143,6 +157,10 @@ cpack_add_component("Runtime"
   REQUIRED
 )
 
+cpack_add_component("JIT"
+  DISPLAY_NAME "JIT support components"
+)
+
 cpack_add_component("Testing"
   DISPLAY_NAME "Testing components"
   DISABLED