diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 14:59:45 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 14:43:03 +0000 |
| commit | 6cac17078c46df312ef145d1c5a136848204c107 (patch) | |
| tree | 7d3e693b823a549f3028e90c42e2f3fcf7efe662 | |
| parent | eb5056dc2eb1bed5dffeca889810b0a5d5246b11 (diff) | |
install python framework using filelist
Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1
Reviewed-on: https://gerrit.libreoffice.org/3779
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | python3/GeneratedPackage_python3.mk | 18 | ||||
| -rw-r--r-- | python3/Module_python3.mk | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 6 | ||||
| -rw-r--r-- | solenv/gbuild/GeneratedPackage.mk | 8 |
4 files changed, 27 insertions, 7 deletions
diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk new file mode 100644 index 000000000000..91e62bd42807 --- /dev/null +++ b/python3/GeneratedPackage_python3.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO)) + +$(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) + +$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) + +$(eval $(call gb_GeneratedPackage_add_dir,python3,program/LibreOfficePython.framework,LibreOfficePython.framework)) + +# vim: set noet sw=4 ts=4: diff --git a/python3/Module_python3.mk b/python3/Module_python3.mk index 831f79e4a16e..eb2ec39ecb0b 100644 --- a/python3/Module_python3.mk +++ b/python3/Module_python3.mk @@ -15,7 +15,7 @@ ifeq ($(SYSTEM_PYTHON),NO) $(eval $(call gb_Module_add_targets,python3,\ UnpackedTarball_python3 \ ExternalProject_python3 \ - $(if $(filter MACOSX,$(OS)),Zip_PythonFramework,ExternalPackage_python3) \ + $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ )) endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index c065ea4dbd9c..f6b4e83c8f31 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -104,15 +104,9 @@ End File gid_File_Py_Python_Core //FIXME the binaries and libs in the package need x bit but USE_INTERNAL_RIGHTS does not work so set BIN_FILE_BODY here as a temporary hack which makes everything executable BIN_FILE_BODY; - #ifdef MACOSX - Dir = gid_Brand_Dir_Program; - Name = "LibreOfficePython.framework.zip"; - Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); - #else Dir = FILELIST_DIR; Name = "python3.filelist"; Styles = (FILELIST,USE_INTERNAL_RIGHTS); - #endif End #ifdef WNT diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index 91714e9b7387..893f929cbb45 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -97,6 +97,14 @@ $(call gb_GeneratedPackage_get_target,$(1)) : $(call gb_UnpackedTarball_get_targ endef +# Depend on an external project. +# +# gb_GeneratedPackage_use_external_project package project +define gb_GeneratedPackage_use_external_project +$(call gb_GeneratedPackage_get_target,$(1)) : $(call gb_ExternalProject_get_target,$(2)) + +endef + # Add a dir to the package. # # The srcdir will be copied to $(INSTDIR) as destdir. |