获取python路径改为在make.js

Author: chexiongsheng

unity/cli/make.mjs

@@ -53,6 +53,14 @@ function selectVisualStudioGenerator() {
    }
 }
 
+function tryGetPythonFromPath() {
+    try {
+      const out = execFileSync('python', ['-c', 'import sys; print(sys.executable)'], { encoding: 'utf8' }).trim();
+      if (out && existsSync(out)) return { exe: out, home: dirname(out) };
+    } catch {}
+    return null;
+}
+
 const platformCompileConfig = {
     'android': {
         'armv7': {
@@ -420,6 +428,12 @@ async function runPuertsMake(cwd, options) {
 	if (options.cmake_args) {
 		CmakeDArgs += ` ${options.cmake_args}`;
 	}
+	if (options.backend == 'papi-python' && options.platform == "win") {
+		const pyInfo = tryGetPythonFromPath();
+		if (pyInfo && pyInfo.exe) {
+	        CmakeDArgs +=  ` -DPython3_EXECUTABLE="${pyInfo.exe}"`;
+		}
+	}
 
     var outputFile = BuildConfig.hook(
         CMAKE_BUILD_PATH,

unity/cli/test.mjs

@@ -250,14 +250,6 @@ function getExeSuffix() {
     return "";
 }
 
-function tryGetPythonFromPath() {
-    try {
-      const out = execFileSync('python', ['-c', 'import sys; print(sys.executable)'], { encoding: 'utf8' }).trim();
-      if (out && existsSync(out)) return { exe: out, home: dirname(out) };
-    } catch {}
-    return null;
-}
-
 export async function dotnetTest(cwd, backend, filter = '', thread_safe = false) {
     // 编译binary
     let dlls = await runPuertsMake(join(cwd, '../../native/puerts'), {
@@ -299,14 +291,11 @@ export async function dotnetTest(cwd, backend, filter = '', thread_safe = false)
     });
     dlls = dlls.concat(nodedlls);
 
-	const pyInfo = tryGetPythonFromPath();
-	
 	const pydlls = await runPuertsMake(join(cwd, '../../native/papi-python'), {
         platform: getPlatform(),
         config: "Debug",
         arch: process.arch,
-        thread_safe: thread_safe,
-		cmake_args: (pyInfo && pyInfo.exe) ? `-DPython3_EXECUTABLE="${pyInfo.exe}"` : undefined
+        thread_safe: thread_safe
     });
     dlls = dlls.concat(pydlls);