[Libreoffice-commits] core.git: 2 commits - solenv/gbuild svl/source sw/Module_sw.mk
Michael Meeks
michael.meeks at suse.com
Sun Jun 16 04:04:46 PDT 2013
solenv/gbuild/PythonTest.mk | 10 +++++-----
solenv/gbuild/platform/com_MSC_class.mk | 1 -
svl/source/numbers/zforfind.cxx | 6 ++++++
sw/Module_sw.mk | 2 --
4 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit c6e8f302e634112781929e398fe6874b9a762adf
Author: Michael Meeks <michael.meeks at suse.com>
Date: Sun Jun 16 12:03:24 2013 +0100
initialize number scanner.
Change-Id: I259754957a5ff7d07d5d6e4a252c3460f236f034
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index bd68ab4..9fdc167 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -139,6 +139,12 @@ void ImpSvNumberInputScan::Reset()
nDatePatternStart = 0;
nDatePatternNumbers = 0;
nCanForceToIso8601 = 0;
+
+ for (sal_uInt32 i = 0; i < SV_MAX_ANZ_INPUT_STRINGS; i++)
+ {
+ IsNum[i] = false;
+ nNums[i] = 0;
+ }
}
commit 2efac6b4d53821ef9167f3e04f205e1f6ae28638
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sun Jun 16 11:32:39 2013 +0200
Another try to fix python unit test on MSVC
Change-Id: I66734830ef228b6928b24194f278632fa9f2c70c
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
old mode 100644
new mode 100755
index eaa8757..931af98
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -40,9 +40,9 @@ $(call gb_PythonTest_get_target,%) :
($(gb_PythonTest_PRECOMMAND) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
- URE_BOOTSTRAP=vnd.sun.star.pathname:$(gb_DEVINSTALLROOT)/program/fundamentalrc \
- PYTHONPATH=$(PYPATH) \
- UserInstallation="$(call gb_Helper_make_url,$(OUTDIR)/unittest)" \
+ URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/program/fundamental) \
+ PYTHONPATH="$(PYPATH)" \
+ UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \
TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_PythonTest_COMMAND) \
$(MODULES) \
@@ -55,7 +55,7 @@ $(call gb_PythonTest_get_target,%) :
# always use udkapi and URE services
define gb_PythonTest_PythonTest
-$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python:$(gb_DEVINSTALLROOT)/program
+$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/program
$(call gb_PythonTest_get_target,$(1)) : MODULES :=
$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
@@ -70,7 +70,7 @@ endef
#
# gb_PythonTest_add_modules directory module(s)
define gb_PythonTest_add_modules
-$(call gb_PythonTest_get_target,$(1)) : PYPATH := $$(PYPATH):$(2)
+$(call gb_PythonTest_get_target,$(1)) : PYPATH := $$(PYPATH)$$(gb_CLASSPATHSEP)$(2)
$(call gb_PythonTest_get_target,$(1)) : MODULES += $(3)
endef
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 478a89b..0d050dd 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -452,7 +452,6 @@ endef
# PythonTest class
-#TODO:
gb_PythonTest_PRECOMMAND :=
# SrsPartTarget class
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
old mode 100644
new mode 100755
index 202c67c..7048d8e
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -72,11 +72,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
endif
ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
PythonTest_sw_python \
))
endif
-endif
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list