[Libreoffice-commits] .: 2 commits - pyuno/CustomTarget_zipcore.mk solenv/gbuild

[Libreoffice Gerrit user]

 pyuno/CustomTarget_zipcore.mk |   14 ++++----------
 solenv/gbuild/gbuild.mk       |    4 +++-
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 3cfbc3409a0bacbdd6572be2c39c004611778bfc
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Dec 2 22:15:46 2012 +0100

    gbuild: call gb_ExternalExecutable_collect_registrations...
    
    ...after reading platform makefile because at least python uses platform
    dependent gb_PYTHON_PRECOMMAND.
    
    Change-Id: I894dfd56b4a96828556f657ae63c6f69eebdea0b

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 06a9dca..23b580a 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -168,7 +168,6 @@ $(eval $(call gb_Helper_init_registries))
 include $(SRCDIR)/Repository.mk
 include $(SRCDIR)/RepositoryExternal.mk
 $(eval $(call gb_Helper_collect_knownlibs))
-$(eval $(call gb_ExternalExecutable_collect_registrations))
 
 gb_Library_DLLPOSTFIX := lo
 
@@ -177,6 +176,9 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
 include $(SRCDIR)/RepositoryFixes.mk
 
+# after platform; at least currently python depends on variable set in platform
+$(eval $(call gb_ExternalExecutable_collect_registrations))
+
 # add user-supplied flags
 ifneq ($(strip gb__ENV_CFLAGS),)
 gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS)
commit 8f4ddb1910495419a8b7af84ec7dc738958ae79c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Dec 2 21:52:23 2012 +0100

    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

diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk
index 6b37424..5f1694e 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: