From a59044e47b91d6351468ac339413bbd4fbb86e1d Mon Sep 17 00:00:00 2001 From: stonebig Date: Sun, 29 Jun 2025 15:49:27 +0200 Subject: [PATCH] have the target structure more already made --- make.py | 15 --------------- .../launchers_final/notebooks/docs/README.txt | 1 + .../{ => launchers_final}/scripts/WinPythonIni.py | 0 .../scripts/WinPython_PS_Prompt.ps1 | 0 .../{ => launchers_final}/scripts/activate.bat | 0 portable/{ => launchers_final}/scripts/cmd.bat | 0 portable/{ => launchers_final}/scripts/cmd_ps.bat | 0 portable/{ => launchers_final}/scripts/env.bat | 0 .../scripts/env_for_icons.bat | 0 ...ing_directory_and_userprofile_be_winpython.bat | 0 .../make_working_directory_be_not_winpython.bat | 0 .../make_working_directory_be_winpython.bat | 0 portable/{ => launchers_final}/scripts/python.bat | 0 portable/{ => launchers_final}/scripts/readme.txt | 0 .../scripts/spyder_reset.bat | 0 .../{ => launchers_final}/scripts/upgrade_pip.bat | 0 .../{ => launchers_final}/scripts/winidle.bat | 0 .../scripts/winipython_notebook.bat | 0 .../scripts/winjupyter_lab.bat | 0 .../{ => launchers_final}/scripts/winpython.bat | 0 .../{ => launchers_final}/scripts/winspyder.bat | 0 .../{ => launchers_final}/scripts/winvscode.bat | 0 portable/{ => launchers_final}/scripts/wpcp.bat | 0 23 files changed, 1 insertion(+), 15 deletions(-) create mode 100644 portable/launchers_final/notebooks/docs/README.txt rename portable/{ => launchers_final}/scripts/WinPythonIni.py (100%) rename portable/{ => launchers_final}/scripts/WinPython_PS_Prompt.ps1 (100%) rename portable/{ => launchers_final}/scripts/activate.bat (100%) rename portable/{ => launchers_final}/scripts/cmd.bat (100%) rename portable/{ => launchers_final}/scripts/cmd_ps.bat (100%) rename portable/{ => launchers_final}/scripts/env.bat (100%) rename portable/{ => launchers_final}/scripts/env_for_icons.bat (100%) rename portable/{ => launchers_final}/scripts/make_working_directory_and_userprofile_be_winpython.bat (100%) rename portable/{ => launchers_final}/scripts/make_working_directory_be_not_winpython.bat (100%) rename portable/{ => launchers_final}/scripts/make_working_directory_be_winpython.bat (100%) rename portable/{ => launchers_final}/scripts/python.bat (100%) rename portable/{ => launchers_final}/scripts/readme.txt (100%) rename portable/{ => launchers_final}/scripts/spyder_reset.bat (100%) rename portable/{ => launchers_final}/scripts/upgrade_pip.bat (100%) rename portable/{ => launchers_final}/scripts/winidle.bat (100%) rename portable/{ => launchers_final}/scripts/winipython_notebook.bat (100%) rename portable/{ => launchers_final}/scripts/winjupyter_lab.bat (100%) rename portable/{ => launchers_final}/scripts/winpython.bat (100%) rename portable/{ => launchers_final}/scripts/winspyder.bat (100%) rename portable/{ => launchers_final}/scripts/winvscode.bat (100%) rename portable/{ => launchers_final}/scripts/wpcp.bat (100%) diff --git a/make.py b/make.py index 651cb458..5781ad67 100644 --- a/make.py +++ b/make.py @@ -167,27 +167,13 @@ def _extract_python_archive(self): def _copy_essential_files(self): """Copies pre-made objects""" - self._print_action("Copying default scripts") - copy_items([PORTABLE_DIRECTORY / "scripts"], self.winpython_directory / "scripts", self.verbose) - self._print_action("Copying launchers") copy_items([PORTABLE_DIRECTORY / "launchers_final"], self.winpython_directory, self.verbose) - docs_target_directory = self.winpython_directory / "notebooks" / "docs" - self._print_action(f"Copying documentation to {docs_target_directory}") - copy_items(self.documentation_directories, docs_target_directory, self.verbose) - tools_target_directory = self.winpython_directory / "t" self._print_action(f"Copying tools to {tools_target_directory}") copy_items(self.tools_directories, tools_target_directory, self.verbose) - if (nodejs_current_directory := tools_target_directory / "n").is_dir(): - self._print_action(f"Moving tools from {nodejs_current_directory} to {tools_target_directory.parent / NODEJS_RELATIVE_PATH}") - try: - shutil.move(nodejs_current_directory, tools_target_directory.parent / NODEJS_RELATIVE_PATH) - except Exception as e: - print(f"Error moving Node.js directory: {e}") - def _create_initial_batch_scripts(self): """Creates initial batch scripts, including environment setup.""" self._print_action("Creating initial batch scripts") @@ -295,7 +281,6 @@ def make_all(build_number: int, release_level: str, pyver: str, architecture: in os.makedirs(build_directory, exist_ok=True) # use source_dirs as the directory to re-build Winpython wheel winpython_source_dir = Path(__file__).resolve().parent - # 2025-06-28 no more: rebuild_winpython_package(winpython_source_dir, Path(source_dirs), architecture, verbose) builder = WinPythonDistributionBuilder( build_number, release_level, build_directory, wheels_directory=source_dirs, diff --git a/portable/launchers_final/notebooks/docs/README.txt b/portable/launchers_final/notebooks/docs/README.txt new file mode 100644 index 00000000..a0aab429 --- /dev/null +++ b/portable/launchers_final/notebooks/docs/README.txt @@ -0,0 +1 @@ +Examples are now to be found at github.com/winpython/winpython_afterdoc \ No newline at end of file diff --git a/portable/scripts/WinPythonIni.py b/portable/launchers_final/scripts/WinPythonIni.py similarity index 100% rename from portable/scripts/WinPythonIni.py rename to portable/launchers_final/scripts/WinPythonIni.py diff --git a/portable/scripts/WinPython_PS_Prompt.ps1 b/portable/launchers_final/scripts/WinPython_PS_Prompt.ps1 similarity index 100% rename from portable/scripts/WinPython_PS_Prompt.ps1 rename to portable/launchers_final/scripts/WinPython_PS_Prompt.ps1 diff --git a/portable/scripts/activate.bat b/portable/launchers_final/scripts/activate.bat similarity index 100% rename from portable/scripts/activate.bat rename to portable/launchers_final/scripts/activate.bat diff --git a/portable/scripts/cmd.bat b/portable/launchers_final/scripts/cmd.bat similarity index 100% rename from portable/scripts/cmd.bat rename to portable/launchers_final/scripts/cmd.bat diff --git a/portable/scripts/cmd_ps.bat b/portable/launchers_final/scripts/cmd_ps.bat similarity index 100% rename from portable/scripts/cmd_ps.bat rename to portable/launchers_final/scripts/cmd_ps.bat diff --git a/portable/scripts/env.bat b/portable/launchers_final/scripts/env.bat similarity index 100% rename from portable/scripts/env.bat rename to portable/launchers_final/scripts/env.bat diff --git a/portable/scripts/env_for_icons.bat b/portable/launchers_final/scripts/env_for_icons.bat similarity index 100% rename from portable/scripts/env_for_icons.bat rename to portable/launchers_final/scripts/env_for_icons.bat diff --git a/portable/scripts/make_working_directory_and_userprofile_be_winpython.bat b/portable/launchers_final/scripts/make_working_directory_and_userprofile_be_winpython.bat similarity index 100% rename from portable/scripts/make_working_directory_and_userprofile_be_winpython.bat rename to portable/launchers_final/scripts/make_working_directory_and_userprofile_be_winpython.bat diff --git a/portable/scripts/make_working_directory_be_not_winpython.bat b/portable/launchers_final/scripts/make_working_directory_be_not_winpython.bat similarity index 100% rename from portable/scripts/make_working_directory_be_not_winpython.bat rename to portable/launchers_final/scripts/make_working_directory_be_not_winpython.bat diff --git a/portable/scripts/make_working_directory_be_winpython.bat b/portable/launchers_final/scripts/make_working_directory_be_winpython.bat similarity index 100% rename from portable/scripts/make_working_directory_be_winpython.bat rename to portable/launchers_final/scripts/make_working_directory_be_winpython.bat diff --git a/portable/scripts/python.bat b/portable/launchers_final/scripts/python.bat similarity index 100% rename from portable/scripts/python.bat rename to portable/launchers_final/scripts/python.bat diff --git a/portable/scripts/readme.txt b/portable/launchers_final/scripts/readme.txt similarity index 100% rename from portable/scripts/readme.txt rename to portable/launchers_final/scripts/readme.txt diff --git a/portable/scripts/spyder_reset.bat b/portable/launchers_final/scripts/spyder_reset.bat similarity index 100% rename from portable/scripts/spyder_reset.bat rename to portable/launchers_final/scripts/spyder_reset.bat diff --git a/portable/scripts/upgrade_pip.bat b/portable/launchers_final/scripts/upgrade_pip.bat similarity index 100% rename from portable/scripts/upgrade_pip.bat rename to portable/launchers_final/scripts/upgrade_pip.bat diff --git a/portable/scripts/winidle.bat b/portable/launchers_final/scripts/winidle.bat similarity index 100% rename from portable/scripts/winidle.bat rename to portable/launchers_final/scripts/winidle.bat diff --git a/portable/scripts/winipython_notebook.bat b/portable/launchers_final/scripts/winipython_notebook.bat similarity index 100% rename from portable/scripts/winipython_notebook.bat rename to portable/launchers_final/scripts/winipython_notebook.bat diff --git a/portable/scripts/winjupyter_lab.bat b/portable/launchers_final/scripts/winjupyter_lab.bat similarity index 100% rename from portable/scripts/winjupyter_lab.bat rename to portable/launchers_final/scripts/winjupyter_lab.bat diff --git a/portable/scripts/winpython.bat b/portable/launchers_final/scripts/winpython.bat similarity index 100% rename from portable/scripts/winpython.bat rename to portable/launchers_final/scripts/winpython.bat diff --git a/portable/scripts/winspyder.bat b/portable/launchers_final/scripts/winspyder.bat similarity index 100% rename from portable/scripts/winspyder.bat rename to portable/launchers_final/scripts/winspyder.bat diff --git a/portable/scripts/winvscode.bat b/portable/launchers_final/scripts/winvscode.bat similarity index 100% rename from portable/scripts/winvscode.bat rename to portable/launchers_final/scripts/winvscode.bat diff --git a/portable/scripts/wpcp.bat b/portable/launchers_final/scripts/wpcp.bat similarity index 100% rename from portable/scripts/wpcp.bat rename to portable/launchers_final/scripts/wpcp.bat