Makefile.in | 1 cli_ure/Executable_climaker.mk | 5 -- cli_ure/Library_cli_cppuhelper_native.mk | 5 -- cli_ure/Library_cli_uno.mk | 5 -- configure.ac | 4 ++ python3/ExternalPackage_python3.mk | 1 python3/ExternalProject_python3.mk | 9 ++--- python3/python-3.3.0-aix.patch.1 | 9 ----- sw/PythonTest_sw_unoapi.mk | 4 +- sw/qa/python/get_expression.py | 53 +++++++++++++++++++++++++++++++ sw/qa/python/set_expression.py | 40 +++++++++++++++++++++++ sw/qa/unoapi/python/get_expression.py | 53 ------------------------------- sw/qa/unoapi/python/set_expression.py | 40 ----------------------- 13 files changed, 108 insertions(+), 121 deletions(-)
New commits: commit b9e6bd790f99b9018ea0a594cca8efcb1709c5e7 Author: Michael Stahl <mst...@redhat.com> Date: Fri Apr 19 00:06:28 2013 +0200 configure: try to make all PYTHON variables point to the same thing Change-Id: Ifa6a22717d6911b1f5dd816144d3ee95a09879a3 diff --git a/configure.ac b/configure.ac index a70bfd2..8451b74 100644 --- a/configure.ac +++ b/configure.ac @@ -7499,6 +7499,10 @@ if test $enable_python = system; then AC_MSG_ERROR([no usable python found])]) test -n "$PYTHON_CFLAGS" && break fi + # let the PYTHON_FOR_BUILD match the same python installation that + # provides PYTHON_CFLAGS/PYTHON_LDFLAGS for pyuno, which should be + # better for PythonTests. + PYTHON_FOR_BUILD=$PYTHON fi dnl By now enable_python should be "system", "internal" or "no" commit 5bdf9edc622b84319756ad45569ad7be1865cb4f Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 23:17:30 2013 +0200 sw: move Python tests out of qa/unoapi Change-Id: I4f9655b1df27bec2a7571d43921f962d3a420bb5 diff --git a/sw/PythonTest_sw_unoapi.mk b/sw/PythonTest_sw_unoapi.mk index afaf86d..20c6549 100644 --- a/sw/PythonTest_sw_unoapi.mk +++ b/sw/PythonTest_sw_unoapi.mk @@ -49,8 +49,8 @@ $(eval $(call gb_PythonTest_use_components,sw_unoapi,\ )) $(eval $(call gb_PythonTest_add_classes,sw_unoapi,\ - $(SRCDIR)/sw/qa/unoapi/python/set_expression.py \ - $(SRCDIR)/sw/qa/unoapi/python/get_expression.py \ + $(SRCDIR)/sw/qa/python/set_expression.py \ + $(SRCDIR)/sw/qa/python/get_expression.py \ )) # vim: set noet sw=4 ts=4: diff --git a/sw/qa/python/get_expression.py b/sw/qa/python/get_expression.py new file mode 100644 index 0000000..5ac49f8 --- /dev/null +++ b/sw/qa/python/get_expression.py @@ -0,0 +1,53 @@ +import unittest +from org.libreoffice.unotest import UnoNotConnection as UnoConnection + +class TestGetExpression(unittest.TestCase): + _unoCon = None + _xDoc = None + + @classmethod + def setUpClass(cls): + cls._unoCon = UnoConnection({}) + cls._unoCon.setUp() + cls._xDoc = cls._unoCon.openEmptyWriterDoc() + + @classmethod + def tearDownClass(cls): + cls._unoCon.tearDown() + + def test_get_expression(self): + self.__class__._unoCon.checkProperties( + self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), + {"Content": "foo", + "CurrentPresentation": "bar", + "NumberFormat": 0, + "IsShowFormula": False, + "SubType": 0, + "VariableSubtype": 1, + "IsFixedLanguage": False, + }, + self + ) + + # property 'Value' is read only? + @unittest.expectedFailure + def test_get_expression_veto_read_only(self): + self.__class__._unoCon.checkProperties( + self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), + {"Value": 0.0}, + self + ) + + # property 'NumberingType' is unknown? + @unittest.expectedFailure + def test_get_expression_unknown_property(self): + self.__class__._unoCon.checkProperties( + self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), + {"NumberingType": 0}, + self + ) + + +if __name__ == '__main__': + unittest.main() + diff --git a/sw/qa/python/set_expression.py b/sw/qa/python/set_expression.py new file mode 100644 index 0000000..d88d2f3 --- /dev/null +++ b/sw/qa/python/set_expression.py @@ -0,0 +1,40 @@ +import unittest +from org.libreoffice.unotest import UnoNotConnection as UnoConnection + +#@unittest.skip("that seems to work") +class TestSetExpresion(unittest.TestCase): + _unoCon = None + _xDoc = None + + @classmethod + def setUpClass(cls): + cls._unoCon = UnoConnection({}) + cls._unoCon.setUp() + cls._xDoc = cls._unoCon.openEmptyWriterDoc() + + @classmethod + def tearDownClass(cls): + cls._unoCon.tearDown() + + def test_set_expression(self): + self.__class__._unoCon.checkProperties( + self.__class__._xDoc.createInstance("com.sun.star.text.textfield.SetExpression"), + {"NumberingType": 0, + "Content": "foo", + "CurrentPresentation": "bar", + "NumberFormat": 0, + "NumberingType": 0, + "IsShowFormula": False, + "IsInput": False, + "IsVisible": True, + "SequenceValue": 0, + "SubType": 0, + "Value": 1.0, + "IsFixedLanguage": False + }, + self + ) + +if __name__ == '__main__': + unittest.main() + diff --git a/sw/qa/unoapi/python/get_expression.py b/sw/qa/unoapi/python/get_expression.py deleted file mode 100644 index 5ac49f8..0000000 --- a/sw/qa/unoapi/python/get_expression.py +++ /dev/null @@ -1,53 +0,0 @@ -import unittest -from org.libreoffice.unotest import UnoNotConnection as UnoConnection - -class TestGetExpression(unittest.TestCase): - _unoCon = None - _xDoc = None - - @classmethod - def setUpClass(cls): - cls._unoCon = UnoConnection({}) - cls._unoCon.setUp() - cls._xDoc = cls._unoCon.openEmptyWriterDoc() - - @classmethod - def tearDownClass(cls): - cls._unoCon.tearDown() - - def test_get_expression(self): - self.__class__._unoCon.checkProperties( - self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), - {"Content": "foo", - "CurrentPresentation": "bar", - "NumberFormat": 0, - "IsShowFormula": False, - "SubType": 0, - "VariableSubtype": 1, - "IsFixedLanguage": False, - }, - self - ) - - # property 'Value' is read only? - @unittest.expectedFailure - def test_get_expression_veto_read_only(self): - self.__class__._unoCon.checkProperties( - self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), - {"Value": 0.0}, - self - ) - - # property 'NumberingType' is unknown? - @unittest.expectedFailure - def test_get_expression_unknown_property(self): - self.__class__._unoCon.checkProperties( - self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), - {"NumberingType": 0}, - self - ) - - -if __name__ == '__main__': - unittest.main() - diff --git a/sw/qa/unoapi/python/set_expression.py b/sw/qa/unoapi/python/set_expression.py deleted file mode 100644 index d88d2f3..0000000 --- a/sw/qa/unoapi/python/set_expression.py +++ /dev/null @@ -1,40 +0,0 @@ -import unittest -from org.libreoffice.unotest import UnoNotConnection as UnoConnection - -#@unittest.skip("that seems to work") -class TestSetExpresion(unittest.TestCase): - _unoCon = None - _xDoc = None - - @classmethod - def setUpClass(cls): - cls._unoCon = UnoConnection({}) - cls._unoCon.setUp() - cls._xDoc = cls._unoCon.openEmptyWriterDoc() - - @classmethod - def tearDownClass(cls): - cls._unoCon.tearDown() - - def test_set_expression(self): - self.__class__._unoCon.checkProperties( - self.__class__._xDoc.createInstance("com.sun.star.text.textfield.SetExpression"), - {"NumberingType": 0, - "Content": "foo", - "CurrentPresentation": "bar", - "NumberFormat": 0, - "NumberingType": 0, - "IsShowFormula": False, - "IsInput": False, - "IsVisible": True, - "SequenceValue": 0, - "SubType": 0, - "Value": 1.0, - "IsFixedLanguage": False - }, - self - ) - -if __name__ == '__main__': - unittest.main() - commit 748f3ea41f59fd07494be7bf65446163e98fe2ce Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 23:07:17 2013 +0200 python3: deliver the GDB python support script Change-Id: I3abbc36198719fc118404bfcc039fdf3397e324e diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index 16e270b..4f9c833 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -46,6 +46,7 @@ else $(eval $(call gb_ExternalPackage_add_file,python3,bin/python,python)) $(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so)) $(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so)) +$(eval $(call gb_ExternalPackage_add_file,python3,lib/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so-gdb.py,Tools/gdb/libpython.py)) # versioned lib/libpython3.3m.so.1.0 appears to be unnecessary? # Unfortunately the python build system does not allow to explicitly enable or commit 3094d72d792ed12b48f86eaade9286cefaacd177 Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 22:59:25 2013 +0200 Makefile: add convenience targets for PythonTest Change-Id: I4a20a69fb9dfe6619b7f6dafb3306b529b949e1c diff --git a/Makefile.in b/Makefile.in index 01a98d5..68b5024 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,6 +119,7 @@ gbuild_TARGETS := AllLangHelp \ PackageSet \ Pagein \ Pyuno \ + PythonTest \ Rdb \ StaticLibrary \ UIConfig \ commit 38232ea1988c8170b60aced89662260e82b86b32 Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 22:24:53 2013 +0200 python3: re-enable both debug symbols and optimization These were apparently accidentally disabled on all non-WNT platforms. Set the OPT variable from the outside on the platform that needs it. (regression from ab41efc81ec26fcbd4cdeb9c36fbe8cc274523f) Change-Id: Ifbf7ec8e0f863cb6368758571496c8b615e3e814 diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 1731c07f..f030afd 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -67,9 +67,6 @@ python3_cflags = ifeq ($(ENABLE_VALGRIND),TRUE) python3_cflags += $(VALGRIND_CFLAGS) endif -ifeq ($(OS),AIX) - python3_cflags += -g0 -endif $(call gb_ExternalProject_get_state_target,python3,build) : $(call gb_ExternalProject_run,build,\ @@ -78,7 +75,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --with-system-expat \ $(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ --prefix=/python-inst \ - $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads) \ + $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads \ + OPT="-g0 -fwrapv -O3 -Wall") \ $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter INTEL POWERPC,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit) --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ diff --git a/python3/python-3.3.0-aix.patch.1 b/python3/python-3.3.0-aix.patch.1 index e287a3f..f8dceb2 100644 --- a/python3/python-3.3.0-aix.patch.1 +++ b/python3/python-3.3.0-aix.patch.1 @@ -33,15 +33,6 @@ build with GCC on AIX INSTSONAME="$LDLIBRARY".$SOVERSION if test "$with_pydebug" != yes then -@@ -6169,7 +6175,7 @@ - # debug builds. - OPT="-g -O0 -Wall $STRICT_PROTO" - else -- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" -+ OPT="$WRAP -O0 -Wall $STRICT_PROTO" - fi - ;; - *) @@ -8301,8 +8307,13 @@ then case $ac_sys_system/$ac_sys_release in commit 0f7754dfa040804d84feb9cb222ba04752509f26 Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 22:00:55 2013 +0200 python3: VERBOSE is handled by gb_ExternalProject_run already Change-Id: I0caf3a9440c7617c9f1c643a4c3fe279d04cf1dc diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 9759623..1731c07f 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -98,7 +98,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \ )" \ - && MAKEFLAGS=$(if $(VERBOSE)$(verbose),,s) $(MAKE) $(if $(filter MACOSX,$(OS)), DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \ + && MAKEFLAGS= $(MAKE) \ + $(if $(filter MACOSX,$(OS)),DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \ && ln -s build/lib.* LO_lib \ ) commit c9eac7a838155c4cccf5e2f0ba12778cea50e420 Author: Michael Stahl <mst...@redhat.com> Date: Thu Apr 18 20:27:05 2013 +0200 cli_ure: remove obsolete USE_DEBUG_RUNTIME check for msvcmrt This is handled in com_MSC_class.mk now. Change-Id: I5e4c2e791e9acd623d7c5ce352b5c39b6cb939b4 diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 01264f4..c8dd3da 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -34,10 +34,7 @@ $(eval $(call gb_Executable_use_libraries,climaker,\ $(eval $(call gb_Executable_use_system_win32_libs,climaker,\ mscoree \ - $(if $(USE_DEBUG_RUNTIME) \ - ,msvcmrtd \ - ,msvcmrt \ - ) \ + msvcmrt \ )) $(eval $(call gb_Executable_add_exception_objects,climaker,\ diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index f757fa3..3eae911 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -49,10 +49,7 @@ $(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper,\ advapi32 \ delayimp \ mscoree \ - $(if $(USE_DEBUG_RUNTIME)\ - ,msvcmrtd \ - ,msvcmrt \ - ) \ + msvcmrt \ )) $(eval $(call gb_Library_add_exception_objects,cli_cppuhelper,\ diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index e87b91b..01d7519 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -28,10 +28,7 @@ $(eval $(call gb_Library_use_libraries,cli_uno,\ $(eval $(call gb_Library_use_system_win32_libs,cli_uno,\ mscoree \ - $(if $(USE_DEBUG_RUNTIME)\ - ,msvcmrtd \ - ,msvcmrt \ - ) \ + msvcmrt \ )) $(eval $(call gb_Library_add_exception_objects,cli_uno,\ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits