mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 05:59:07 +08:00
e07c62d059
* Remove unused SKIA_PUBLIC_DEFINITIONS * Revise python3 injection * Major overhaul * Revise third-party downloads Declare them early in a single location, but use as needed. Validate agains skia's DEPS. * Integrate download & pkgconfig externals handling Ensure that downloads are complete with --only-downloads mode. * Move cmake functions to separate file * Turn source fixups into proper patches * Update versions * Generally disable msvc env setup * Update python patch * Remove unused patch * Rename function * Update versions * Handle third-party licenses * Move block * Rename and unset skia root variable * Fix usage with alternative build types * Update versions
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
diff --git a/.gn b/.gn
|
|
index 1d734b3..407e403 100644
|
|
--- a/.gn
|
|
+++ b/.gn
|
|
@@ -1,5 +1,4 @@
|
|
buildconfig = "//gn/BUILDCONFIG.gn"
|
|
-script_executable = "python3"
|
|
|
|
default_args = {
|
|
angle_standalone = false
|
|
diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
|
|
index ba85c3d..5dd991a 100644
|
|
--- a/gn/toolchain/BUILD.gn
|
|
+++ b/gn/toolchain/BUILD.gn
|
|
@@ -6,6 +6,7 @@ if (is_fuchsia) {
|
|
}
|
|
|
|
declare_args() {
|
|
+ script_executable = "python3"
|
|
host_ar = ar
|
|
host_cc = cc
|
|
host_cxx = cxx
|
|
@@ -232,7 +234,7 @@ toolchain("msvc") {
|
|
|
|
tool("copy") {
|
|
cp_py = rebase_path("../cp.py")
|
|
- command = "$shell python3 \"$cp_py\" {{source}} {{output}}"
|
|
+ command = "\"$script_executable\" \"$cp_py\" {{source}} {{output}}"
|
|
description = "copy {{source}} {{output}}"
|
|
}
|
|
}
|
|
@@ -302,7 +304,7 @@ template("gcc_like_toolchain") {
|
|
rspfile = "{{output}}.rsp"
|
|
rspfile_content = "{{inputs}}"
|
|
rm_py = rebase_path("../rm.py")
|
|
- command = "$shell python3 \"$rm_py\" \"{{output}}\" && $ar rcs {{output}} @$rspfile"
|
|
+ command = "$shell \"$script_executable\" \"$rm_py\" \"{{output}}\" && $ar rcs {{output}} @$rspfile"
|
|
}
|
|
|
|
outputs =
|
|
@@ -386,13 +388,13 @@ template("gcc_like_toolchain") {
|
|
|
|
tool("copy") {
|
|
cp_py = rebase_path("../cp.py")
|
|
- command = "python3 \"$cp_py\" {{source}} {{output}}"
|
|
+ command = "\"script_executable\" \"$cp_py\" {{source}} {{output}}"
|
|
description = "copy {{source}} {{output}}"
|
|
}
|
|
|
|
tool("copy_bundle_data") {
|
|
cp_py = rebase_path("../cp.py")
|
|
- command = "python3 \"$cp_py\" {{source}} {{output}}"
|
|
+ command = "\"script_executable\" \"$cp_py\" {{source}} {{output}}"
|
|
description = "copy_bundle_data {{source}} {{output}}"
|
|
}
|
|
|