diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f83e1b6..b57d4f9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7ebb691..c9206a8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 }} diff --git a/LunaTranslator/pack32.cmd b/LunaTranslator/pack32.cmd deleted file mode 100644 index e28a1e24..00000000 --- a/LunaTranslator/pack32.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@REM python pack.py 1 -%LOCALAPPDATA%\Programs\Python\Python37-32\python.exe retrieval.py 1 \ No newline at end of file diff --git a/LunaTranslator/pack64.cmd b/LunaTranslator/pack64.cmd deleted file mode 100644 index d2753ef5..00000000 --- a/LunaTranslator/pack64.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@REM python pack.py 0 -%LOCALAPPDATA%\Programs\Python\Python37\python.exe retrieval.py 0 \ No newline at end of file diff --git a/LunaTranslator/requirements.txt b/LunaTranslator/requirements.txt index 8b379abb..1e60676b 100644 --- a/LunaTranslator/requirements.txt +++ b/LunaTranslator/requirements.txt @@ -1,4 +1,4 @@ -#python3.7.9 +#python3.8.10 PyQt5==5.15.10 PyQt5-Qt5==5.15.2 diff --git a/LunaTranslator/run37.bat b/LunaTranslator/run37.bat deleted file mode 100644 index 2915b31e..00000000 --- a/LunaTranslator/run37.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -%LOCALAPPDATA%\Programs\Python\Python37\python.exe -B LunaTranslator\LunaTranslator_main.py -pause \ No newline at end of file diff --git a/LunaTranslator/run3732.bat b/LunaTranslator/run3732.bat deleted file mode 100644 index f3298564..00000000 --- a/LunaTranslator/run3732.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -%LOCALAPPDATA%\Programs\Python\Python37-32\python.exe -B LunaTranslator\LunaTranslator_main.py -pause \ No newline at end of file diff --git a/LunaTranslator/run37_test.bat b/LunaTranslator/run37_test.bat deleted file mode 100644 index f4877c85..00000000 --- a/LunaTranslator/run37_test.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -%LOCALAPPDATA%\Programs\Python\Python37\python.exe -B LunaTranslator\LunaTranslator_main.py test -pause \ No newline at end of file diff --git a/LunaTranslator/run38.bat b/LunaTranslator/run38.bat new file mode 100644 index 00000000..57a29629 --- /dev/null +++ b/LunaTranslator/run38.bat @@ -0,0 +1,3 @@ +@echo off +%LOCALAPPDATA%\Programs\Python\Python38\python.exe -B LunaTranslator\LunaTranslator_main.py +pause \ No newline at end of file diff --git a/LunaTranslator/run3832.bat b/LunaTranslator/run3832.bat new file mode 100644 index 00000000..2b090edf --- /dev/null +++ b/LunaTranslator/run3832.bat @@ -0,0 +1,3 @@ +@echo off +%LOCALAPPDATA%\Programs\Python\Python38-32\python.exe -B LunaTranslator\LunaTranslator_main.py +pause \ No newline at end of file diff --git a/build.py b/build.py index 97513d8a..0542a50a 100644 --- a/build.py +++ b/build.py @@ -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") diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index c889945c..f0e8e9db 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -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)