浏览代码

环境依赖

yichael 1 周之前
父节点
当前提交
54a98854c6

+ 6 - 4
.gitignore

@@ -26,13 +26,15 @@ Thumbs.db
 *.swp
 *.swo
 
-# Environment
-.env
-.env.local
-
 # Electron
 *.asar
 
+# 已废弃:venv 现用 python/arm64/env、python/x64/env
+python/env-arm64/
+python/env-x64/
+# 已废弃:嵌入式 Python 现用 python/arm64/py、python/x64/py
+python/py/
+
 #undefined
 
 #dist

+ 2 - 1
configs/config.js

@@ -4,7 +4,8 @@ const path = require('path')
 const projectRoot = path.resolve(__dirname, '..')
 const isArm64 = process.arch === 'arm64'
 const pythonDir = isArm64 ? 'arm64' : 'x64'
-const pythonVenvPath = path.join(projectRoot, 'python', isArm64 ? 'env-arm64' : 'env-x64')
+// venv 放在对应架构目录下:python/x64/env、python/arm64/env
+const pythonVenvPath = path.join(projectRoot, 'python', pythonDir, 'env')
 
 module.exports = {
   // 窗口配置

+ 0 - 1
configs/get-python-env-path.js

@@ -1 +0,0 @@
-console.log(require('./config.js').pythonEnvPath)

+ 2 - 2
enviroment-check.ps1

@@ -101,11 +101,11 @@ if ($pipVersion) {
 }
 
 
-#check python virtual environment
+#check python virtual environment(venv 在 python/x64/env 或 python/arm64/env)
 Write-Host "`nChecking python virtual environment..." -ForegroundColor Yellow
 $arch = if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { "arm64" } else { "x64" }
 $_p = node (Join-Path $scriptRoot "configs\get-python-env-path.js") 2>$null
-$venvPath = if ($_p) { $_p.Trim() } else { Join-Path $scriptRoot "python\env-$arch" }
+$venvPath = if ($_p -and $_p -ne "undefined") { $_p.Trim() } else { Join-Path $scriptRoot "python\$arch\env" }
 if (Test-Path $venvPath) {
     Write-Host "[OK] python virtual environment exists at: $venvPath" -ForegroundColor Green
 } else {

+ 1 - 0
python/arm64/environment.txt

@@ -1,3 +1,4 @@
+coloredlogs==15.0.1
 flatbuffers==25.12.19
 humanfriendly==10.0
 mpmath==1.3.0

二进制
python/py/_asyncio.pyd


二进制
python/py/_bz2.pyd


二进制
python/py/_ctypes.pyd


二进制
python/py/_decimal.pyd


二进制
python/py/_elementtree.pyd


二进制
python/py/_hashlib.pyd


二进制
python/py/_lzma.pyd


二进制
python/py/_msi.pyd


二进制
python/py/_multiprocessing.pyd


二进制
python/py/_overlapped.pyd


二进制
python/py/_queue.pyd


二进制
python/py/_socket.pyd


二进制
python/py/_sqlite3.pyd


二进制
python/py/_ssl.pyd


二进制
python/py/_uuid.pyd


二进制
python/py/_wmi.pyd


二进制
python/py/_zoneinfo.pyd


二进制
python/py/libcrypto-3-arm64.dll


二进制
python/py/libffi-8.dll


二进制
python/py/libssl-3-arm64.dll


二进制
python/py/pyexpat.pyd


二进制
python/py/python.cat


二进制
python/py/python.exe


二进制
python/py/python3.dll


+ 0 - 5
python/py/python312._pth

@@ -1,5 +0,0 @@
-python312.zip
-.
-
-# Uncomment to run site.main() automatically
-#import site

二进制
python/py/python312.dll


二进制
python/py/python312.zip


二进制
python/py/pythonw.exe


二进制
python/py/select.pyd


二进制
python/py/sqlite3.dll


二进制
python/py/unicodedata.pyd


二进制
python/py/vcruntime140.dll


二进制
python/py/vcruntime140_1.dll


二进制
python/py/winsound.pyd