[PATCH] replace python-core zip built in pyuno with direct use of Pa...
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3525 to look at the new rebased patch set (#3). Change subject: replace python-core zip built in pyuno with direct use of Package .. replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset and do not deliver .lib files - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for system python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR and link against libraries in UnpackedTarball dir Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 --- M RepositoryExternal.mk M python3/ExternalPackage_python3.mk M pyuno/CustomTarget_zipcore.mk M pyuno/Module_pyuno.mk M scp2/source/python/file_python.scp M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 9 files changed, 72 insertions(+), 116 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/3 -- To view, visit https://gerrit.libreoffice.org/3525 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] replace python-core zip built in pyuno with direct use of Pa...
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3525 to look at the new rebased patch set (#4). Change subject: replace python-core zip built in pyuno with direct use of Package .. replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset and do not deliver .lib files - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for system python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR and link against libraries in UnpackedTarball dir Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 --- M RepositoryExternal.mk M python3/ExternalPackage_python3.mk M pyuno/CustomTarget_zipcore.mk M pyuno/Module_pyuno.mk M scp2/source/python/file_python.scp M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 9 files changed, 72 insertions(+), 116 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/4 -- To view, visit https://gerrit.libreoffice.org/3525 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] replace python-core zip built in pyuno with direct use of Pa...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3525 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/1 replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for system python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 --- M RepositoryExternal.mk M python3/ExternalPackage_python3.mk M pyuno/CustomTarget_zipcore.mk M pyuno/Module_pyuno.mk M scp2/source/python/file_python.scp M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 9 files changed, 70 insertions(+), 113 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index df44d2d..5015f90 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2888,8 +2888,8 @@ else -$(call gb_ExternalExecutable_set_internal,python) -$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) +$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/program/python$(if $(filter WNT,$(OS)),.exe,.bin)) +$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) endif diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index 4f9c833..1d11487 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -9,20 +9,22 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3)) +$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTDIR))) + $(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) ifeq ($(OS)-$(COM),WNT-MSC) ifeq ($(CPUNAME),X86_64) python_arch_subdir=amd64/ endif -$(eval $(call gb_ExternalPackage_add_file,python3,bin/python.exe,LO_lib/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe)) -$(eval $(call gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll)) -$(eval $(call gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib)) +$(eval $(call gb_ExternalPackage_add_file,python3,program/python-core-$(PYTHON_VERSION)/bin/python.exe,LO_lib/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe)) +$(eval $(call gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll)) +$(eval $(call gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib)) ifeq ($(MSVC_USE_DEBUG_RUNTIME),) -$(eval $(call gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll)) -$(eval $(call gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).lib)) +$(eval $(call gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll)) +$(eval $(call gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).lib)) endif -$(eval $(call gb_ExternalPackage_add_files,python3,lib/python,\ +$(eval $(call gb_ExternalPackage_add_files,python3,program/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\ LO_lib/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ LO_lib/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ LO_lib/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ @@ -40,13 +42,13 @@ )) else ifeq ($(OS),WNT) # MinGW # TODO how are C modules called on this platform? -$(eval $(call gb_ExternalPackage_add_file,python3,bin/python.exe,python.exe)) -$(eval $(call
[PATCH] replace python-core zip built in pyuno with direct use of Pa...
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3525 to look at the new patch set (#2). Change subject: replace python-core zip built in pyuno with direct use of Package .. replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset and do not deliver .lib files - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for system python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR and link against libraries in UnpackedTarball dir Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 --- M RepositoryExternal.mk M python3/ExternalPackage_python3.mk M pyuno/CustomTarget_zipcore.mk M pyuno/Module_pyuno.mk M scp2/source/python/file_python.scp M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 9 files changed, 72 insertions(+), 116 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/2 -- To view, visit https://gerrit.libreoffice.org/3525 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
