Jelajahi Sumber

环境依赖

yichael 1 Minggu lalu
induk
melakukan
54a98854c6
39 mengubah file dengan 11 tambahan dan 13 penghapusan
  1. 6 4
      .gitignore
  2. 2 1
      configs/config.js
  3. 0 1
      configs/get-python-env-path.js
  4. 2 2
      enviroment-check.ps1
  5. 1 0
      python/arm64/environment.txt
  6. TEMPAT SAMPAH
      python/py/_asyncio.pyd
  7. TEMPAT SAMPAH
      python/py/_bz2.pyd
  8. TEMPAT SAMPAH
      python/py/_ctypes.pyd
  9. TEMPAT SAMPAH
      python/py/_decimal.pyd
  10. TEMPAT SAMPAH
      python/py/_elementtree.pyd
  11. TEMPAT SAMPAH
      python/py/_hashlib.pyd
  12. TEMPAT SAMPAH
      python/py/_lzma.pyd
  13. TEMPAT SAMPAH
      python/py/_msi.pyd
  14. TEMPAT SAMPAH
      python/py/_multiprocessing.pyd
  15. TEMPAT SAMPAH
      python/py/_overlapped.pyd
  16. TEMPAT SAMPAH
      python/py/_queue.pyd
  17. TEMPAT SAMPAH
      python/py/_socket.pyd
  18. TEMPAT SAMPAH
      python/py/_sqlite3.pyd
  19. TEMPAT SAMPAH
      python/py/_ssl.pyd
  20. TEMPAT SAMPAH
      python/py/_uuid.pyd
  21. TEMPAT SAMPAH
      python/py/_wmi.pyd
  22. TEMPAT SAMPAH
      python/py/_zoneinfo.pyd
  23. TEMPAT SAMPAH
      python/py/libcrypto-3-arm64.dll
  24. TEMPAT SAMPAH
      python/py/libffi-8.dll
  25. TEMPAT SAMPAH
      python/py/libssl-3-arm64.dll
  26. TEMPAT SAMPAH
      python/py/pyexpat.pyd
  27. TEMPAT SAMPAH
      python/py/python.cat
  28. TEMPAT SAMPAH
      python/py/python.exe
  29. TEMPAT SAMPAH
      python/py/python3.dll
  30. 0 5
      python/py/python312._pth
  31. TEMPAT SAMPAH
      python/py/python312.dll
  32. TEMPAT SAMPAH
      python/py/python312.zip
  33. TEMPAT SAMPAH
      python/py/pythonw.exe
  34. TEMPAT SAMPAH
      python/py/select.pyd
  35. TEMPAT SAMPAH
      python/py/sqlite3.dll
  36. TEMPAT SAMPAH
      python/py/unicodedata.pyd
  37. TEMPAT SAMPAH
      python/py/vcruntime140.dll
  38. TEMPAT SAMPAH
      python/py/vcruntime140_1.dll
  39. TEMPAT SAMPAH
      python/py/winsound.pyd

+ 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

TEMPAT SAMPAH
python/py/_asyncio.pyd


TEMPAT SAMPAH
python/py/_bz2.pyd


TEMPAT SAMPAH
python/py/_ctypes.pyd


TEMPAT SAMPAH
python/py/_decimal.pyd


TEMPAT SAMPAH
python/py/_elementtree.pyd


TEMPAT SAMPAH
python/py/_hashlib.pyd


TEMPAT SAMPAH
python/py/_lzma.pyd


TEMPAT SAMPAH
python/py/_msi.pyd


TEMPAT SAMPAH
python/py/_multiprocessing.pyd


TEMPAT SAMPAH
python/py/_overlapped.pyd


TEMPAT SAMPAH
python/py/_queue.pyd


TEMPAT SAMPAH
python/py/_socket.pyd


TEMPAT SAMPAH
python/py/_sqlite3.pyd


TEMPAT SAMPAH
python/py/_ssl.pyd


TEMPAT SAMPAH
python/py/_uuid.pyd


TEMPAT SAMPAH
python/py/_wmi.pyd


TEMPAT SAMPAH
python/py/_zoneinfo.pyd


TEMPAT SAMPAH
python/py/libcrypto-3-arm64.dll


TEMPAT SAMPAH
python/py/libffi-8.dll


TEMPAT SAMPAH
python/py/libssl-3-arm64.dll


TEMPAT SAMPAH
python/py/pyexpat.pyd


TEMPAT SAMPAH
python/py/python.cat


TEMPAT SAMPAH
python/py/python.exe


TEMPAT SAMPAH
python/py/python3.dll


+ 0 - 5
python/py/python312._pth

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

TEMPAT SAMPAH
python/py/python312.dll


TEMPAT SAMPAH
python/py/python312.zip


TEMPAT SAMPAH
python/py/pythonw.exe


TEMPAT SAMPAH
python/py/select.pyd


TEMPAT SAMPAH
python/py/sqlite3.dll


TEMPAT SAMPAH
python/py/unicodedata.pyd


TEMPAT SAMPAH
python/py/vcruntime140.dll


TEMPAT SAMPAH
python/py/vcruntime140_1.dll


TEMPAT SAMPAH
python/py/winsound.pyd