[Libreoffice-commits] core.git: 3 commits - solenv/gbuild

[David Tardon]

 solenv/gbuild/ExternalPackage.mk |    8 ++++++++
 solenv/gbuild/PythonTest.mk      |    8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit fbcdc3ec24e107736f4952b3d42504f9f8035b63
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 17:06:23 2014 +0200

    fix deps for PythonTest
    
    System python can be used for build even if the bundled python is
    enabled, c.f. --enable-python=internal vs. fully-internal. We need to
    use the python that is used at runtime, not for building.
    
    Change-Id: Ia1cd0b787d23645ce469e6975d90f01239256b9b

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 23bcd16..24554f2 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -12,9 +12,15 @@
 ifeq ($(SYSTEM_PYTHON),)
 gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
 gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
+ifeq ($(OS),MACOSX)
+gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target_for_build,python3)
+else
+gb_PythonTest_DEPS := $(call gb_Package_get_target_for_build,python3)
+endif
 else
 gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD)
 gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)
+gb_PythonTest_DEPS :=
 endif
 
 gb_PythonTest_COMMAND := $(gb_PythonTest_EXECUTABLE) -m unittest
@@ -29,7 +35,7 @@ ifneq ($(DISABLE_PYTHON),TRUE)
 # pass a hard-coded 139 to the gdb postprocess script to match soffice.bin
 # signal exit values (assumption: non-0 exit value here means it crashed)
 .PHONY : $(call gb_PythonTest_get_target,%)
-$(call gb_PythonTest_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,python)
+$(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
 	$(call gb_Output_announce,$*,$(true),PYT,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \
commit 1961b699400f09f5ae83dac105a1ba1f6334db53
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 16:22:48 2014 +0200

    order-only dep is enough
    
    Change-Id: Ie040f95a92eb2fc3b68e5310103388a01cfd4fdf

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index cd12661..23bcd16 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -29,7 +29,7 @@ ifneq ($(DISABLE_PYTHON),TRUE)
 # pass a hard-coded 139 to the gdb postprocess script to match soffice.bin
 # signal exit values (assumption: non-0 exit value here means it crashed)
 .PHONY : $(call gb_PythonTest_get_target,%)
-$(call gb_PythonTest_get_target,%) : $(call gb_ExternalExecutable_get_dependencies,python)
+$(call gb_PythonTest_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$*,$(true),PYT,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \
commit 3f2d15387da499f465e3e345dc7b97ecf296c65c
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 18 16:17:02 2014 +0200

    add missing function
    
    Change-Id: I911d1131a91f0a5baea3324c0d48cb4fa5c5c344

diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index b80bc11..670106b 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -184,6 +184,14 @@ $(call gb_ExternalPackage__add_files,$(1),$(3))
 
 endef
 
+# Package files from unpacked tarball of an external project
+#
+# gb_ExternalPackage_use_unpacked package unpacked
+define gb_ExternalPackage_use_unpacked
+$(call gb_Package_use_unpacked,$(1),$(2))
+
+endef
+
 # Package files from build of an external project
 #
 # gb_ExternalPackage_use_external_project package external