Commit Graph

98 Commits

Author SHA1 Message Date
c79a5f87b1 remove executable bit
Change-Id: I91f6e861f6d0dbea1b57ac73857e0c706b27f681
2014-04-17 15:11:14 +02:00
617c5e44e1 [API CHANGE] Remove obsolete com.sun.star.comp.helper.UnoInfo
It had originally been used in the SDK's "Simple Bootstrap" for Java,
com.sun.star.lib.loader.Loader class, but only left in there for backwards
compatibility with pre--three-layer OOo versions (i.e., < OOo 3) when that
Loader was switched to use the unoinfo executable with the fix for #i88687#
"C++/Java Simple Bootstrap broken" in e2b7ea631a5e7297346ec826527a019e2baca020
"INTEGRATION: CWS sb87 (1.5.10); FILE MERGED: 2008/05/07 11:34:25 sb
1.5.10.1: #i88687# let Loader call new unoinfo instead of old juh.jar
UnoInfo.getJars."

Recent work in AOO to undo three-layer caused AOO to now accidentally use the
backwards-compatibility code, so AOO ran into a problem that they solved with a
change to com.sun.star.comp.helper.UnoInfo that LO erroneously merged in as
95ada2d65f6d999920f2a04599ac132fa632d66d "Related: #i122483# set correct
classpath, include unoil.jar."

The better approach is to get rid of that backwards-compatibility code and
remove the obsolete UnoInfo class.  While this is nominally incompatible, in
practice no other client code but the SDK's com.sun.star.lib.loader.Loader
should ever have used it (it should have been designed as a private interface
for just that one client from the start, anyway).  Java applications using
"Simple Bootstrap" and built against old versions of the SDK (post the fix
for #i88687# and its introduction of the unoinfo exectuable in OOo 3) will
continue to work against new LO versions (as the backwards-compatibility code
that would call the removed UnoInfo class will not be triggered anyway; and even
if it were, all resulting exceptions would be caught and the new code path using
the unoinfo executable be chosen then).  Likewise, Java applications using
"Simple Bootstrap" and built against the new SDK will continue to work against
old OOo/LO/AOO vesions as far back as the fix for #i88687# and its introduction
of the unoinfo exectuable in OOo 3.

Change-Id: I64824ed002c3ccdf6912eab67499beb0c423081e
2013-08-29 12:09:08 +02:00
c3359bd7e6 Related: #i122483# correct library path
(cherry picked from commit f6c713b7e38d4de5afdf508b8d6bfc6d1d27e000)

Change-Id: I327d9946d139aaf3347c42e8b565a8de635b5ed1
2013-06-11 20:08:40 +01:00
cb6d67c21f Spelling "separate" (etc) correctly is hard 2013-05-15 11:14:28 +03:00
10f4ddc9a5 Declaration of stat shadows a global declaration
Change-Id: I154ba64ff61d08d7a600a83eb7dd41381aca73ca
2013-02-24 16:21:19 +01:00
613221bde1 convert odk to gbuild and add to tail_build
Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
Reviewed-on: https://gerrit.libreoffice.org/2288
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2013-02-23 21:39:52 +00:00
2b4fd2c89a re-base on ALv2 code. Includes:
Patches contributed by Pedro Giffuni:
    Avoid some uses of non portable #!/bin/bash in shell scripts.
    http://svn.apache.org/viewvc?view=revision&revision=1235297
    Reduce the dependencies on non standard GNU copy.
    http://svn.apache.org/viewvc?view=revision&revision=1238684
    Correct /usr/bin/env path.
    http://svn.apache.org/viewvc?view=revision&revision=1235619

    Complex Toolbar Controls Extension from the SDK
    Patches contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1190390
    i118615 - make epm more verbose
    http://svn.apache.org/viewvc?view=revision&revision=1204288

    Patches contributed by Mathias Bauer (and others)
    gnumake4 work variously
    http://svn.apache.org/viewvc?view=revision&revision=1394707
    http://svn.apache.org/viewvc?view=revision&revision=1394326

    Patches contributed by Juergen Schmidt:
    jsc341: i117327: take care if no dependency node in current
    description exists, create one
    http://svn.apache.org/viewvc?view=revision&revision=1172101
    jsc341: i117327: add extra extension dependency check
    http://svn.apache.org/viewvc?view=revision&revision=1172098
    make initial branding changes
    http://svn.apache.org/viewvc?view=revision&revision=1231878

    Patches contributed by Ingo Schmidt
    native373: #i117733# no linux jre installation on 64 bit systems
    http://svn.apache.org/viewvc?view=revision&revision=1167536
    native373: ##164464# improve debian support
    http://svn.apache.org/viewvc?view=revision&revision=1167537

    Patch contribtued by Armin Le-Grand:
    Changed various aspects concerning usages of old vendor names
    http://svn.apache.org/viewvc?view=revision&revision=1293313

fix for neon webdav, remove coinmp bits, improve odk script,
cleanup & remove OS/2 conditionals, system ucpp fixes,
remove OS/2 conditionals, restore our license filenames.
2012-11-12 11:46:43 +00:00
e7037b2e7e Kill set_oenv remnants (by just renaming the required timestamp file)
Change-Id: I779128111a4f69235a4c8cc6510018fc61d1b24b
Reviewed-on: https://gerrit.libreoffice.org/1026
Tested-by: Tor Lillqvist <tml@iki.fi>
Reviewed-by: Tor Lillqvist <tml@iki.fi>
2012-11-11 08:05:14 +00:00
a58f677fd2 ooo.lst: use more variables
Change-Id: I478996c43d069648241d8c5cff64ff78b9230154
2012-10-11 19:33:57 +02:00
274c28a15c odk: try to fix Windows build
Change-Id: I626f2cbc4bdf30e73e6c24c1b9040c0f6d24eda9
2012-10-10 22:14:59 +02:00
76987f83c8 replace findsofficepath.obj by static lib
Change-Id: I652ac46aec72a92667995353efa637f0a2310672
2012-10-10 17:26:54 +02:00
4e2c95c786 Java cleanup - remove unnecessary null checks
Change-Id: I72a847b1180e9aeb8dec18bcaedee7286eee7754
2012-08-28 16:15:43 +02:00
8bfe47960f Java5 updates - convert to generics
Change-Id: I039e51958865a7ea000034e7bf765f64d49689cd
2012-08-20 19:04:33 +01:00
b9042fad7c re-base on ALv2 code.
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-21 15:00:05 +01:00
b6db3e3acc re-base on ALv2 code.
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
2012-06-21 13:11:06 +01:00
78b7f6e138 targetted revert of minor cppcheck cleanup
Change-Id: Id3100ef8f8381bc05e5a01c56fc5d611094857bf
2012-06-08 14:11:53 +01:00
b8c046acfc only add -manifest:no for msc--mingw's ldd chokes on it
Change-Id: I3be2e72e5d4fbe879318e0cef48bfe0852f8bbbc
2012-05-20 14:18:46 +02:00
4081378945 Minor improvement of previous fix 2012-04-23 14:16:36 +02:00
8eb9c441d4 WaE: Clang adding 'int' to a string does not append to the string 2012-04-23 14:16:34 +02:00
fb067f9bb2 replace OpenOffice.org to LibreOffice in registry keys 2012-03-23 11:45:18 +01:00
7904a8cc56 I don't see NO_BSYMBOLIC being used anywhere 2011-12-11 02:57:59 +02:00
3f2ff54778 remove pch from the include list 2011-11-27 15:24:45 -06:00
f047e16160 remove include of pch header from odk 2011-11-27 13:15:31 -06:00
7e9a597202 Revert "cppcheck reduce scope of var in odk/..unoapploader.c"
This reverts commit 595de860c7a3fb274d2cf432bd1fa04a008503a0.
MSVC couldn't handle this.
2011-10-08 10:44:28 +02:00
595de860c7 cppcheck reduce scope of var in odk/..unoapploader.c 2011-10-07 15:57:46 +02:00
bb5bdbbdca Revert "Trying to chop out the uwinapi library"
This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.
2011-09-16 16:26:03 +02:00
2dea0dab4f Trying to chop out the uwinapi library 2011-09-16 15:52:40 +02:00
3ea396c8d2 Some cppcheck cleaning 2011-05-08 14:54:29 +02:00
3b8b6cef10 Change <file>.toURL() to <file>.toURI().toURL() 2011-05-03 23:02:44 +02:00
13b487277a dragonfly stuff 2011-02-15 12:12:28 +00:00
91a0a53e0c Replace all occured, occurance etc. 2010-12-05 20:19:49 +00:00
4d823780b5 Changed symlink processing to new application name. Now the function will try for libreoffice in the PATH, instead of soffice. 2010-11-03 16:31:32 +01:00
c503a41fb6 There is no libdl on NetBSD, just like on FreeBSD, so don't use it there. 2010-11-02 15:21:29 +01:00
e6c68c3eed fix cppcheck warnings 2010-10-31 20:38:51 +00:00
8cad7d1947 add modelines to .hxx files as well 2010-10-27 13:05:40 +01:00
b09ac477d2 tweak this for AIX 2010-10-13 14:36:49 +01:00
e9a59da46a Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-13 10:58:04 +02:00
d3c455c0f9 Look for LibreOffice and not OpenOffice.org from java 2010-10-05 15:36:53 +02:00
a5f00c67dc Use the fetched 185d60944ea767075d27247c3162b3bc-unowinreg.dll 2010-09-21 15:42:27 +02:00
e91dde17f2 kfreebsdport01: remove .IF "$(JDK)" != gcj, we need JAVA_INCLUDES for gcj, too 2010-04-17 02:49:49 +02:00
1296914c84 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
sb
b1c385870a sb116: #i106845# removed obsolete IRIX port 2009-11-13 11:04:06 +01:00
be29d7f7e5 CWS-TOOLING: integrate CWS sb113
2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
2009-08-26 sb merged in DEV300_m56
2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")
2009-09-16 14:37:52 +00:00
6743faf872 CWS-TOOLING: integrate CWS mingwport22
2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo
2009-08-26 06:36:38 +00:00
4fbb6a8a25 CWS-TOOLING: integrate CWS cmcfixes58
2009-05-04 13:51:10 +0200 cmc  r271450 : #i101533# latest sw warnings
2009-05-04 00:02:46 +0200 cmc  r271436 : #i101517# silence new warnings
2009-05-03 23:13:53 +0200 cmc  r271435 : #i101305# add that one back in
2009-05-02 16:30:42 +0200 cmc  r271431 : #i101493# get it to build, and remove some warnings
2009-05-02 16:12:37 +0200 cmc  r271430 : CWS-TOOLING: rebase CWS cmcfixes58 to trunk@271427 (milestone: DEV300:m47)
2009-04-23 13:19:33 +0200 cmc  r271163 : #i101305# remove annoying import foo is unused warnings
2009-04-21 17:10:34 +0200 cmc  r271048 : #i101246# remove AVMEDIA_MANAGER_SERVICE_NAME defines again
2009-04-21 17:07:41 +0200 cmc  r271047 : #i86323# remove xml2cmp unused methods
2009-05-07 06:54:56 +00:00
de305da090 CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb  r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb  r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb  r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb  r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb  r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb  r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb  r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb  r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb  r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
2009-02-19 11:42:47 +00:00
9aa7fc7b25 CWS-TOOLING: integrate CWS unowinregfix_DEV300 2008-10-16 14:06:02 +00:00
630e43f19c INTEGRATION: CWS jsc21 (1.6.2); FILE MERGED
2008/06/27 08:49:55 jsc 1.6.2.1: #i90032# adapt link flags and linking for MacOS
2008-07-11 13:41:18 +00:00
fe8740a04d #i90609# SIZE_MAX undeclared for .Net2003 compiler, take SAL_MAX_SIZE instead. 2008-06-12 06:40:56 +00:00
5433e8263d INTEGRATION: CWS sb87 (1.4.148); FILE MERGED
2008/05/06 11:54:21 sb 1.4.148.3: #88687# finished off previous commit
2008/04/24 13:10:35 sb 1.4.148.2: RESYNC: (1.4-1.5); FILE MERGED
2008/04/24 11:56:00 sb 1.4.148.1: #i88687# extracted cppuhelper_detail_findSofficePath, call new unoinfo executable to get necessary information about office installation
2008-06-09 12:09:30 +00:00