Makefile.top | 8 +++++++- sc/qa/extras/scdatapilottableobj.cxx | 2 +- smoketest/CppunitTest_smoketest.mk | 9 ++++++++- smoketest/data/Test_Ext.xml | 3 ++- smoketest/smoketest_too.cxx | 1 + solenv/gbuild/JavaClassSet.mk | 6 +++--- solenv/gbuild/JunitTest.mk | 6 +++--- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 4 +--- solenv/gbuild/platform/windows.mk | 2 ++ svl/Module_svl.mk | 3 +++ sw/JunitTest_sw_complex.mk | 8 +++++++- 11 files changed, 38 insertions(+), 14 deletions(-)
New commits: commit cf5b1cd3f8d9ac9cb8d05beeb052d46634ade53b Author: Michael Stahl <mst...@redhat.com> Date: Wed Jul 18 18:49:31 2012 +0200 smoketest: produce a better errror message when Java component fails Change-Id: I04d0376d22cddf78d83ec0d42bbd2620d5d5fcc5 (cherry picked from commit 75b7d3dce610eb1d7a071d02800d5e3d0bec0898) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/smoketest/data/Test_Ext.xml b/smoketest/data/Test_Ext.xml index ac39f48..b28aefe 100644 --- a/smoketest/data/Test_Ext.xml +++ b/smoketest/data/Test_Ext.xml @@ -44,7 +44,7 @@ Sub TestExtensions gCurrentTestCase = cLogfileFailed LocalTestLog% = OpenLogDat (GetLogFileName(gCurrentDocTest)) - sCurrentMessage = cMessageExtensionService + sCurrentMessage = "SmokeTestCommandEnvironment (implemented in Java)" gCurrentTestCase = cEXTService 'Create an implementation of com.sun.star.ucb.XCommandEnvironment which is needed for @@ -54,6 +54,7 @@ Sub TestExtensions 'Create the component context and then get the singleton ExtensionManager 'A singleton cannot be created with createUnoService + sCurrentMessage = cMessageExtensionService ctx = getDefaultContext ext_mgr = ctx.getValueByName("/singletons/" + cExtensionManager) commit a4b827fb6c2263ae5dca0fcb367b38c1cdcc98e1 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 23:01:48 2012 +0200 gbuild: let JunitTests run with MSVC: Apparently the long path name hack is no longer necessary; at least i did not experience any obvious problem with a source tree rooted in D:/lo/master. Change-Id: I2fd1893a827c27b5dcee438eae6572c596ae907c (cherry picked from commit 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 4365817..9cc5a78 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -631,10 +631,8 @@ gb_JunitTest_JunitTest_platform_longpathname_hack = endif # OOO_TEST_SOFFICE define gb_JunitTest_JunitTest_platform -$(call gb_JunitTest_JunitTest_platform_longpathname_hack,$(1)) - $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat $(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org 3/program/soffice.exe}" \ + -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice.exe}" \ -Dorg.openoffice.test.arg.env=PATH \ -Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) commit 789559074f04dcf431c86b231b9cd7f6c9e66d9f Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 22:58:52 2012 +0200 let make dev-install do something useful on MSVC Forcing creation of second installation set is perhaps not ideal, but i have no idea how that installer perl crud work and at least it gives something to run tests against. Change-Id: I506160013de23f76128c9e39b4f3bacc6e32cc7a (cherry picked from commit 0ec45dc41dd4872482b817387f253d6fab6bf20c) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/Makefile.top b/Makefile.top index e2d9d12..1846516 100644 --- a/Makefile.top +++ b/Makefile.top @@ -392,7 +392,8 @@ endif build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl + cd instsetoo_native && unset MAKEFLAGS && \ + $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE else cd instsetoo_native && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) @@ -423,12 +424,17 @@ install-strip: dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) +ifeq ($(OS_FOR_BUILD),WNT) + unzip -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip" + mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt +else ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers -L else @ooinstall -l $(DEVINSTALLDIR)/opt endif +endif @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install distro-pack-install: install commit 0c9a5e5ce102a151012a33fe82ba4f942f95c135 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 22:34:48 2012 +0200 sw: disable CheckBookmarks on WNT Change-Id: Ia52cbea28c832706cbfa74c2b1d9bca43df006d9 (cherry picked from commit 01550a7450f099c4016af53fef53c286040b1575) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk index fbfb740..c31b027 100644 --- a/sw/JunitTest_sw_complex.mk +++ b/sw/JunitTest_sw_complex.mk @@ -58,7 +58,6 @@ $(eval $(call gb_JunitTest_use_jars,sw_complex,\ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ complex.accessibility.AccessibleRelationSet \ - complex.writer.CheckBookmarks \ complex.checkColor.CheckChangeColor \ complex.writer.CheckCrossReferences \ complex.writer.CheckFields\ @@ -68,4 +67,11 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ complex.writer.TextPortionEnumerationTest \ )) +# FIXME has never worked on windows, hashes are different +ifneq ($(OS),WNT) +$(eval $(call gb_JunitTest_add_classes,sw_complex,\ + complex.writer.CheckBookmarks \ +)) +endif + # vim: set noet sw=4 ts=4: commit 20ab3cbb3acbe48ca3e8251fc4a761457d4f16c6 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 22:32:09 2012 +0200 CppunitTest_svl_urihelper fails on MSVC (cherry picked from commit 09b853e38b7a35d614caebd97116ca8a106148bd) Conflicts: svl/Module_svl.mk Change-Id: Ia1154ab9e677ac0d27eb8cf671139d4e23f78794 Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk index 2639cdf..f412c0a 100644 --- a/svl/Module_svl.mk +++ b/svl/Module_svl.mk @@ -41,11 +41,14 @@ $(eval $(call gb_Module_add_check_targets,svl,\ )) #TODO: CppunitTest_svl_urihelper depends on ucb, can only be added once svl is # in tail build +#FIXME: fails on MSVC +ifneq ($(OS),WNT) $(eval $(call gb_Module_add_subsequentcheck_targets,svl,\ CppunitTest_svl_urihelper \ JunitTest_svl_complex \ )) +endif #todo: dde platform dependent #todo: package_inc commit b9171b3f16c5bb6280bcf2e2fc1310edda6082ac Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 22:27:22 2012 +0200 gbuild: need to set gb_Helper_LIBRARY_PATH_VAR for MSVC Change-Id: Ic23e6e26093ed381a1930ee6d3c1bc04ac2625b9 (cherry picked from commit 184179f583d26c26639781e65eb75afc13e0a149) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 7cfe7d8..7bc1f0d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -29,6 +29,8 @@ GUI := WNT gb_Helper_get_rcfile = $(1).ini +gb_Helper_LIBRARY_PATH_VAR := PATH + gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX gb_OSDEFS := \ commit 454e415eb4d2dc0d1afcbb55b6557db945e327dd Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 22:20:50 2012 +0200 smoketest: fix build with MSVC: Linking an empty CppunitTest against smoketest Library does not work, the linker complains aboutunresolved external symbol DllMainCRTstartup or something like that; building a static library has the same result; so just build the cxx file twice via a dummy smoketest_too.cxx. Change-Id: I11a29d4ec134f67a7de896ff8c669ed5b47782a7 (cherry picked from commit d8b6225d974ef7f8dd14cf0828a86f6e9881fc97) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index aa27bef..b99c160 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -29,13 +29,20 @@ $(eval $(call gb_CppunitTest_CppunitTest,smoketest)) $(eval $(call gb_CppunitTest_abort_on_assertion,smoketest)) +$(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\ + smoketest/smoketest_too \ +)) + $(eval $(call gb_CppunitTest_use_api,smoketest,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ - smoketest \ + cppu \ + cppuhelper \ + sal \ + unotest \ )) ifeq ($(OS),MACOSX) diff --git a/smoketest/smoketest_too.cxx b/smoketest/smoketest_too.cxx new file mode 100644 index 0000000..67bd8f6 --- /dev/null +++ b/smoketest/smoketest_too.cxx @@ -0,0 +1 @@ +#include <smoketest.cxx> commit 0c2a0de598bd39839a610a7e53660bb67397466b Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 20:44:47 2012 +0200 gbuild: un-break setting classpath on Windows: Apparently LO patched GNU make 3.82 interprets the semicolon which is the value of $(gb_CLASSPATHSEP) as a terminator if it occurs while setting a target local variable; the part of the value that follows the first semicolon is cut off. Hence escape the $(gb_CLASSPATHSEP) and $(XCLASSPATH) vars. Change-Id: I213dba7155f9515e492c20cfff3bef1c4d8269fc (cherry picked from commit 111e10bd401b3fee981f32f5f98fc7512a5c47f8) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index d9f7b07..2338f32 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -117,7 +117,7 @@ endef define gb_JavaClassSet_use_jar $(call gb_JavaClassSet_get_target,$(1)) : $(2) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) -$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(strip $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2)) $(2) :| $(gb_Helper_PHONY) endef @@ -129,7 +129,7 @@ $$(call gb_Output_error,\ endef define gb_JavaClassSet_use_system_jar -$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(strip $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(strip $(2)) endef @@ -167,7 +167,7 @@ endef define gb_JavaClassSet_use_jar_classset $(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2))) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(2))) -$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(if $$(T_CP),$$(T_CP)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 31cf96e..5788f55 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -68,7 +68,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$(value XCLASSPATH)$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$$(value XCLASSPATH)$$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(eval $(call gb_JunitTest_JunitTest_platform,$(1))) @@ -111,7 +111,7 @@ endef define gb_JunitTest_use_jar $(call gb_JavaClassSet_use_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) -$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(2) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(2) $(call gb_JunitTest_get_target,$(1)) : $(2) $(2) :| $(gb_Helper_PHONY) @@ -135,7 +135,7 @@ endef # see gb_JavaClassSet_use_jar_classset define gb_JunitTest_use_jar_classset $(call gb_JavaClassSet_use_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) -$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) endef commit 765a4ed507781b8abfe25de12dfe93c36a503b21 Author: Michael Stahl <mst...@redhat.com> Date: Sun Jul 15 20:43:17 2012 +0200 MSVC complains about too many implicit conversions Change-Id: I33b40ec877270de4ed037dfaf6652c07935a727c (cherry picked from commit 5d95ab29f228c355029147ee083e9f222545c0ae) Signed-off-by: Miklos Vajna <vmik...@suse.cz> diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 99067b2..6ab1c33 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -121,7 +121,7 @@ uno::Reference< uno::XInterface > ScDataPilotTableObj::init() uno::Reference< uno::XInterface > ScDataPilotTableObj::getSheets() { uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); - uno::Reference< uno::XInterface > xSheets = xDoc->getSheets(); + uno::Reference< uno::XInterface > xSheets(xDoc->getSheets()); return xSheets; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits