[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/gbuild

[Luboš Luňák]

 solenv/gbuild/platform/com_MSC_class.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit c1f0f890f5065f88164add33707228f8c6d57555
Author: Luboš Luňák 
Date:   Mon Jul 15 14:13:13 2013 +0200

add gb_JunitTest_SOFFICEARG setting also for windows

Needed since e352abc2e60abd21e383ebf971e545ca510ac4ed .

Change-Id: I1f46a01f319703a2225386e89fc94ca286b301ca

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 45bf122..2283114 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -446,6 +446,17 @@ endef
 gb_defaultlangiso := en-US
 gb_smoketest_instset := 
$(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
 
+ifneq ($(OOO_TEST_SOFFICE),)
+gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE)
+else
+ifneq ($(gb_JunitTest_DEBUGRUN),)
+gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
+else
+gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice
+endif
+endif
+
+
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(gb_DEVINSTALLROOT)/program/soffice.exe}"
 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/gbuild

[Luboš Luňák]

 solenv/gbuild/PrecompiledHeaders.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cbdce1aef333d76468617b738293d07ddf70fad4
Author: Luboš Luňák 
Date:   Tue Jun 18 18:05:52 2013 +0200

remove PCH file before generating it

Compilers do not necessarily output all includes files when included
using a PCH, so when a PCH is being rebuilt, it might actually get
reused this way, causing its dependencies to be incomplete afterwards.
The PCH actually should not be used when being regenerated, but with MSVC
this apparently happens, even though there's only the option to create
PCH, not to use it.

Change-Id: Iee1340a60085550ab867304c44752daa04cbba31
Reviewed-on: https://gerrit.libreoffice.org/4366
Reviewed-by: Noel Power 
Tested-by: Noel Power 

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 1bc4b8a..1dddeb8 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -42,9 +42,11 @@ $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
echo "$(call gb_NoexPrecompiledHeader_get_target,$*) : 
$(gb_Helper_PHONY)" > $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
+   rm -f $@
$(call 
gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
 
 $(call gb_NoexPrecompiledHeader_get_target,%) :
+   rm -f $@
$(call 
gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE))
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call 
gb_NoExPrecompiledHeader_get_clean_target,%)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/gbuild

[Andras Timar]

 solenv/gbuild/Gallery.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77a45df7adf9597284cc789e63c07771e5d0e285
Author: Andras Timar 
Date:   Thu Jun 6 17:41:16 2013 +0200

fix .po file path in Gallery makefile

... which made localization actually work. I hope I did not
oversimplify a general scheme.

Change-Id: I942844fad6f869ad91b4c4134f06dd0b

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index bf7d72c..0273b50 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -76,7 +76,7 @@ endef
 define gb_Gallery__command_ulf
 $(call gb_Output_announce,$(2),$(true),ULF,1)
 MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
%/,%,$(dir $(GALLERY_BASEDIR))).po) > $${MERGEINPUT} && \
+echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po) 
> $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -i $(GALLERY_ULFFILE) -o $(1) 
-m $${MERGEINPUT} -l all) && \
 rm -rf $${MERGEINPUT}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits