From b6bcbb675afedba0c47654dd78dc446dac0630d1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sun, 21 Apr 2013 14:34:50 +0200 Subject: 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 Reviewed-on: https://gerrit.libreoffice.org/3525 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- pyuno/Module_pyuno.mk | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'pyuno/Module_pyuno.mk') diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index a4f7663c44cd..1749e675e554 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -62,26 +62,12 @@ $(eval $(call gb_Module_add_targets,pyuno,\ CustomTarget_python_shell \ Package_python_shell \ )) -ifneq ($(OS),MACOSX) -$(eval $(call gb_Module_add_targets,pyuno,\ - CustomTarget_python_bin \ - Package_python_bin \ -)) -endif -endif - -# python-zipcore-$(PYVESION) not on MACOSX -# (OOoPython.framework.zip is already delivered for MACOSX in python module) -ifneq ($(OS),MACOSX) -$(eval $(call gb_Module_add_targets,pyuno,\ - CustomTarget_zipcore \ - Package_zipcore \ -)) endif else # SYSTEM_PYTHON -# previous two targets has to be executed also with system-python on mingw +# these two targets have to be executed only with system-python on mingw +# FIXME remove this ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_Module_add_targets,pyuno,\ CustomTarget_zipcore \ -- cgit