Update dobuild.py

Author: HIllya51

scripts/dobuild.py

@@ -25,25 +25,31 @@
     pyPath = f"{pyDir}/python.exe"
     Qtinstallpath = f"D:/a/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir}"
     qmake = f"{Qtinstallpath}/bin/qmake.exe"
+    sipbuild = f"{pyDir}/Scripts/sip-build"
 elif sys.platform == "linux":
     pyPathEx = f"/opt/hostedtoolcache/Python/3.12.10/x64/bin/python"
     pyDir = f"/opt/hostedtoolcache/Python/{pythonversion}/{arch}/bin"
     pyPath = f"{pyDir}/python"
     Qtinstallpath = f"/home/runner/work/PyElaWidgetTools/Qt/{qtversion}/{qtarchdir}"
     qmake = f"{Qtinstallpath}/bin/qmake"
+    sipbuild = f"{pyDir}/sip-build"
 
 
 subprocess.run(f"{pyPath} -m pip install --upgrade pip", shell=True)
 if binding.lower().startswith("pyqt"):
     if qtversion.startswith("6"):
-        subprocess.run(f"{pyPath} -m pip install pyqt6==6.6 PyQt-builder sip", shell=True)
+        subprocess.run(
+            f"{pyPath} -m pip install pyqt6==6.6 PyQt-builder sip", shell=True
+        )
     else:
         subprocess.run(
-            f"{pyPath} -m pip install pyqt5==5.15.9 PyQt-builder==1.15 sip==6.7", shell=True
+            f"{pyPath} -m pip install pyqt5==5.15.9 PyQt-builder==1.15 sip==6.7",
+            shell=True,
         )
 elif binding.lower().startswith("pyside"):
     subprocess.run(
-        f"{pyPath} -m pip install pyside6=={qtversion} shiboken6=={qtversion} shiboken6_generator=={qtversion}", shell=True
+        f"{pyPath} -m pip install pyside6=={qtversion} shiboken6=={qtversion} shiboken6_generator=={qtversion}",
+        shell=True,
     )
 
 
@@ -76,20 +82,26 @@ def __parsefile(fn, cb):
 else:
     flags = ""
 subprocess.run(
-    f"cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt {flags}", shell=True
+    f"cmake -DELAWIDGETTOOLS_BUILD_STATIC_LIB=ON ../ElaWidgetTools/CMakeLists.txt {flags}",
+    shell=True,
 )
 subprocess.run(
-    f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}", shell=True
+    f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}",
+    shell=True,
 )
 if binding.lower().startswith("pyqt"):
     os.chdir("pyqt")
     os.mkdir("sip")
     subprocess.run(f"python gen_Def.sip.py", shell=True)
-    subprocess.run(f'python gen_widgets.py {int(qtversion.startswith("5"))}', shell=True)
-    subprocess.run(f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}', shell=True)
+    subprocess.run(
+        f'python gen_widgets.py {int(qtversion.startswith("5"))}', shell=True
+    )
+    subprocess.run(
+        f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}', shell=True
+    )
     subprocess.run(f"{pyPath} sip_code_fix.py", shell=True)
 
-    subprocess.run(rf"{pyDir}/Scripts/sip-build --verbose --qmake {qmake}", shell=True)
+    subprocess.run(f"{sipbuild} --verbose --qmake {qmake}", shell=True)
     # for _dir, _, _fs in os.walk(r"."):
     #     for _f in _fs:
     #         print(_dir, _f)
@@ -105,8 +117,12 @@ def __parsefile(fn, cb):
     os.chdir("pyqt")
     os.mkdir("sip")
     subprocess.run(f"python gen_Def.sip.py", shell=True)
-    subprocess.run(f'python gen_widgets.py {int(qtversion.startswith("5"))}', shell=True)
-    subprocess.run(f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}', shell=True)
+    subprocess.run(
+        f'python gen_widgets.py {int(qtversion.startswith("5"))}', shell=True
+    )
+    subprocess.run(
+        f'python gen_pyi_from_sip.py {int(qtversion.startswith("5"))}', shell=True
+    )
     __parsefile(
         "ElaWidgetTools.pyi",
         lambda c: c.replace("PyQt6", "PySide6").replace("pyqtSignal", "Signal"),
@@ -116,14 +132,17 @@ def __parsefile(fn, cb):
     os.chdir("pyside6")
 
     subprocess.run(
-        f'python gen_xml.py {os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} {Qtinstallpath} {pyDir}', shell=True
+        f'python gen_xml.py {os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} {Qtinstallpath} {pyDir}',
+        shell=True,
     )
 
     subprocess.run(
-        f'cmake -DMY_QT_INSTALL={Qtinstallpath} -DMY_PYTHON_INSTALL_PATH={pyDir} -DELA_LIB_PATH={os.path.abspath("../ElaWidgetTools/Release/ElaWidgetTools.lib").replace("\\", "/")} -DELA_INCLUDE_PATH={os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} ./CMakeLists.txt {flags}', shell=True
+        f'cmake -DMY_QT_INSTALL={Qtinstallpath} -DMY_PYTHON_INSTALL_PATH={pyDir} -DELA_LIB_PATH={os.path.abspath("../ElaWidgetTools/Release/ElaWidgetTools.lib").replace("\\", "/")} -DELA_INCLUDE_PATH={os.path.abspath("../../ElaWidgetTools/ElaWidgetTools").replace("\\", "/")} ./CMakeLists.txt {flags}',
+        shell=True,
     )
     subprocess.run(
-        f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}", shell=True
+        f"cmake --build ./ --config Release --target ALL_BUILD -j {os.cpu_count()}",
+        shell=True,
     )
 
     os.chdir("..")
@@ -149,7 +168,8 @@ def __parsefile(fn, cb):
 if binding.lower().startswith("pyside"):
     req = f"PySide6=={qtversion}"
 subprocess.run(
-    f"{pyPathEx} setup.py bdist_wheel {req} {('64','32')[arch == 'x86']} {binding}", shell=True
+    f"{pyPathEx} setup.py bdist_wheel {req} {('64','32')[arch == 'x86']} {binding}",
+    shell=True,
 )
 os.chdir("..")