This commit is contained in:
恍兮惚兮 2024-06-25 03:21:56 +08:00
parent d6ffb3f146
commit bd17a9aa72
12 changed files with 18 additions and 24 deletions

View File

@ -23,10 +23,10 @@ jobs:
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 22621
- name: Install Python 3.7.9
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.7.9'
python-version: '3.8.10'
architecture: ${{ matrix.architecture }}
- name: Install Python 3.11
@ -36,7 +36,7 @@ jobs:
- name: Run build script
run: |
python build.py ${{ matrix.architecture }}
python build.py ${{ matrix.architecture }} 3.8.10
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.fname }}

View File

@ -20,10 +20,10 @@ jobs:
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 22621
- name: Install Python 3.7.9
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.7.9'
python-version: '3.8.10'
architecture: ${{ matrix.architecture }}
- name: Install Python 3.11
uses: actions/setup-python@v5
@ -32,7 +32,7 @@ jobs:
- name: Run build script
run: |
python build.py ${{ matrix.architecture }}
python build.py ${{ matrix.architecture }} 3.8.10
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.fname }}

View File

@ -1,2 +0,0 @@
@REM python pack.py 1
%LOCALAPPDATA%\Programs\Python\Python37-32\python.exe retrieval.py 1

View File

@ -1,2 +0,0 @@
@REM python pack.py 0
%LOCALAPPDATA%\Programs\Python\Python37\python.exe retrieval.py 0

View File

@ -1,4 +1,4 @@
#python3.7.9
#python3.8.10
PyQt5==5.15.10
PyQt5-Qt5==5.15.2

View File

@ -1,3 +0,0 @@
@echo off
%LOCALAPPDATA%\Programs\Python\Python37\python.exe -B LunaTranslator\LunaTranslator_main.py
pause

View File

@ -1,3 +0,0 @@
@echo off
%LOCALAPPDATA%\Programs\Python\Python37-32\python.exe -B LunaTranslator\LunaTranslator_main.py
pause

View File

@ -1,3 +0,0 @@
@echo off
%LOCALAPPDATA%\Programs\Python\Python37\python.exe -B LunaTranslator\LunaTranslator_main.py test
pause

3
LunaTranslator/run38.bat Normal file
View File

@ -0,0 +1,3 @@
@echo off
%LOCALAPPDATA%\Programs\Python\Python38\python.exe -B LunaTranslator\LunaTranslator_main.py
pause

View File

@ -0,0 +1,3 @@
@echo off
%LOCALAPPDATA%\Programs\Python\Python38-32\python.exe -B LunaTranslator\LunaTranslator_main.py
pause

View File

@ -258,6 +258,7 @@ if __name__ == "__main__":
print("version=" + versionstring)
exit()
arch = sys.argv[1]
version = sys.argv[2]
isdebug = len(sys.argv) > 2 and int(sys.argv[2])
os.chdir(rootDir)
os.system("git submodule update --init --recursive")
@ -279,13 +280,13 @@ if __name__ == "__main__":
os.chdir(rootDir)
if arch == "x86":
py37Path = "C:\\hostedtoolcache\\windows\\Python\\3.7.9\\x86\\python.exe"
py37Path = f"C:\\hostedtoolcache\\windows\\Python\\{version}\\x86\\python.exe"
else:
py37Path = "C:\\hostedtoolcache\\windows\\Python\\3.7.9\\x64\\python.exe"
py37Path = f"C:\\hostedtoolcache\\windows\\Python\\{version}\\x64\\python.exe"
os.chdir(rootDir + "\\LunaTranslator")
subprocess.run(f"{py37Path} -m pip install --upgrade pip")
subprocess.run(f"{py37Path} -m pip install -r requirements.txt")
subprocess.run(f'{py37Path} retrieval.py')
subprocess.run(f"{py37Path} retrieval.py")

View File

@ -28,7 +28,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/version)
include(generate_product_version)
set(VERSION_MAJOR 5)
set(VERSION_MINOR 3)
set(VERSION_MINOR 4)
set(VERSION_PATCH 0)
add_library(pch pch.cpp)