mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pyuno: clean up that zipcore a little

Browse Source 
That $(shell find...) is now entirely pointless with python3 in
tail_build; depend on package instead.

Change-Id: Iacc8a7d201f8ec2e41adf3e2351a755e955c0997
This commit is contained in:
Michael Stahl
2012-12-02 21:52:23 +01:00
parent 918e2682a3
commit 8f4ddb1910
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pyuno/CustomTarget_zipcore.mk
View File

@@ -37,21 +37,15 @@ pyuno_PYTHON_LIB_DIR=$(OUTDIR)/lib/python
endif
pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip
FIND=find
GREP=grep
$(call gb_CustomTarget_get_target,pyuno/zipcore) : \
$(call gb_CustomTarget_get_workdir,pyuno/zipcore)/$(pyuno_PYTHON_ARCHIVE_NAME)
# capture the files to have them in prerequisite list
pyuno_zipcore_FINDLIBFILES:=\
$(shell $(FIND) $(pyuno_PYTHON_LIB_DIR) -type f| $(GREP) -v "\.pyc" | $(GREP) -v "\.py~" | $(GREP) -v .orig | $(GREP) -v _failed)
# 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_ExternalPackage_get_target,python3)
$(call gb_CustomTarget_get_workdir,pyuno/zipcore)/$(pyuno_PYTHON_ARCHIVE_NAME) \
: $(call gb_ExternalPackage_get_target,python3) \
| $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/.dir
$(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)
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)
# vim: set noet sw=4 ts=4: