Commit graph

92 commits

Author SHA1 Message Date
Caolán McNamara
3d55526996 colon needed for LD_LIBRARY_PATH set but empty 2010-12-10 21:43:01 +00:00
Takeshi Abe
78fc293ffb colon needed for LD_LIBRARY_PATH set but empty 2010-12-10 21:41:53 +00:00
Caolán McNamara
a90c504165 make it easy to valgrind the smoketest 2010-12-10 12:18:29 +00:00
Caolán McNamara
2cf8fbb08f we can remove this duplicate switch 2010-12-07 15:32:55 +00:00
Jan Holesovsky
ba2064a80f Merge remote branch 'origin/libreoffice-3-3' 2010-11-16 09:34:30 +01:00
Robert Nagy
b02ec347aa Set LD_LIBRARY_PATH+JAVA_HOME on OpenBSD.
OpenBSD does not support $ORIGIN so we have to set LD_LIBRARY_PATH
in order to find the shared libs of libreoffice.
We also set JAVA_HOME here because it's path is outside of the
default ones.
NetBSD can probably use this too.
2010-11-15 16:03:28 +01:00
Robert Nagy
580cc3fdf3 Set LD_LIBRARY_PATH+JAVA_HOME on OpenBSD.
OpenBSD does not support $ORIGIN so we have to set LD_LIBRARY_PATH
in order to find the shared libs of libreoffice.
We also set JAVA_HOME here because it's path is outside of the
default ones.
NetBSD can probably use this too.
2010-11-15 16:00:48 +01:00
Jan Holesovsky
ffca4280ae Restart soffice.bin when necessary.
In some cases, like when the migration is in progress, or when new extensions
are registered, soffice.bin dies with a 'restart' me status.  This implements
the correct handling of this state in oosplash.bin.
2010-11-08 16:23:55 +01:00
Jan Holesovsky
b1f0e0298c Restart soffice.bin when necessary.
In some cases, like when the migration is in progress, or when new extensions
are registered, soffice.bin dies with a 'restart' me status.  This implements
the correct handling of this state in oosplash.bin.
2010-11-08 16:21:04 +01:00
Giuseppe Castagno
c227511cbb Correct symlink in order to be used in SDK and testtool.
This in order to recognize the application installation path;
only for Linux and similar platforms.
2010-11-03 16:31:15 +01:00
Caolán McNamara
53baa03a40 add AIX to desktop 2010-10-13 20:30:55 +01:00
Giuseppe Castagno
8c9b9b4384 Correcting one more bashism. 2010-10-13 16:03:11 +02:00
Jan Holesovsky
1c5abcbd60 Merge commit 'ooo/OOO330_m10' 2010-10-13 11:30:59 +02:00
Jan Holesovsky
e9fe1e24fb Implement unix quick-starter
Kendy's standalone unix-quick-starter, with tweaks to make it
conditionally compiled, and load png images with the new
branding layout from Michael.
Fixes to the soffice shell-script to not run pagein for a 2nd start
2010-10-12 15:40:42 +01:00
Jan Holesovsky
cb39099f75 Source ooenv in the soffice wrapper if it exists (for linked builds). 2010-09-15 11:31:55 +02:00
sb
90a93cdf13 hb22: #b6982587# treat null LD_LIBRARY_PATH like unset one 2010-09-09 10:48:03 +02:00
Mikhail Voytenko
d3fa4e4b47 jl152: #i108704# fix typo 2010-05-10 17:55:28 +02:00
Mikhail Voytenko
c288dd3227 jl152: #i108704# allow to restart the office 2010-05-10 17:35:24 +02:00
sb
0bff64160e sb121: #i86044# call crash_report with full path (and make some simplifications) 2010-03-12 15:06:21 +01:00
Jens-Heiner Rechtien
82b1d381cd 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
661efe7a78 sb116: #i106891# evaluate conditional expression in soffice script at build time (based on a patch by mmeeks) 2009-11-13 14:45:27 +01:00
sb
a1ce3509a0 sb116: #i106850# propagate soffice.bin exit code from soffice script 2009-11-12 16:59:54 +01:00
Ivo Hinkelmann
f88817b11e CWS-TOOLING: integrate CWS sb107
2009-04-14 13:09:13 +0200 sb  r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb  r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb  r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb  r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb  r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb  r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb  r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb  r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb  r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb  r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb  r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb  r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb  r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb  r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb  r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb  r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb  r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb  r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb  r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb  r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb  r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb  r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb  r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb  r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb  r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
2009-04-27 11:24:10 +00:00
Vladimir Glazounov
112eda37de CWS-TOOLING: integrate CWS native196_DEV300 2008-10-02 08:34:45 +00:00
Rüdiger Timm
79819c2f26 INTEGRATION: CWS macrestart_DEV300 (1.14.90); FILE MERGED
2008/08/22 21:36:46 hro 1.14.90.1: #i92798# Fixed concurrency between soffice.sh and officeloader delivering
2008-08-29 09:28:20 +00:00
Vladimir Glazounov
41db0a37e0 INTEGRATION: CWS vcl30stop2 (1.13.78); FILE MERGED
2008/07/25 09:58:33 pl 1.13.78.2: #i92121# fix a typo
2008/07/25 09:06:55 pl 1.13.78.1: #i92121# make XInitThreads optional (but on by default)
2008-08-18 12:06:51 +00:00
Vladimir Glazounov
a6aedb7ccb INTEGRATION: CWS vcl30stop2 (1.33.78); FILE MERGED
2008/07/25 09:58:33 pl 1.33.78.2: #i92121# fix a typo
2008/07/25 09:06:54 pl 1.33.78.1: #i92121# make XInitThreads optional (but on by default)
2008-08-18 12:06:38 +00:00
Vladimir Glazounov
df6a2f00f8 INTEGRATION: CWS odfpfixes01 (1.1.2); FILE ADDED
2008/06/17 17:47:04 is 1.1.2.1: #158103# hiding three layer office
2008-07-01 21:55:52 +00:00
Rüdiger Timm
6c9a7ca74c INTEGRATION: CWS sb87 (1.11.12); FILE MERGED
2008/06/09 08:20:24 sb 1.11.12.2: resolved conflict against DEV300m17
2008/05/09 14:54:38 sb 1.11.12.1: #i88211# introduced vnd.sun.star.pathname pseudo URL feature for INIFILENAME and URE_BOOTSTRAP, dropped INIFILEPATH feature again in return
2008-06-09 12:29:28 +00:00
Rüdiger Timm
75ca52faaf INTEGRATION: CWS sb87 (1.1.2); FILE ADDED
2008/05/07 11:20:45 sb 1.1.2.2: #i88687# added java mode
2008/04/24 11:39:56 sb 1.1.2.1: #i88687# added unoinfo executable
2008-06-09 11:57:21 +00:00
Rüdiger Timm
2277d4e4dc INTEGRATION: CWS sb87 (1.32.12); FILE MERGED
2008/05/09 14:54:38 sb 1.32.12.1: #i88211# introduced vnd.sun.star.pathname pseudo URL feature for INIFILENAME and URE_BOOTSTRAP, dropped INIFILEPATH feature again in return
2008-06-09 11:57:10 +00:00
Rüdiger Timm
a4c30e5dc3 INTEGRATION: CWS sb87 (1.12.18); FILE MERGED
2008/04/24 13:21:17 sb 1.12.18.2: RESYNC: (1.12-1.13); FILE MERGED
2008/04/24 11:39:27 sb 1.12.18.1: #i88687# added unoinfo executable
2008-06-09 11:56:57 +00:00
Kurt Zenker
e2722b2326 INTEGRATION: CWS native152 (1.2.38); FILE MERGED
2008/05/15 09:08:23 is 1.2.38.1: #i89391# ooodev with its own basis root dir
2008-05-21 11:10:21 +00:00
Kurt Zenker
1c329c09b9 INTEGRATION: CWS native152 (1.2.38); FILE MERGED
2008/05/15 09:08:22 is 1.2.38.1: #i89391# ooodev with its own basis root dir
2008-05-21 11:10:01 +00:00
Vladimir Glazounov
3b77857f35 INTEGRATION: CWS oxtsysint01 (1.11.2); FILE MERGED
2008/04/25 05:08:04 obr 1.11.2.1: #i85856# desktop integration no longer uses unopkg gui
2008-05-15 08:19:36 +00:00
Rüdiger Timm
95082489c5 INTEGRATION: CWS changefileheader (1.10.14); FILE MERGED
2008/03/28 15:26:28 rt 1.10.14.1: #i87441# Change license header to LPGL v3.
2008-04-11 02:34:39 +00:00
Rüdiger Timm
84769c862a INTEGRATION: CWS changefileheader (1.31.14); FILE MERGED
2008/03/28 15:26:28 rt 1.31.14.1: #i87441# Change license header to LPGL v3.
2008-04-11 02:34:25 +00:00
Rüdiger Timm
2adec53bd1 INTEGRATION: CWS changefileheader (1.12.14); FILE MERGED
2008/03/28 15:26:27 rt 1.12.14.1: #i87441# Change license header to LPGL v3.
2008-04-11 02:34:12 +00:00
Vladimir Glazounov
675580f35f INTEGRATION: CWS sb83 (1.6.34); FILE MERGED
2008/03/04 16:23:41 sb 1.6.34.10: missing export
2008/02/14 13:05:19 sb 1.6.34.9: #i84200# for now, move crash reporter to brand layer
2008/02/12 08:44:09 sb 1.6.34.8: #i84200# lots of cleanup
2008/02/08 11:12:48 sb 1.6.34.7: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/01 13:29:23 sb 1.6.34.6: RESYNC: (1.7-1.9); FILE MERGED
2008/01/23 15:16:33 sb 1.6.34.5: #i84200# moved executables from brand layer to basis layer
2008/01/21 15:13:48 sb 1.6.34.4: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/07 15:27:10 sb 1.6.34.3: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
2008/01/02 12:26:02 sb 1.6.34.2: #i84200# First step of basis/brand split.#
2007/11/22 09:45:46 sb 1.6.34.1: Merged in CWS sb80.
2008-03-18 12:45:09 +00:00
Vladimir Glazounov
56e2cda2b1 INTEGRATION: CWS sb83 (1.28.34); FILE MERGED
2008/03/17 09:02:10 sb 1.28.34.13: RESYNC: (1.29-1.30); FILE MERGED
2008/03/04 16:23:41 sb 1.28.34.12: missing export
2008/02/14 13:05:19 sb 1.28.34.11: #i84200# for now, move crash reporter to brand layer
2008/02/12 12:44:26 sb 1.28.34.10: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
2008/02/12 08:44:08 sb 1.28.34.9: #i84200# lots of cleanup
2008/02/08 11:12:48 sb 1.28.34.8: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/01/23 15:16:33 sb 1.28.34.7: #i84200# moved executables from brand layer to basis layer
2008/01/21 15:13:48 sb 1.28.34.6: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/07 15:27:10 sb 1.28.34.5: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
2008/01/02 16:19:04 sb 1.28.34.4: #i84200# simplified search for pagein again, as basis-link is now also available in good old monolithic OOo
2008/01/02 12:27:01 sb 1.28.34.3: #i84200# typo (missing .../bin/...)
2007/12/03 13:46:29 sb 1.28.34.2: #i84200# First step of basis/brand split.
2007/11/22 09:45:46 sb 1.28.34.1: Merged in CWS sb80.
2008-03-18 12:44:45 +00:00
Vladimir Glazounov
a52c8c68da INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
2008/02/19 16:25:38 is 1.1.2.2: #i85112#_changing_windows_directory_structure
2008/01/31 16:59:44 is 1.1.2.1: #i85112# new basis  link
2008-03-18 12:44:27 +00:00
Vladimir Glazounov
9697be1528 INTEGRATION: CWS sb83 (1.11.184); FILE MERGED
2008/02/12 12:44:26 sb 1.11.184.4: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
2008/01/31 17:00:15 is 1.11.184.3: #i85112# new basis  link
2008/01/11 14:22:02 sb 1.11.184.2: #i84200# build basis-link only on Windows (some Solaris sed complains about missing line end, and this basis-link is not needed there, anyway)
2007/12/27 12:26:15 sb 1.11.184.1: #i84200# The version number in basis-link needs to be abstracted over.  TODO: The for-now explicit 2.4 needs to come from somewhere else!
2008-03-18 12:44:17 +00:00
Vladimir Glazounov
724c24e668 INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
2008/02/19 16:25:38 is 1.1.2.4: #i85112#_changing_windows_directory_structure
2008/01/31 17:00:15 is 1.1.2.3: #i85112# new basis  link
2007/12/27 12:25:30 sb 1.1.2.2: #i84200# The version number in basis-link needs to be abstracted over.
2007/12/21 14:58:11 sb 1.1.2.1: #i84200# Added preliminary Windows basis-link (which still needs to be fixed).
2008-03-18 12:44:01 +00:00
Oliver Bolte
67b7a42819 INTEGRATION: CWS eoladabas_DEV300 (1.29.30); FILE MERGED
2008/02/13 10:26:57 oj 1.29.30.1: #149980# source adabasrc
2008-02-26 15:03:10 +00:00
Rüdiger Timm
97d9fcb858 #i85180# Syntax (correct quotation marks). 2008-01-15 09:40:00 +00:00
Rüdiger Timm
4eb28b2868 INTEGRATION: CWS so8s10u5_SRC680 (1.5.384); FILE MERGED
2008/01/09 12:21:09 obr 1.5.384.1: #b6639520# assume gui mode if passed a single oxt file as argument
2008-01-15 09:35:27 +00:00
Oliver Bolte
696670bc39 INTEGRATION: CWS sb80 (1.6.28); FILE MERGED
2007/11/16 14:47:33 sb 1.6.28.1: #i81275# Moved setting URE_BOOTSTRAP from Unix start scripts to tool's extendapplictionenvironment.cxx.
2008-01-07 08:56:38 +00:00
Oliver Bolte
50eb9151b7 INTEGRATION: CWS sb80 (1.28.28); FILE MERGED
2007/11/16 14:47:33 sb 1.28.28.1: #i81275# Moved setting URE_BOOTSTRAP from Unix start scripts to tool's extendapplictionenvironment.cxx.
2008-01-07 08:56:14 +00:00
Vladimir Glazounov
99e745d606 INTEGRATION: CWS sb71 (1.1.2); FILE ADDED
2007/08/15 10:06:12 sb 1.1.2.1: #i75466# ure-link file for Windows.
2007-10-15 11:59:20 +00:00
Vladimir Glazounov
66ca484175 INTEGRATION: CWS sb71 (1.5.286); FILE MERGED
2007/08/20 08:58:31 sb 1.5.286.4: #i75466# Set URE_BIN_DIR in rc file on all platforms (instead of in startup scripts on Linux/Solaris etc. and in rc files on others).
2007/04/27 14:20:52 sb 1.5.286.3: #i75466# Replaced URE_UNORC and URE_JVMFWK3RC with URE_BOOTSTRAP.
2007/04/18 14:09:40 sb 1.5.286.2: #i75466# Take into account that URE_BIN_DIR is a URL that starts with a file:// prefix.
2007/04/16 13:32:36 sb 1.5.286.1: #i75466# Introduced URE_BIN_DIR, URE_UNORC, URE_JVMFWK3RC.
2007-10-15 11:59:10 +00:00