[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild

2017-01-22 Thread Damjan Jovanovic 
 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 
Date:   Sun Jan 22 17:09:50 2017 +

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.XX`) \
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild

2016-06-10 Thread Damjan Jovanovic 
 solenv/gbuild/GoogleTest.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e3078772c4366e1bc09aa1fbbe0bdd80256ebb89
Author: Damjan Jovanovic 
Date:   Fri Jun 10 17:34:38 2016 +

Fix a typo in my last patch.

Patch by: me

diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk
index 90df2a5..d52178c 100644
--- a/solenv/gbuild/GoogleTest.mk
+++ b/solenv/gbuild/GoogleTest.mk
@@ -27,7 +27,7 @@
 # in non-product builds, ensure that tools-based assertions do not pop up as 
message box, but are routed to the shell
 DBGSV_ERROR_OUT := shell
 export DBGSV_ERROR_OUT
-DISABLE_SAL_DBGBOX=1
+DISABLE_SAL_DBGBOX := 1
 export DISABLE_SAL_DBGBOX
 
 # defined by platform
commit dc8b714d2345e42b48a09cbd6affe74c6994b5fc
Author: Damjan Jovanovic 
Date:   Fri Jun 10 17:31:51 2016 +

#i126918# - windows build breaks in module crashrep - Assertion Failed

Prevent OSL assertion failures from bringing up messageboxes during
the build on Windows.

Patch by: me

diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk
index b8cf828..90df2a5 100644
--- a/solenv/gbuild/GoogleTest.mk
+++ b/solenv/gbuild/GoogleTest.mk
@@ -27,6 +27,8 @@
 # in non-product builds, ensure that tools-based assertions do not pop up as 
message box, but are routed to the shell
 DBGSV_ERROR_OUT := shell
 export DBGSV_ERROR_OUT
+DISABLE_SAL_DBGBOX=1
+export DISABLE_SAL_DBGBOX
 
 # defined by platform
 #  gb_CppunitTest_TARGETTYPE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild solenv/inc svx/inc svx/source

2013-04-12 Thread Oliver-Rainer Wittmann 
 solenv/gbuild/platform/macosx.mk |1 -
 solenv/inc/unxmacx.mk|2 +-
 svx/inc/svx/svxitems.hrc |3 ---
 svx/source/items/svxitems.src|5 -
 4 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 742ce8b35e67a6b6bdfd2e784ea5abcdfd054085
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Apr 12 08:49:47 2013 +

121788: - remove duplicate resource introduced by accident

diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index f001e41..d6f035c 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.hrc
@@ -70,9 +70,6 @@
 #define RID_SVXITEMS_BRUSHSTYLE_75  (RID_SVXITEMS_START + 55)
 #define RID_SVXITEMS_BRUSHSTYLE_BITMAP  (RID_SVXITEMS_START + 56)
 
-// enum ColorName ---
-#define RID_SVXITEMS_COLOR_WHITE(RID_SVXITEMS_START + 76)
-
 // enum FontFamily ---
 #define RID_SVXITEMS_FONTFAMILY_BEGIN   (RID_SVXITEMS_START + 100)
 #define RID_SVXITEMS_FONTFAMILY_DONTKNOW(RID_SVXITEMS_START + 100)
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index fc7c236..cf064cd 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -211,11 +211,6 @@ String RID_SVXITEMS_BRUSHSTYLE_BITMAP
 {
 Text [ en-US ] = Image ;
 };
-// enum ColorName ---
-String RID_SVXITEMS_COLOR_WHITE
-{
-Text [ en-US ] = White ;
-};
 // end enum ColorName 
---
 String RID_SVXITEMS_HORJUST_STANDARD
 {
commit 5255f9f08d68f4d8702f026dc1d2a840de62d627
Author: Herbert Dürr h...@apache.org
Date:   Fri Apr 12 08:22:42 2013 +

stop using Mac specific compiler option Wno-long-double

having this option results in a warning for each compile on gcc=4.2 or 
clang.
Apple says in 
http://lists.cs.uiuc.edu/pipermail/llvmdev/2008-June/015095.html
[...] the best thing is not to use it. There is no reason to.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4cfeeb9..7f6ce10 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -90,7 +90,6 @@ gb_CXXFLAGS := \
-Wendif-labels \
-Wextra \
-Wno-ctor-dtor-privacy \
-   -Wno-long-double \
-Wno-non-virtual-dtor \
-fPIC \
-fmessage-length=0 \
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 9a41eb3..007f24a 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -111,7 +111,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
 # Normal C++ compilation flags
-CFLAGSCXX=-pipe -malign-natural -fsigned-char -Wno-long-double $(ARCH_FLAGS)
+CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS)
 CFLAGSCXX+= -Wno-ctor-dtor-privacy
 
 PICSWITCH:=-fPIC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits