[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk Repository.mk

[David Tardon]

 Repository.mk         |    1 +
 RepositoryExternal.mk |   17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 670690e200e82be6a087ab57599e23a320dd5dde
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Oct 20 21:06:59 2013 +0200

    fix registration path for ucpp
    
    Change-Id: I1a4d8f38dc0279bb427e07f97b96547c9d7d350f

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3877dc2..c23d894 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3033,7 +3033,7 @@ gb_ExternalExecutable__register_ucpp :=
 else # ! SYSTEM_UCPP
 
 define gb_ExternalExecutable__register_ucpp
-$(call gb_ExternalExecutable_set_internal,ucpp)
+$(call gb_ExternalExecutable_set_internal,ucpp,$(INSTROOT_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build))
 
 endef
 
commit ce038cf8d75dde575643042e57addf559eb57059
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Oct 20 20:43:46 2013 +0200

    Revert "ucpp is not an ExternalExecutable"
    
    Wrong! It is.
    
    This reverts commit 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec.

diff --git a/Repository.mk b/Repository.mk
index cb876cb..5a92fd6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -728,6 +728,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
 	genccode \
 	gencmn \
 	python \
+	ucpp \
 	xmllint \
 	xsltproc \
 ))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 20a4881..3877dc2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2953,13 +2953,11 @@ endef
 
 endif
 
-ifeq (,$(SYSTEM_UCPP))
 define gb_Executable__register_idlc
 $(call gb_Executable_add_runtime_dependencies,idlc,\
-	$(call gb_Executable_get_target_for_build,ucpp) \
+	$(call gb_ExternalExecutable_get_dependencies,ucpp) \
 )
 endef
-endif
 
 define gb_Executable__register_localize
 $(call gb_Executable_add_runtime_dependencies,localize,\
@@ -3028,6 +3026,19 @@ endef
 
 endif # SYSTEM_LIBXSLT_FOR_BUILD
 
+ifneq (,$(SYSTEM_UCPP))
+
+gb_ExternalExecutable__register_ucpp :=
+
+else # ! SYSTEM_UCPP
+
+define gb_ExternalExecutable__register_ucpp
+$(call gb_ExternalExecutable_set_internal,ucpp)
+
+endef
+
+endif # SYSTEM_UCPP
+
 ifeq (,$(PYTHON_FOR_BUILD))
 
 define gb_ExternalExecutable__register_python