[Libreoffice-commits] .: 9 commits - Makefile.top configure.in sc/qa smoketest/CppunitTest_smoketest.mk smoketest/smoketest_too.cxx solenv/gbuild svl/Module_svl.mk sw/JunitTest_sw_complex.mk
Michael Stahl
mst at kemper.freedesktop.org
Sun Jul 15 14:09:59 PDT 2012
Makefile.top | 8 +++++++-
configure.in | 2 +-
sc/qa/extras/scdatapilottableobj.cxx | 2 +-
smoketest/CppunitTest_smoketest.mk | 9 ++++++++-
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, 37 insertions(+), 14 deletions(-)
New commits:
commit 81af84c04fa7ef8c8c12d2a9d3899a9a75cb8260
Author: Michael Stahl <mstahl at 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
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 05d7628..9519a48 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -633,10 +633,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 0ec45dc41dd4872482b817387f253d6fab6bf20c
Author: Michael Stahl <mstahl at 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
diff --git a/Makefile.top b/Makefile.top
index 15d27ba..a1090e2 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -394,7 +394,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)
@@ -425,12 +426,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 01550a7450f099c4016af53fef53c286040b1575
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Jul 15 22:34:48 2012 +0200
sw: disable CheckBookmarks on WNT
Change-Id: Ia52cbea28c832706cbfa74c2b1d9bca43df006d9
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 09b853e38b7a35d614caebd97116ca8a106148bd
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Jul 15 22:32:09 2012 +0200
CppunitTest_svl_urihelper fails on MSVC
Change-Id: Ia1154ab9e677ac0d27eb8cf671139d4e23f78794
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index da0cb1d..d12fa3a 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -32,10 +32,13 @@ $(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 \
))
+endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svl,\
commit 184179f583d26c26639781e65eb75afc13e0a149
Author: Michael Stahl <mstahl at 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
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 d8b6225d974ef7f8dd14cf0828a86f6e9881fc97
Author: Michael Stahl <mstahl at 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
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 111e10bd401b3fee981f32f5f98fc7512a5c47f8
Author: Michael Stahl <mstahl at 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
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 5eb7d3a..cd2e4ac 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -65,7 +65,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)))
@@ -108,7 +108,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)
@@ -132,7 +132,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 5d95ab29f228c355029147ee083e9f222545c0ae
Author: Michael Stahl <mstahl at redhat.com>
Date: Sun Jul 15 20:43:17 2012 +0200
MSVC complains about too many implicit conversions
Change-Id: I33b40ec877270de4ed037dfaf6652c07935a727c
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;
}
commit efc8c95af4cf2e224594521094b1a8947d83399d
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 13 20:10:33 2012 +0200
STLPort on Solaris only makes sense with SunStudio
Change-Id: I18083180ebde8a9d32c645b3e203a562a6a0ddbe
diff --git a/configure.in b/configure.in
index eb2ee8d..b6520eb 100644
--- a/configure.in
+++ b/configure.in
@@ -4605,7 +4605,7 @@ if test "$_os" = "Linux"; then
BUILD_STLPORT="no"
;;
esac
-elif test "$_os" = "SunOS"; then
+elif test "$_os" = "SunOS" -a "$COM" = "C52"; then
BUILD_STLPORT="yes"
elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
BUILD_STLPORT="yes"
More information about the Libreoffice-commits
mailing list