diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-21 14:34:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-22 11:33:25 +0000 |
| commit | b6bcbb675afedba0c47654dd78dc446dac0630d1 (patch) | |
| tree | 029c1e80c0b7248149e4eb46381ed15901d3013b /pyuno/CustomTarget_zipcore.mk | |
| parent | 60a466c0363eaa9b2692323f4d2ac98683366c3b (diff) | |
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 <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'pyuno/CustomTarget_zipcore.mk')
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index 35be5d9cfee2..06d98fe03fc6 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -33,7 +33,7 @@ ifeq ($(OS)$(COM),WNTGCC) pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) endif else -pyuno_PYTHON_LIB_DIR=$(OUTDIR)/lib/python +$(error SHOULD NOT GET HERE) endif pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip |