Refactor build scripts to enhance cross-platform compatibility and remove redundant code

kullik01 · kullik01 · commit e308ba1d0770 · 2025-07-21T12:29:53.000+02:00
diff --git a/automations/build_exe.py b/automations/build_exe.py
@@ -23,7 +23,7 @@
 
 
 class BuildExe:
-  """Contains the logic for building the macOS EXE file."""
+  """Contains the logic for building the EXE file."""
 
   def __init__(self) -> None:
     """Constructor."""
@@ -45,6 +45,9 @@ def setup_build_environment(self) -> None:
     tmp_edited_init_py_filepath = pathlib.Path(
       const.PROJECT_ROOT_DIR / "edited/pymol", "__init__.py"
     )
+    tmp_edited_startup_wrapper_py_filepath = pathlib.Path(
+      const.PROJECT_ROOT_DIR / "edited/pymol", "startup_wrapper.py"
+    )
     tmp_alternative_logo_filepath = pathlib.Path(
       const.PROJECT_ROOT_DIR / "alternative_design" / "alt_logo.png"
     )
@@ -65,6 +68,10 @@ def setup_build_environment(self) -> None:
       tmp_edited_init_py_filepath,
       pathlib.Path(const.PYMOL_PACKAGE_DIR / "__init__.py")
     )
+    shutil.copy(
+      tmp_edited_startup_wrapper_py_filepath,
+      pathlib.Path(const.PYMOL_PACKAGE_DIR / "startup_wrapper.py")
+    )
     shutil.copy(
       tmp_alternative_logo_filepath,
       pathlib.Path(const.PYMOL_PACKAGE_DIR / "data/pymol/icons", "alt_logo.png")
diff --git a/edited/pymol/startup_wrapper.py b/edited/pymol/startup_wrapper.py
@@ -4,16 +4,3 @@
 
 if __name__ == '__main__':
   pymol.launch(sys.argv)
-
-# <editor-fold desc="Coping startup_wrapper script into the application package">
-# Definition
-tmp_edited_startup_wrapper_py_filepath = pathlib.Path(
-  const.PROJECT_ROOT_DIR / "edited/pymol", "startup_wrapper.py"
-)
-
-# Copy
-shutil.copy(
-  tmp_edited_startup_wrapper_py_filepath,
-  pathlib.Path(const.PYMOL_PACKAGE_DIR / "startup_wrapper.py")
-)
-# </editor-fold>
diff --git a/os_specific/linux/setup_build_exe.py b/os_specific/linux/setup_build_exe.py
@@ -54,17 +54,3 @@
     }
   ],
 )
-
-
-# <editor-fold desc="Coping Linux build script into the application package">
-# Definition
-tmp_os_specific_build_exe_filepath = pathlib.Path(
-  const.OS_SPECIFIC_SETUP_BUILD_EXE
-)
-
-# Copy
-shutil.copy(
-  tmp_os_specific_build_exe_filepath,
-  pathlib.Path(const.PYMOL_PACKAGE_DIR / "setup_build_exe.py")
-)
-# </editor-fold>
diff --git a/os_specific/macos/setup_build_exe.py b/os_specific/macos/setup_build_exe.py
@@ -59,16 +59,3 @@
     }
   ],
 )
-
-# <editor-fold desc="Coping macOS build script into the application package">
-# Definition
-tmp_os_specific_build_exe_filepath = pathlib.Path(
-  const.OS_SPECIFIC_SETUP_BUILD_EXE
-)
-
-# Copy
-shutil.copy(
-  tmp_os_specific_build_exe_filepath,
-  pathlib.Path(const.PYMOL_PACKAGE_DIR / "setup_build_exe.py")
-)
-# </editor-fold>
diff --git a/os_specific/windows/setup_build_exe.py b/os_specific/windows/setup_build_exe.py
@@ -53,16 +53,3 @@
     }
   ],
 )
-
-# <editor-fold desc="Coping Windows build script into the application package">
-# Definition
-tmp_os_specific_build_exe_filepath = pathlib.Path(
-  const.OS_SPECIFIC_SETUP_BUILD_EXE
-)
-
-# Copy
-shutil.copy(
-  tmp_os_specific_build_exe_filepath,
-  pathlib.Path(const.PYMOL_PACKAGE_DIR / "setup_build_exe.py")
-)
-# </editor-fold>
