[Libreoffice-commits] core.git: Branch 'feature/gengalr' - solenv/gbuild

[Michael Meeks]

 solenv/gbuild/Gallery.mk                   |    4 ++--
 solenv/gbuild/TargetLocations.mk           |    2 +-
 solenv/gbuild/extensions/pre_BuildTools.mk |    9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 27d886903642fc822b03da48b2094ebcdc430d70
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon May 13 17:16:56 2013 +0100

    gallery: use icerun for building, and tweak for windows use.
    
    Change-Id: Ic9e30661f05506b3616eaf417f8e3deed7290830

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0e3f84b..7b28238 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
 	SAL_USE_VCLPLUGIN=svp \
-	$(call gb_Executable_get_command,gengal.bin) \
+	$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
 		$(call gb_Gallery__make_env_args) \
 		--build-tree \
 		--destdir $(GALLERY_BASEDIR) \
@@ -78,7 +78,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_Gallery_get_target,%) : \
-		$(call gb_Executable_get_runtime_dependencies,gengal.bin) \
+		$(call gb_Executable_get_runtime_dependencies,$(gb_GENGAL)) \
 		$(gb_Gallery_EXTRA_DEPENCENCIES)
 	$(call gb_Gallery__command,$@,$*)
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1757e84..a91e0b4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -399,7 +399,7 @@ endef
 #
 # gb_Executable_get_command executable
 define gb_Executable_get_command
-$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1))
+$(gb_Helper_set_ld_path) $(2) $(call gb_Executable_get_target_for_build,$(1))
 endef
 
 gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index eea1bbb..51d8641 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -7,6 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+
+ifeq (,$(filter WNT,$(OS)))
+	gb_GENGAL = gengal.bin
+else
+	gb_GENGAL = gengal.exe
+endif
+
 # Tools we need to build for cross-compiling
 gb_BUILD_TOOLS = \
 	$(foreach executable, \
@@ -38,7 +45,7 @@ gb_BUILD_TOOLS = \
 		ulfex \
 		xrmex \
 		$(call gb_Helper_optional_for_host,DESKTOP, \
-			gengal.bin \
+			$(gb_GENGAL) \
 			HelpIndexer \
 			HelpLinker \
 		) \