[Libreoffice-commits] .: 4 commits - solenv/gbuild

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 23 05:05:44 PDT 2012 

 solenv/gbuild/CliAssembly.mk            |    1 +
 solenv/gbuild/CliLibrary.mk             |    1 +
 solenv/gbuild/UI.mk                     |    6 +++---
 solenv/gbuild/WinResTarget.mk           |    2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    4 ++--
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 468acb7f521317dbededd0c31a6cfae979446104
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 23 14:02:38 2012 +0200

    fix really stupid typo
    
    Change-Id: I8b51dfb8162ae44729d06f952bcbbec5553ae722

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index f0b8942..2c6435e 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -12,7 +12,7 @@
 gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
 
 gb_UILocalizeTarget_TARGET := $(call gb_Executable_get_target_for_build,uiex)
-gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ldpath) $(gb_UILocalizeTarget_TARGET)
+gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_UILocalizeTarget_TARGET)
 
 define gb_UILocalizeTarget__command
 $(call gb_Output_announce,$(2),$(true),UIX,1)
commit fd10c84159131e027aae4be065b446dd24f916e2
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 23 13:26:18 2012 +0200

    fix deps
    
    Change-Id: Ib97b7554af9226156f38497dc83073a98ce610ea

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 509a087..f0b8942 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -46,8 +46,8 @@ $(call gb_UILocalizeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir $(2
 $(call gb_UILocalizeTarget_get_target,$(1)) : UI_FILE := $(SRCDIR)/$(2).ui
 $(call gb_UILocalizeTarget_get_target,$(1)) : UI_LANG := $(3)
 
-$(call gb_UILocalizeTarget_get_target,$(1)) : $$(SDF)
-$(call gb_UILocalizeTarget_get_target,$(1)) : $$(UI_FILE)
+$(call gb_UILocalizeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir $(2))localize.sdf
+$(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(2).ui
 $(call gb_UILocalizeTarget_get_target,$(1)) :| $(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir
 
 endef
commit be6057df8981ca06bd8d6e5be2754ff3a3f0a7c7
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 23 09:18:24 2012 +0200

    disable ego messages
    
    Change-Id: I60466feee57af3db5b8ecb9d9af1121b5ef19f8b

diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 82e2f50..f8c6fdb 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -56,6 +56,7 @@ define gb_CliAssemblyTarget__command
 $(call gb_Output_announce,$(2),$(true),AL ,2)
 $(call gb_Helper_abbreviate_dirs,\
 	al \
+		-nologo \
 		-out:$(CLI_ASSEMBLY_OUTFILE) \
 		-version:$(CLI_ASSEMBLY_VERSION) \
 		-keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 9cf6bd5..331da33 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -13,6 +13,7 @@ gb_CliLibraryTarget_EXT := $(gb_CliAssembly_POLICYEXT)
 
 gb_CliLibraryTarget_CSCFLAGS := \
 	-noconfig \
+	-nologo \
 
 gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
 	-checked+ \
commit 6761a84ef77b4f5be88ecbad990316042f8fb244
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 23 08:55:14 2012 +0200

    change announce code for WinResTarget
    
    Change-Id: I036ee8686472cc8ce05dbab505ea31de9f81da94

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index cb683c2..62e4bbf 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -36,7 +36,7 @@ $(call gb_WinResTarget_get_target,%) :
 	$(call gb_WinResTarget__command,$@,$*,$<)
 
 $(call gb_WinResTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),RES,3)
+	$(call gb_Output_announce,$*,$(false),RC ,3)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f $(call gb_WinResTarget_get_target,$*) \
 			$(call gb_WinResTarget_get_dep_target,$*))
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 3563a6b..525bc1e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -343,7 +343,7 @@ endef
 gb_WinResTarget_POSTFIX :=.o
 
 define gb_WinResTarget__command
-$(call gb_Output_announce,$(2),$(true),RES,3)
+$(call gb_Output_announce,$(2),$(true),RC ,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_RC) \
@@ -359,7 +359,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
-$(call gb_Output_announce,RES:$(2),$(true),DEP,1)
+$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(OUTDIR_FOR_BUILD)/bin/makedepend \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 4b30777..8e02e17 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -652,7 +652,7 @@ endif
 gb_WinResTarget_POSTFIX :=.res
 
 define gb_WinResTarget__command
-$(call gb_Output_announce,$(2),$(true),RES,1)
+$(call gb_Output_announce,$(2),$(true),RC ,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_RC) \
@@ -668,7 +668,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
-$(call gb_Output_announce,RES:$(2),$(true),DEP,1)
+$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \

More information about the Libreoffice-commits mailing list