Commit Graph
178 Commits
Author SHA1 Message Date
Michael Stahl 4722bb82f8 desktop: unbreak soffice --valgrind
(regression from e6a9dc22a4)

Change-Id: Ib394a64fb70a3b578d462c351eb9d68e9ac55d62
2017-03-07 13:38:11 +01:00
Stephan Bergmann 709709962d Upon failure, 'cd' itself already prints a message to stderr
Change-Id: Iabe3a6bb14ca3e83a0792d7fc131ae0ac74e578c
2017-02-11 12:54:24 +01:00
Stephan Bergmann ccedfa046a Revert "fix desktop scripts"
This reverts commit f52eb759f6.  I assume this was
intented to be a fix for e6a9dc22a4 "tdf#105204
fix shellcheck warnings in desktop/scripts" (later addressed with
7ba0b28cc3 "Unbreak soffice.sh").  But I think
these quotations are actually useful parts of that original commit.  I fail to
see how pathname expansion (aka globbing; nor field splitting, if that is what
was actually meant in "we want globbing here") should be a useful feature here.

Change-Id: I5c33c40cfe2a817f628442fed70a07f06dd275cc
2017-02-06 13:58:30 +01:00
Stephan Bergmann 7ba0b28cc3 Unbreak soffice.sh
Change-Id: I8c827db4c16a4a169dd710787bf9beb123ddc7b6
2017-02-04 16:34:15 +01:00
Jochen Nitschke f52eb759f6 fix desktop scripts
reverts parts of e6a9dc22a4
we want globbing here

Change-Id: Ibe4672f41b0fe6a75d1aca898cc55414e138f6ef
Reviewed-on: https://gerrit.libreoffice.org/33913
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
2017-02-04 11:37:13 +00:00
qarkai e6a9dc22a4 tdf#105204 fix shellcheck warnings in desktop/scripts
Use $(..) instead of `..`,
use && and || instead of -a and -o,
double quote to prevent word splitting,
handle cd failure.

Change-Id: I860891323a81ac4a46c868ab028df1e1f837c115
Reviewed-on: https://gerrit.libreoffice.org/33897
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
2017-02-04 08:46:14 +00:00
Michael Stahl 8f232026f0 soffice.sh: can't hurt to force system allocator for massif
Change-Id: Ib999ed36befae52894c04eaa95be76f2a7cfdd3b
2016-11-07 16:34:42 +01:00
Markus Mohrhard a021a436c0 remove reference to old OpenGL stuff
Change-Id: I3398910136d82a25bba508505db9d9a1b080a0be
2016-02-07 16:13:59 +01:00
Baptiste Daroussin 3a8b00910e FreeBSD can live with default search path
Change-Id: I3fa26aaf57d9620e952823c303ee77e2fc642045
Reviewed-on: https://gerrit.libreoffice.org/20651
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-12-14 11:05:25 +00:00
Katarina Behrens c15b96a4b9 C++ solution of 'unopkg can't be used by root'
This way should cover all un*x-like OSes (unopkg.sh excludes
e.g. OS X)
This effectively reverts commits 723e099972 and
9444ffc93a

Change-Id: I0b4425d1c9eff8e51e5d9a4dab35775084106a23
(cherry picked from commit faa2c06226146e3ab4b7fa8096cf213ea9d52a23)
2015-06-19 15:57:44 +02:00
Katarina Behrens 9444ffc93a Remove bash-ism, allow also --bundled option for root
Change-Id: I34511c7947ff78654a34a3d2bd21754b6d004420
2015-06-15 13:35:57 +02:00
Katarina Behrens 723e099972 Don't let root run unopkg without --shared option
with the exception of -h|--help.

It only makes sense to run unopkg with root priviledges if adding,
deleting etc. extensions system-wide for all users (i.e with --shared
switch ). In all other cases it only messes up access rights to
extensions, so prevent that. Furtheron, running LibO from the root
account (and installing root-user-local extensions) is not a
supported scenario.

Change-Id: I2817f62ae0bb400cefed240e792873f563fbe76e
Reviewed-on: https://gerrit.libreoffice.org/16250
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-06-14 21:25:34 +00:00
Michael Stahl b1fac3dde6 desktop: add soffice --record parameter for easy use of rr
Allow recording all JunitTests with "RR=1 make check".

Change-Id: Ie540cb42990d3032d3fa38abedd4e5134f3ded2c
2015-05-20 21:13:41 +02:00
Thorsten Behrens 27491725a6 Fixup my earlier quoting fix.
Change-Id: I9a7afb28e09f7f8aa577e180f647839d67964bdf
2015-05-12 10:36:51 +02:00
Thorsten Behrens 23c0e00b50 Add some quoting to shell scripts.
I'd be surprised if the places given want globs and word
splitting...

Change-Id: I0eb9f2d39ac43479ee06a2477ba309a8e1944d20
2015-05-11 23:05:54 +02:00
Stephan Bergmann 8fdb239735 Fold URE: Linux ure/share/java/* -> program/classes/
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28 15:32:26 +01:00
Stephan Bergmann 45ca1bfc22 Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).

Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-28 11:57:28 +01:00
Stephan Bergmann eef94c1655 Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-28 11:57:28 +01:00
Stephan Bergmann f6848ac737 Adapt unoinfo to new Mac OS X LibreOffice.app layout
Change-Id: I0e7fc27f558de2af7e860ca2ab2da1952fc85678
2014-09-29 22:52:28 +02:00
Stephan Bergmann 95343c998a Disable rtl/alloc.h also for Helgrind
Change-Id: I472d11d50a3b0810779108f3f81624ab9880fe8b
2014-05-08 12:11:24 +02:00
Stephan Bergmann 3ceaeff1cf Skip gcj's gij executable, like other JREs' java executables
Change-Id: Ida84a271a066e89ceb7e5dd2fd23a744f5529917
2014-03-14 12:20:41 +01:00
Stephan Bergmann 1fc195f7e8 Simplify code (VERBOSE was unused)
Change-Id: I281be165fe110fee3e174e96e11cdbc4aa5671e0
2013-10-17 15:35:29 +02:00
Stephan Bergmann 15be40969c Fix quoting
Change-Id: Ie2228247f5edc107ed183a25ef30256d8041e000
2013-10-17 11:51:33 +02:00
Stephan Bergmann d879a74ee2 Scripts need executable bit
...or else they would end up non-executable in instdir, now that they are
directly copied there via desktop/Package_scripts_install.mk.

Change-Id: I8d2add1fd7f13ae9080d2f710b5fbb60d1e8ad1a
2013-10-17 11:45:39 +02:00
Michael Stahl 2426689500 desktop: ure-link is installed by ure/Packge_install.mk already
Change-Id: Ic575d340d0b3b42dc9b07790ab094c8ce6016329
2013-09-10 20:41:20 +02:00
Björgvin Ragnarsson d2ed00f711 unopkg: use default umask when installing shared extensions
This makes sure shared extensions are readable by users when root's umask has been
set to a value such as 0027.

Change-Id: If495afae8eaf3a640c99ecb7598b79b59363c12c
Reviewed-on: https://gerrit.libreoffice.org/5521
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-20 15:09:18 +00:00
Erik Auerswald e75b8e9b4b fdo#62192: broken launch script, bork in March in Germany
Change-Id: I0b726a696fe64ffb80a0cf367d5fa6225619ec92
2013-07-09 23:39:38 +02:00
David Tardon 1ca02a5c2e drop unused scripts
Change-Id: Icf4526214d9cfaaa9fe41b40b662c1e3bd9e6960
2013-05-05 14:43:14 +02:00
Michael Meeks daeed90f45 re-base on ALv2 code. Includes:
Patch contributed by: Jurgen Schmidt
    remove onlineregistration with dependencies
    http://svn.apache.org/viewvc?view=revision&revision=1240245
    imported patch package_eventlistener.patch
    http://svn.apache.org/viewvc?view=revision&revision=1172103

    Patch contributed by Pedro Giffuni
    Accept Google Chrome OS fonts as equivalent to MS fonts.
    http://svn.apache.org/viewvc?view=revision&revision=1233155
    http://svn.apache.org/viewvc?view=revision&revision=1233408

    Patch contributed by Andre Fischer
    Do not add targets for junit tests when junit is disabled.
    http://svn.apache.org/viewvc?view=revision&revision=1241508

    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
    cws mba34issues01: #i114600#: remove forbidden characters
    from list of unencoded characters
    http://svn.apache.org/viewvc?view=revision&revision=1172370

    Patches contributed by Oliver Rainer-Wittman
    some clean up in JPEGReader due to memory constraints
    http://svn.apache.org/viewvc?view=revision&revision=1299729
    119114 - method <UpdateDialog::addSpecificError(..)> - create
    entry with correct type
    http://svn.apache.org/viewvc?view=revision&revision=1305265

    Patches contributed by Ariel Constenla-Haile
    i118707 - make toolbar control's popup window grab focus
    http://svn.apache.org/viewvc?view=revision&revision=1225846

    Patches contributed by Herbert Duerr
    #i118662# remove usage of BerkeleyDB in desktop module
    http://svn.apache.org/viewvc?view=revision&revision=1213171
    minor cleanups in dp_persmap.*
    http://svn.apache.org/viewvc?view=revision&revision=1215064
    flush early to prevent problem with extension manager not
    cleaning up its objects
    http://svn.apache.org/viewvc?view=revision&revision=1228147
    i118726 do not flush *pmap file while reading it
    http://svn.apache.org/viewvc?view=revision&revision=1230614
    #i119048# migrate BDB extension entries using a simple heuristic
    http://svn.apache.org/viewvc?view=revision&revision=1300972
    #i119048# handle edge cases when importing BDB hash files
    http://svn.apache.org/viewvc?view=revision&revision=1301428
    #i119113# fix of-by-one when importing BDB files
    http://svn.apache.org/viewvc?view=revision&revision=1305420

restore our encryption settings, icon themes, and dictionaries.
removed wrapper hacks, kill obsolete bundled extension blob /
pre-registration handling, remove duplicated quickstart code.
remove OS/2 conditionals.
2012-11-19 17:44:55 +00:00
Rene Engelhard 293f16bb2d move 2>&1 where it belongs in soffice.sh, thanks mst
Change-Id: I5cc08e3fd88beba70cac61ff4570c02dbad9faa0
2012-10-19 12:09:12 +02:00
Rene Engelhard 1c192dc0fc deb#690717 fix bashism in /bin/sh script
Change-Id: I43b0065e56b234a5aa748ac1593c29a44fdb1647
2012-10-18 11:16:20 +02:00
Michael Meeks 0ee9572db3 ignore various unhelpful signals in our --backtrace gdb setup.
Change-Id: I8ede40ebf5954e0492e790ce148c9b7f1f1e62df
2012-10-02 14:58:02 +01:00
Stephan Bergmann f4a4ba9ac1 Clean up option processing
* Support --version on non-UNX, too.

* Consistently show the first unknown option and the help blob in the presence
  of any unknown options.

* There is no need to tunnel --help/--version past oosplash in the soffice
  script, as oosplash is prepared to treat them adequately (esp. not pass them
  over any pipe); this only added unnecessary variance to what spellings exactly
  are supported and how mixtures of --help, --version, and unknown options are
  handled.

Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
2012-09-26 11:30:35 +02:00
Riccardo Magliocchetti ad050e40f1 headless build: build oosplash again
It looks like we want it so revert:
dae66b7b1d
4d408cc2f0
64a530cfa8

Change-Id: I7cd410861b28a0556de3375a0865a7baef52bd78
2012-09-10 21:26:15 +02:00
Riccardo Magliocchetti dae66b7b1d desktop: use soffice.bin instead of oosplash if build with --enable-headless
Change-Id: I2e4742a6893267ea8d4ec2048dd0686fd309a7db
2012-09-07 20:13:51 +02:00
Stephan Bergmann 6dcb3d4ef4 Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either.  This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).

Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
2012-08-10 16:03:28 +02:00
Michael Stahl fb79f6d64e soffice.sh: remove valgrind --error-exitcode=101
This doesn't really seem so important, and it prevents running junit
tests with VALGRIND=memcheck from working, because the special restart
exit code on first start up is mangled by valgrind and so the actual
test doesn't run.
2012-07-11 21:08:27 +02:00
Matúš Kukan d5c18a48f8 desktop: use CustomTarget makefile 2012-04-04 11:31:55 +02:00
Caolán McNamara d2ed905c85 when run under memcheck allow SIGUSR2 to dump current memory allocations 2012-03-28 13:08:58 +01:00
Caolán McNamara 8757c9c462 remove static OUStrings from static_initialization_and_destruction chain 2012-03-28 13:08:58 +01:00
Caolán McNamara 3f9f18c53d Resolves: rhbz#788045 swriter --help etc doesn't show help
because the test in soffice to skip oosplash is for only
one argument, and swriter points to soffice with an additional
--writer argument, so the test is skipped
2012-02-29 11:10:31 +00:00
David Tardon c475316c00 simplify handling of JITC_PROCESSOR_TYPE 2012-01-15 20:12:01 +01:00
Stephan Bergmann 7a00472067 Better fix for the valgrind.log problem.
Only redirect to valgrind.log if --valgrind but not $VALGRIND is given.
2012-01-13 09:28:16 +01:00
Stephan Bergmann 4f00cdfec5 valgrind.log creates more problems than it solves. 2012-01-12 11:34:10 +01:00
David Tardon 7ad72045d7 avoid generating a file in the source tree 2012-01-11 17:32:41 +01:00
David Tardon f5b96148cb we need a var. assignment here, not a value 2012-01-11 16:55:09 +01:00
Michal Svec a0999b7cd4 Fix the soffice.sh wrapper's -h / --version. 2011-12-14 18:19:47 +01:00
Stephan Bergmann b786a33cfd Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation. 2011-10-24 13:59:58 +02:00
Stephan Bergmann cf33eb5fb4 Removed spurious "" around multi-word shell arg. 2011-10-20 23:04:12 +02:00
Stephan Bergmann 2ff63bcdea Undo basis/brand split: merge basis share/ into brand share/. 2011-10-07 22:06:28 +02:00