diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-11-27 20:50:38 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-11-30 11:34:30 -0500 |
| commit | 921f31fb3629fe3bf278ddb49aacf28e0ffdeafe (patch) | |
| tree | 09333c7a7c811b612bfd009f4c77b120a653685f | |
| parent | ec6af4194e80f5f0b2e46ca59802ff397a2a4a24 (diff) | |
add python3 to tail_build
Change-Id: I01c3d280b4ff05ddbce77343ced6934b26bd3ceb
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 1 | ||||
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 3 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk index e0664bb39765..61fcc4356e1a 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -131,6 +131,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ padmin \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ psprint_config \ + $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4c0f83f725b4..5f02c49df08b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1967,6 +1967,7 @@ endef else # !SYSTEM_PYTHON define gb_LinkTarget__use_python_headers +$(call gb_LinkTarget_use_package,$(1),python3) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,python3) \ -I$(call gb_UnpackedTarball_get_dir,python3)/PC \ diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index dc2f5603c14f..6b3742499c4a 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -49,7 +49,8 @@ pyuno_zipcore_FINDLIBFILES:=\ # create zip archive $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/$(pyuno_PYTHON_ARCHIVE_NAME) : $(pyuno_zipcore_FINDLIBFILES) | \ - $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/.dir + $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/.dir \ + $(call gb_ExternalPackage_get_target,python3) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1) cd $(pyuno_PYTHON_LIB_DIR) && zip $@ $(shell cd $(pyuno_PYTHON_LIB_DIR) && $(FIND) . -type f | $(GREP) -v "\.pyc" | $(GREP) -v "\.py~" | $(GREP) -v .orig | $(GREP) -v _failed) diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 809069859e08..ac96f9ea2575 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL +tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL |