Commit graph

613 commits

Author SHA1 Message Date
Ariel Constenla-Haile
c0b455a664 Clearer javaldx message
(cherry picked from commit fdebe4193ae0f3f8a8281dfc0a2f053e578cf1b9)

Conflicts:
	jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx

Change-Id: I4c26c704ce85a273d7022260bb721e295041c260
2013-05-18 14:36:05 +01:00
Pedro Giffuni
cb5000280e Add Oracle as a Java vendor for Solaris.
Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml

Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be
2013-05-18 00:54:56 +02:00
Tor Lillqvist
cb6d67c21f Spelling "separate" (etc) correctly is hard 2013-05-15 11:14:28 +03:00
Philipp Riemer
e8eab43eeb cleanup whitespaces due to RTL_CONSTASCII_USTRINGPARAM removal
In e2e2cc6114 the method was removed
automatically leaving several line breaks etc. as visual noise.
2013-05-06 19:21:07 +02:00
Luboš Luňák
e2e2cc6114 remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.

Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
2013-05-06 16:51:45 +02:00
David Tardon
e64e85b221 copy more rc files to instdir
Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
2013-05-05 15:02:50 +02:00
Ariel Constenla-Haile
55d2d982d0 Resolves: #i66923# Add support for JRockit JVM
(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40)

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
	jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
	jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9
2013-05-02 13:37:26 +01:00
David Tardon
1cc9bbfd57 gbuild: drop empty use_packages calls
Change-Id: I8e9f70eb5d929c98b4379416c2259a74e31d587f
Reviewed-on: https://gerrit.libreoffice.org/3503
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:18:15 +00:00
David Tardon
c042cd05e9 gbuild: drop uses of removed packages
Change-Id: I400fad08c0ae7b6b34bad63693f54856867e4dac
Reviewed-on: https://gerrit.libreoffice.org/3502
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:18:03 +00:00
Bjoern Michaelsen
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00
Michael Meeks
62badf3828 Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-22 09:37:38 +01:00
Stephan Bergmann
598215cb41 -Werror=unused-macros (MinGW, jvmfwk)
Change-Id: I860939930c43cac89c4ab745bf129922be1f1511
2013-04-17 11:51:12 +02:00
Stephan Bergmann
2acc9da9e1 -Werror=unused-macros (MinGW, USE_ACCESSIBILITY_FILE)
...dead at least since c58b07c958 "#i20020#," if
not even since the beginning, 49614181e5 "#i20052#
plugin lib for java framework."

Change-Id: Ic0b35341cb8038ccfe0a2f4f5b758341b9ab13b9
2013-04-17 11:51:12 +02:00
Thomas Arnhold
c32b6be06b fdo#60724 correct spelling
Change-Id: Ieb653adbd0cb4371ec5db57e70bcc551872f647f
2013-04-15 05:32:37 +02:00
Thomas Arnhold
435f5e30c9 fdo#60724 correct spelling
Change-Id: I7318a9f4f3410edf4dbe67bf08f31682fcb4edc7
2013-04-15 05:10:29 +02:00
Matúš Kukan
9fbe2f1b65 do not set soversion for private ure libraries
Change-Id: I2b2099d8fc00062f67c42e73c4b8a17a689db89d
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-04-12 11:21:33 +02:00
Tor Lillqvist
0286471797 Look for Oracle Java 7 in a 64-bit LibreOffice on OS X
Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154
2013-04-09 00:54:29 +03:00
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00
Tor Lillqvist
b7525f1f1d Drop jvmaccess and jvmfwk when no SOLAR_JAVA
Just sprinkle #ifdef SOLAR_JAVA into the code instead.

In the source for jvmaccess and jvmfwk such ifdefs can be removed as
it isn't compiled unless SOLAR_JAVA.

Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
2013-04-05 00:18:50 +03:00
David Tardon
35ee0188cb WaE: "UNX" is not defined
Change-Id: I3b72efae6c3ae929eb4f26400a7c73406371c1a2
2013-03-27 17:08:10 +01:00
David Tardon
769831b958 WaE: "UNX" is not defined
Change-Id: Ie1a98500fa4f3965872b3fc92a303df84556fd7a
2013-03-27 17:08:08 +01:00
Tor Lillqvist
a429142bfb WaE: macro "RUNNING_ON_VALGRIND" is not used
Change-Id: Ie60882c86008506a331087a241f15e931c5eacee
2013-03-27 12:19:34 +02:00
Stephan Bergmann
aa753f01ba -Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
2013-03-27 09:36:53 +01:00
Tor Lillqvist
55e95d1dcb warning: unknown log area 'jvmfwk' [loplugin]
This is not a warning that would stop an --enable-werror build, but still
worth fixing.

Change-Id: I6c47fd636f57f55cbe406f51e2f24e015924ce14
2013-03-22 08:57:58 +02:00
Thomas Arnhold
39d45390f4 removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms

Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-19 10:48:30 +00:00
Thomas Arnhold
8b27d78b4a automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-19 09:00:26 +00:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Stephan Bergmann
52c5eb20fd -Werror=unused-local-typedefs (GCC 4.8)
Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
2013-03-09 13:03:05 +01:00
nccuong
a6b9173005 fdo#60148 Clean up warnings from the Clang compiler plugin
Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671
loplugin: clean warnings: unused variables, incorrect indentation and log area.
Reviewed-on: https://gerrit.libreoffice.org/2544
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
2013-03-06 12:59:26 +00:00
Markus Mohrhard
ea4555100a coverity#705669: fix memory leak
Change-Id: Ib99c5e5c4a8c3c6efd0ff0665c73b241790b314b
2013-03-03 04:35:12 +01:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
Tor Lillqvist
616c6924f1 s/the the/the/
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-22 09:58:19 +02:00
Julien Nabet
56f4d7dc9d Some cppcheck cleaning
Change-Id: I8609949377181f8edb30ac07b2791cfcd079fc7d
2013-02-12 21:24:25 +01:00
Jean-Noël Rouvignac
97eb8a6e0e Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
2013-01-30 12:54:40 +00:00
Michael Stahl
5a61e28378 gbuild: fix silly "expandtabs" in makefile VIM modelines
Change-Id: I54d8923ad315e8041fd3904da3a29f1a7a8c8b16
2013-01-26 22:20:07 +01:00
Michael Stahl
a53586f4ef gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
2013-01-26 22:20:06 +01:00
Tor Lillqvist
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
Stephan Bergmann
e5546342cb Let JavaVirtualMachine::getJavaVm start the VM it already found
Since b699519969 "Drop support for /etc/opt/ure
and ~/.ure from LibreOffice 4" there is no place any more where a plain URE will
store information about a selected JVM, so JavaVirtualMachine::getJavaVM will
go into an endless loop of jfw_startVM -> JFW_E_NO_SELECT ->
jfw_findAndSelectJRE -> jfw_startVM -> ...  The solution is to pass the JavaInfo
determined by jfw_findAndSelectJRE into the second invocation of jfw_startVM
(for which the parameter list of the latter needed to be changed), instead of
relying on jfw_findAndSelectJRE and jfw_startVM implicitly communicating that
information via user configuration files.

Change-Id: I5799f04c457e8a849c67ed827dc5e134c6563362
2012-12-18 12:47:39 +01:00
Stephan Bergmann
49313b0626 Make python3 work with custom VALGRIND_CFLAGS
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
2012-11-27 15:35:02 +01:00
Stephan Bergmann
b699519969 Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4
For one, /etc/opt/ure was probably never used by anyone anyway, so meant just
needless file-stats during startup.  For another, accidentally created
~/.ure/javasettings_*.xml that later became stale were noted to cause trouble,
so that source is now closed.

For this to work, jvmfwk needs to be silent now if it cannot read/write any
shared/user javasettings_*.xml.

Change-Id: I332b5ebb9549dc6ccf7c99c439d9a3b61aeb5829
2012-11-15 12:46:19 +01:00
Julien Nabet
c87303da4a fix typos
Change-Id: I3bca3709ba759894ce77bab412f5082718ea25c5
2012-10-15 20:25:31 +02:00
Caolán McNamara
d00dc66996 loplugin: unused OStrings
Change-Id: I22916424fb97ba27ea6f4e540841a6c851fb8c88
2012-10-09 21:33:20 +01:00
Tor Lillqvist
3237a3772b Typo
Change-Id: I6ec48d3156f11c4ecb5f24a70a5c83603a86f834
2012-10-08 12:07:10 +03:00
Tor Lillqvist
ce3ac48c3a Fix for !SOLAR_JAVA
Change-Id: I43d8680304ef11f2b5f5e3edafcc6af6eca8d601
2012-10-08 11:40:48 +03:00
Tor Lillqvist
c56600dfbe Move the #ifndef DISABLE_DYNLOADING a bit earlier
Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454
2012-10-07 10:43:07 +03:00
Tor Lillqvist
97593ae24a Handle lack of module loading/unloading API when DISABLE_DYNLOADING
There are basicically two classes of cases:

1) Where the code is for obscure historical reasons or what I see as
misguided "optimization" split into a more libraries than necessary,
and these then are loaded at run-time. Instead, just use direct
linking.

2) Where dynamic loading is part of the functionality offered to some
upper (scripting etc) layer, or where some system-specific non-LO
library is loaded dynamically, as it is not necessarily present on
end-user machines. Can't have such in the DISABLE_DYNLOADING case.

Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0
2012-10-07 07:59:15 +03:00
Noel Grandin
4faa36e42f sal_Bool->bool in jvmfwk
Change-Id: I8821bc7e4615421a710e6fdf913e646059dd5665
2012-10-04 21:29:33 +02:00
Tor Lillqvist
e2b23364d4 Mention the plugin mechanism
Change-Id: I51e22cceb332048552e86acb2362b907617a84cc
2012-10-04 11:53:57 +03:00
Arnaud Versini
36a2db3722 Replace usage of rtl_*Memory with equivalent from string.h
Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159
Reviewed-on: https://gerrit.libreoffice.org/734
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-10-01 18:48:05 +00:00
Michael Stahl
5032dc0fc3 gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.

Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
2012-09-28 16:49:08 +02:00