[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild
Damjan Jovanovic
damjan at apache.org
Sun Jan 22 18:08:26 UTC 2017
solenv/gbuild/JavaClassSet.mk | 3 ++-
solenv/gbuild/platform/freebsd.mk | 2 +-
solenv/gbuild/platform/linux.mk | 2 +-
solenv/gbuild/platform/macosx.mk | 2 +-
solenv/gbuild/platform/os2.mk | 36 +-----------------------------------
solenv/gbuild/platform/solaris.mk | 2 +-
solenv/gbuild/platform/windows.mk | 36 +-----------------------------------
solenv/gbuild/platform/winmingw.mk | 11 +++++++++++
8 files changed, 19 insertions(+), 75 deletions(-)
New commits:
commit fdceace757ab51da03547798676e44b2b34daf29
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Jan 22 17:09:50 2017 +0000
Don't use the "archive" package format, which is to be extrated by
smoketest as a side effect, for the subsequent tests. The smoketest
is currently broken and won't do that, and the path is wrong anyway,
as it was for OpenOffice 3 and we're now on 4.
Instead, use the office instance from the "installed" package format
for subsequent tests, as it doesn't have to zipped up and unzipped,
resulting in faster building and faster testing, and doesn't require
a side effect in a module that will probably be moved from main/
to test/.
Patch by: me
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 5d4dd05..d576df1 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -402,7 +402,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
- -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \
+ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}" \
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index e50c986..1981101 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -381,7 +381,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
- -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \
+ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}" \
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7bcbec7..5ebf76e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -418,7 +418,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
- -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/OpenOffice.org.app/Contents/MacOS/soffice}" \
+ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}" \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 9cec835..f68679f 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -514,43 +514,9 @@ endef
# JunitTest class
-gb_defaultlangiso := en-US
-gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
-
-ifeq ($(OOO_TEST_SOFFICE),)
-
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in which
-# case $(target).instpath contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native.
-
-# for now, no dependency on $(shell ls $(gb_smoketest_instset))
-# because that doesn't work before the instset is built
-# and there is not much of a benefit anyway (gbuild not knowing about smoketest)
-define gb_JunitTest_JunitTest_platform_longpathname_hack
-$(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).instpath
-$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-
-$(call gb_JunitTest_get_target,$(1)).instpath :
- INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \
- && unzip -d "$$$${INST_DIR}" $$(gb_smoketest_instset) \
- && mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\
- && mkdir -p $$(dir $$@) \
- && echo "$$$${INST_DIR}" > $$@
-
-endef
-else # OOO_TEST_SOFFICE
-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:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice 4/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
-Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 96213d3..47f38ff 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -355,7 +355,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
- -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}" \
+ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}" \
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a96f5d1..df85d20 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -632,43 +632,9 @@ endef
# JunitTest class
-gb_defaultlangiso := en-US
-gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
-
-ifeq ($(OOO_TEST_SOFFICE),)
-
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in which
-# case $(target).instpath contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native.
-
-# for now, no dependency on $(shell ls $(gb_smoketest_instset))
-# because that doesn't work before the instset is built
-# and there is not much of a benefit anyway (gbuild not knowing about smoketest)
-define gb_JunitTest_JunitTest_platform_longpathname_hack
-$(call gb_JunitTest_get_target,$(1)) : $(call gb_JunitTest_get_target,$(1)).instpath
-$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-
-$(call gb_JunitTest_get_target,$(1)).instpath :
- INST_DIR=$$$$(cygpath -m `mktemp -d -t testinst.XXXXXX`) \
- && unzip -d "$$$${INST_DIR}" $$(gb_smoketest_instset) \
- && mv "$$$${INST_DIR}"/OOo_*_install-arc_$$(gb_defaultlangiso) "$$$${INST_DIR}"/opt\
- && mkdir -p $$(dir $$@) \
- && echo "$$$${INST_DIR}" > $$@
-
-endef
-else # OOO_TEST_SOFFICE
-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:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice 4/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
-Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 5ddea1dc..e881798 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -604,6 +604,17 @@ gb_GoogleTest_get_filename = $(1)$(gb_Executable_EXT)
define gb_GoogleTest_GoogleTest_platform
endef
+# JunitTest class
+
+define gb_JunitTest_JunitTest_platform
+$(call gb_JunitTest_get_target,$(1)) : DEFS := \
+ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/OpenOffice 4/program/soffice.exe}" \
+ -Dorg.openoffice.test.arg.env=PATH \
+ -Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1)) \
+
+endef
+
+
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
commit abac52c9920988f2f169436de74ba62805a57fd8
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Jan 22 08:13:07 2017 +0000
Pass "-encoding UTF8" to javac, as some Java sources, particularly those
used in subsequent tests, contain special characters that are encoded
in UTF-8, and fail to compile without this option.
Patch by: me
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 628e792..264e6ac 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -27,7 +27,8 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+ $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -encoding UTF8 \
+ -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(3)),\
$(filter-out $(JARDEPS),$(4))) &&\
touch $(1))
More information about the Libreoffice-commits
mailing list