build(xmake): get rid of complicated patternsleuth local vs package opt

Author: narknon

README.md

@@ -103,10 +103,6 @@ Currently supported options for these are:
 > [!TIP]
 > Configure the project using this command: `xmake f -m "<BuildMode>"`. `-m` is an alias for --**m**ode=\<BuildMode>.
 
-#### Patternsleuth (Experimental)
-
-By default, the patternsleuth tool installs itself as an xmake package. If you do not intend on modifying the patternsleuth source code, then you don't have to configure anything special. If you want to be able to modify the patternsleuth source code, you have to supply the `--patternsleuth=local` option to `xmake config` in order to recompile patternsleuth as part of the UE4SS build. 
-
 #### Proxy Path
 
 By default, UE4SS generates a proxy based on `C:\Windows\System32\dwmapi.dll`. If you want to change this for any reason, you can supply the `--ue4ssProxyPath=<path proxy dll>` to the `xmake config` command..

deps/first/patternsleuth_bind/xmake.lua

@@ -1,27 +1,7 @@
--- If patternsleuth is configured to install as a package.
-add_requires("cargo::patternsleuth_bind", { optional = not is_config("patternsleuth", "package"), debug = is_mode_debug(), configs = { cargo_toml = path.join(os.scriptdir(), "Cargo.toml") } })
-
 target("patternsleuth_bind")
     set_kind("static")
-    set_values("rust.cratetype", "staticlib")
     add_files("src/lib.rs")
-    -- Exposes the src/lib.rs files to the Visual Studio project filters.
-    add_extrafiles("src/lib.rs")
-
-    -- If patternsleuth is configured to install as a package.
-    if is_config("patternsleuth", "package") then
-        add_packages("cargo::patternsleuth_bind")
-        add_links("ws2_32", "advapi32", "userenv", "ntdll", "oleaut32", "bcrypt", "ole32", { public = true })
-    end
-
-    -- If patternsleuth should be built as part of compilation.
-    if is_config("patternsleuth", "local") then 
-        add_deps("patternsleuth")
-        add_rules("rust.link")
-    end
+    add_deps("patternsleuth")
+    set_values("rust.cratetype", "staticlib")
 
-    -- We need to clean up the non-selected package/local version of patternsleuth when we reconfigure.
-    -- This just deletes the .lib and keeps cargo deps on disk for faster recompilation.
-    on_config(function(target)
-        os.tryrm(target:targetfile())
-    end)
+    add_links("ws2_32", "advapi32", "userenv", "ntdll", "oleaut32", "bcrypt", "ole32", { public = true })

deps/first/xmake.lua

@@ -27,15 +27,15 @@ task("manuallyBuildLocalPatternsleuth")
     end)
 
 if get_config("ue4ssCross") ~= "msvc-wine" then
-    if is_config("patternsleuth", "local") then
-        -- The patternsleuth target is managed by the cargo.build rule.
-        target("patternsleuth")
-            set_kind("static")
-            add_rules("cargo.build", {project_name = "patternsleuth", is_debug = is_mode_debug(), features = { "process-internal", "image-pe" }})
-            add_files("patternsleuth/Cargo.toml")
-            -- Exposes the rust *.rs files to the Visual Studio project filters.
-            add_extrafiles("patternsleuth/**.rs")
-    end
+
+    -- The patternsleuth target is managed by the cargo.build rule.
+    target("patternsleuth")
+        set_kind("static")
+        add_rules("cargo.build", {project_name = "patternsleuth", is_debug = is_mode_debug(), features = { "process-internal", "image-pe" }})
+        add_files("patternsleuth/Cargo.toml")
+        -- Exposes the rust *.rs files to the Visual Studio project filters.
+        add_extrafiles("patternsleuth/**.rs")
+
 else
     target("patternsleuth_bind")
         set_kind("static")
@@ -48,14 +48,3 @@ else
             task.run("manuallyBuildLocalPatternsleuth")
         end)
 end
-
--- This option allows users to choose if patternsleuth should be installed as a package
--- or if patternsleuth should be built as a dependency by xmake. The `package` option
--- should be used if you don't intend on ever modifying the patternsleuth source.
--- The `local` option should be used if you want changes in the patternsleuth
--- submodule to be included as part of the UE4SS build. 
-option("patternsleuth")
-    set_default("package")
-    set_showmenu(true)
-    set_values("package", "local")
-    set_description("Install patternsleuth as a package or build it as a dependency.", "package", "local")