fix

Author: HIllya51

scripts/dobuild.py

@@ -1,5 +1,6 @@
 import sys, os, subprocess, shutil
 
+print(sys.platform)
 print(sys.executable)
 rootDir = os.path.dirname(__file__)
 if not rootDir:
@@ -18,9 +19,17 @@
 qtarchdir = qtarch[qtarch.find("_") + 1 :]
 
 # 准备环境
-pyPathEx = f"C:\\hostedtoolcache\\windows\\Python\\3.12.10\\x64\\python.exe"
-pyDir = f"C:\\hostedtoolcache\\windows\\Python\\{pythonversion}\\{arch}"
-pyPath = f"{pyDir}\\python.exe"
+if sys.platform == "win32":
+    pyPathEx = f"C:/hostedtoolcache/windows/Python/3.12.10/x64/python.exe"
+    pyDir = f"C:/hostedtoolcache/windows/Python/{pythonversion}/{arch}"
+    pyPath = f"{pyDir}/python.exe"
+    Qtinstallpath = f"D:/a/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir}"
+elif sys.platform == "linux":
+    pyPathEx = f"/opt/hostedtoolcache/Python/3.12.10/x64/bin/python"
+    pyDir = f"/opt/hostedtoolcache/Python/{pythonversion}/{arch}/bin/python"
+    pyPath = f"{pyDir}/python.exe"
+    Qtinstallpath = f"/home/runner/work/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir}"
+
 subprocess.run(f"{pyPath} -m pip install --upgrade pip")
 if binding.lower().startswith("pyqt"):
     if qtversion.startswith("6"):
@@ -48,20 +57,23 @@ def __parsefile(fn, cb):
     lambda cml: cml.replace("add_subdirectory(ElaWidgetToolsExample)", ""),
 )
 __parsefile(
-    r"..\ElaWidgetTools\ElaWidgetTools\CMakeLists.txt",
+    "../ElaWidgetTools/ElaWidgetTools/CMakeLists.txt",
     lambda cml: cml.replace("qt_add_library", "add_library"),  # qt6.8以上
 )
 __parsefile(
-    r"..\ElaWidgetTools\ElaWidgetTools\ElaProperty.h",
+    "../ElaWidgetTools/ElaWidgetTools/ElaProperty.h",
     lambda cml: cml.replace(
         "Q_DECL_EXPORT",
         "",
     ).replace("Q_DECL_IMPORT", ""),
 )
-
-archA = ("win32", "x64")[arch == "x64"]
+if sys.platform == "win32":
+    archA = ("win32", "x64")[arch == "x64"]
+    flags = f'-G "Visual Studio 17 2022" -A {archA} -T host={arch}'
+else:
+    flags = ""
 subprocess.run(
-    f'cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt -G "Visual Studio 17 2022" -A {archA} -T host={arch}'
+    f"cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt {flags}"
 )
 subprocess.run(
     f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}"
@@ -73,17 +85,22 @@ def __parsefile(fn, cb):
     subprocess.run(f'python gen_widgets.py {int(qtversion.startswith("5"))}')
     subprocess.run(f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}')
     subprocess.run(f"{pyPath} sip_code_fix.py")
+    if sys.platform == "win32":
+        qmake = f"{Qtinstallpath}/bin/qmake.exe"
+    else:
+        qmake = f"{Qtinstallpath}/bin/qmake"
+
     subprocess.run(
-        rf"{pyDir}\Scripts\sip-build --verbose --qmake D:\a\PyElaWidgetTools\Qt\{qtversion}\{qtarchdir}\bin\qmake.exe"
+        rf"{pyDir}/Scripts/sip-build --verbose --qmake {qmake}"
     )
     # for _dir, _, _fs in os.walk(r"."):
     #     for _f in _fs:
     #         print(_dir, _f)
     os.chdir("..")
     os.mkdir("objects")
-    shutil.copy(r"pyqt\build\ElaWidgetTools\ElaWidgetTools.pyd", "objects")
-    shutil.copy(r"pyqt\ElaWidgetTools.pyi", "objects")
-    shutil.copytree(r"pyqt\sip", "objects/sip")
+    shutil.copy("pyqt/build/ElaWidgetTools/ElaWidgetTools.pyd", "objects")
+    shutil.copy("pyqt/ElaWidgetTools.pyi", "objects")
+    shutil.copytree("pyqt/sip", "objects/sip")
 
 elif binding.lower().startswith("pyside"):
     cwd = os.getcwd()
@@ -102,30 +119,29 @@ def __parsefile(fn, cb):
     os.chdir("pyside6")
 
     subprocess.run(
-        f'python gen_xml.py {os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} D:/a/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir} {pyDir.replace("\\", "/")}'
+        f'python gen_xml.py {os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} {Qtinstallpath} {pyDir}'
     )
 
-    archA = ("win32", "x64")[arch == "x64"]
     subprocess.run(
-        f'cmake -DMY_QT_INSTALL=D:/a/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir} -DMY_PYTHON_INSTALL_PATH={pyDir.replace("\\", "/")} -DELA_LIB_PATH={os.path.abspath("../ElaWidgetTools/Release/ElaWidgetTools.lib").replace("\\", "/")} -DELA_INCLUDE_PATH={os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} ./CMakeLists.txt -G "Visual Studio 17 2022" -A {archA} -T host={arch}'
+        f'cmake -DMY_QT_INSTALL={Qtinstallpath} -DMY_PYTHON_INSTALL_PATH={pyDir.replace("\\", "/")} -DELA_LIB_PATH={os.path.abspath("../ElaWidgetTools/Release/ElaWidgetTools.lib").replace("\\", "/")} -DELA_INCLUDE_PATH={os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} ./CMakeLists.txt {flags}'
     )
     subprocess.run(
         f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}"
     )
 
     os.chdir("..")
     os.mkdir("objects")
-    shutil.copy(r"pyside6\Release\ElaWidgetTools.pyd", "objects")
-    shutil.copy(pyipath + r"\ElaWidgetTools.pyi", "objects")
+    shutil.copy("pyside6/Release/ElaWidgetTools.pyd", "objects")
+    shutil.copy(pyipath + "/ElaWidgetTools.pyi", "objects")
 
 dirname = f"{binding}ElaWidgetTools"
-os.mkdir(rf"wheel\{dirname}")
-shutil.copy(r"objects\ElaWidgetTools.pyd", rf"wheel\{dirname}")
-shutil.copy(r"objects\ElaWidgetTools.pyi", rf"wheel\{dirname}")
+os.mkdir(f"wheel/{dirname}")
+shutil.copy("objects/ElaWidgetTools.pyd", f"wheel/{dirname}")
+shutil.copy("objects/ElaWidgetTools.pyi", f"wheel/{dirname}")
 
-with open(r"wheel\__init__.py", "r") as ff:
+with open("wheel/__init__.py", "r") as ff:
     init = ff.read()
-with open(rf"wheel\{dirname}\__init__.py", "w") as ff:
+with open(f"wheel/{dirname}/__init__.py", "w") as ff:
     ff.write(f"from {binding} import QtCore, QtWidgets, QtGui\n" + init)
 
 #

scripts/pyqt/gen_Def.sip.py

@@ -2,7 +2,7 @@
 
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
-with open(r"../../ElaWidgetTools/ElaWidgetTools\ElaDef.h", "r", encoding="utf8") as ff:
+with open("../../ElaWidgetTools/ElaWidgetTools/ElaDef.h", "r", encoding="utf8") as ff:
     content = ff.read()
 
 import re

scripts/pyqt/gen_widgets.py

@@ -502,7 +502,7 @@ def generate_sip_for_class__1(header_content, filename=""):
 
 def cast_h_to_sip(filename):
     filename = os.path.splitext(os.path.basename(filename))[0]
-    input_header_file = rf"{eladir}\{filename}.h"
+    input_header_file = f"{eladir}/{filename}.h"
     output_sip_file = f"sip/{filename}.sip"
 
     with open(input_header_file, "r", encoding="utf-8") as f:
@@ -552,7 +552,7 @@ def cast_h_to_sip(filename):
         cast_h_to_sip(f)
         allfiles.append(f"%Include {os.path.basename(f).split('.')[0]}.sip")
 
-with open(r"sip\ElaWidgetTools.sip", "w", encoding="utf-8") as f:
+with open("sip/ElaWidgetTools.sip", "w", encoding="utf-8") as f:
     __ = "\n".join(allfiles)
     f.write(
         rf"""%Module(name=ElaWidgetTools, use_limited_api=True)

scripts/pyqt/sip_code_fix.py

@@ -3,7 +3,7 @@
 print(sys.version_info.minor)
 
 f = os.path.join(
-    os.path.dirname(sys.executable), r"Lib\site-packages\sipbuild\project.py"
+    os.path.dirname(sys.executable), "Lib/site-packages/sipbuild/project.py"
 )
 with open(f, "r") as ff:
     x = ff.read()
@@ -18,7 +18,7 @@
 
     f = os.path.join(
         os.path.dirname(sys.executable),
-        r"Lib\site-packages\sipbuild\generator\utils.py",
+        "Lib/site-packages/sipbuild/generator/utils.py",
     )
     with open(f, "r") as ff:
         x = ff.read()