diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-12-02 21:52:23 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-12-02 21:52:23 +0100 |
| commit | 8f4ddb1910495419a8b7af84ec7dc738958ae79c (patch) | |
| tree | 0ae598854ccf2d86a4a3f9c0e11c65a716398856 /pyuno | |
| parent | 918e2682a3b7b9af1f4a3ec3a38c3735062bd8c9 (diff) | |
pyuno: clean up that zipcore a little
That $(shell find...) is now entirely pointless with python3 in
tail_build; depend on package instead.
Change-Id: Iacc8a7d201f8ec2e41adf3e2351a755e955c0997
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index 6b3742499c4a..5f1694ec489b 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -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: |