Commit Graph

78 Commits

Author SHA1 Message Date
496bc3cd6c fdo#45071 Remove Libreoffice browser plugin
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep
ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact.

Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Conflicts:
	extensions/source/nsplugin/source/npshell.cxx

Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
2014-09-09 15:20:35 +02:00
6492c8576e Make the "Mac-like" or "canonical" app bundle structure always used on OS X
In other words, only executable files go in the MacOS folder. Dynamic
libraries and bundled frameworks (i.e., LibreOfficePython), and
nothing else, go in the Frameworks folder, and all other files go in
the Resources folder.

Especially, note that Java class files and rc (.ini) files also go in
Resources.

Such an app bundle structure is what Apple strongly suggests one
should use, and it has been hinted that future versions of code
signing and/or Gatekeeper will require such a structure.

There is still some ugliness thanks to traces of the historical
separation of URE from "the office". Like there are two separate
"unorc" files, one for URE, one for the LibreOffice application. IMHO,
this should be cleaned up, but is probably controversial.

(Eek! I now see there are actually *three* unorc files in the app
bundle. Not intentional. Need to fix that later.)

Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-09-09 13:55:23 +03:00
d52985d814 scp2: stupid typos
Change-Id: I94b3f39ce3dc642c97dfd515b026e4470724b06c
2014-07-18 18:04:49 +02:00
80583d1c6d scp2: move pdfimport library to AutoInstall
Change-Id: Iac7d30ea181edbc479034e7b6f8eea285d7f6fbb
2014-07-18 17:50:39 +02:00
04c18d9855 remove a bunch of unneeded defines
Change-Id: I02e99812b7a6afba04afee1b5c810bf5b1640c51
2014-06-09 08:59:42 +02:00
9986f236d6 Don't reference the avmediaMacAVF library if not built
Change-Id: If4f5c51e986b51f5795012b9535ab7a7ea51337b
2014-05-15 19:53:07 +03:00
2dde1db057 oox: generate data, not code for drawingML export adjustment values
Change-Id: I5898314c630348552ca2e0a6df1cc76972e3974c
2014-04-15 10:10:51 +02:00
4c3626af6b scp2: move jfreereport to AutoInstall
Change-Id: I13bf9d1b75b3da1a8b6925f12eca938141fc9baf
2014-03-18 22:18:12 +01:00
2bec9f4950 scp2: move apache-commons to AutoInstall
Change-Id: I5a50e7fcf5eafb18a63d250a82810703d3d8b11d
2014-03-18 22:18:11 +01:00
01adcd8024 scp2: move liblangtag to AutoInstall
Change-Id: If79d57cf1743427106c0e4202fb4d5e42b5a807e
2014-03-18 22:18:10 +01:00
d49543cefb scp2: remove some variable/macro cruft
Change-Id: If07b243e71be7c67d36e3d652c52781ef902e380
2014-03-03 23:41:15 +01:00
4f7b96886e Allow to build lpsolver based on CoinMP library.
Change-Id: I0a3b2bd6744f6ccca0017cd1e06a4018f085445a
2014-03-03 13:35:43 +01:00
083fa76745 fdo#60924: Autoinstall lpsolve package.
Change-Id: I1404cfc08cd03cff000b088a305e47c96df0b986
2014-03-03 13:35:42 +01:00
513a947a92 scp2: These defines are not used in the sources.
Change-Id: Ie586fd383af33cb8dcb00b2d8f9ae41f39a1a673
2014-02-25 19:11:58 +01:00
32db4993c4 normalize values of SYSTEM_POPPLER, SYSTEM_JFREEREPORT
Change-Id: I8034b6fdf85697b6b409143396983ef3170257b2
2014-02-12 09:53:11 +01:00
5866b33bdd normalize values of SYSTEM_HSQLDB, SYSTEM_POSTGRESQL
Change-Id: Ia29a173ab6bb3442f98cd6db4db67ad27e7fa9a1
2014-02-12 09:53:10 +01:00
0443d0a90e normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
2014-02-12 09:53:09 +01:00
e3abec3f07 fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.

(regression from 4af38b099c741c3676aefeb20c515913aaeed666)

Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
2014-02-12 09:53:08 +01:00
070ca1e280 jfreereport: stop pointlessly renaming the jar files
Change-Id: Ia2c5ce1176496e98643e2cefc65d4c6d0cf9c781
2013-10-25 23:31:30 +02:00
f1a99d2d22 fix path after move to external
Change-Id: Ibcf2dca1a2c624e6467db45ccfe195035e35555e
2013-10-19 09:50:45 +02:00
8ede32d157 add missing dep
Change-Id: I2535fb641ba6e0f3c651868143e70ca0bbd88d5e
2013-10-13 12:05:49 +02:00
a382dad6af Clean up Mac OS X .jnilibs
Those .jnilibs that are not needed as .dylibs (this includes those that are also
UNO components) are handled via RepositoryFixes.mk.  The remaining one,
libjava_uno.jnilib is packaged as a symlink in instdir.  Everything else is not
necessary and removed (including the venerable oddity macosx-create-bundle).

Change-Id: I34a1801b0733cdff885c1c72db16fa631c5d82ef
2013-09-14 18:11:55 +02:00
d78e4f0c46 scp2: a little cleaning
Change-Id: I4b41f8c2c6dd82956cb2493676c9854744eecbad
2013-09-09 22:09:09 +02:00
b45d2e7d14 ure: install files with filelists
This commit adds gb_Package_add_symbolic_link.

Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-09-09 22:09:01 +02:00
e486f1612d No need to install non-SONAME versions of icu libs
Change-Id: Ica8057c70f5e4b63830c6ffe7fb85269a10b845f
2013-09-02 23:08:51 +02:00
c6a7300974 Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
2013-08-18 21:11:16 +03:00
f5d3fb36ab scp2: remove unused defines
Change-Id: Icac7b4dd5dd31f39e0db09e251e7136e61a064aa
2013-06-13 07:50:33 +02:00
c32c11fbd4 MPLv2 subset improvements. 2013-06-04 17:45:42 +01:00
0c99c1c2ca gallery: allow disabling the from-source build in configure
Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629
2013-05-15 16:14:21 +01:00
674a7b44f3 install branding images using filelists
This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).

Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
2013-04-30 17:50:43 +02:00
62badf3828 Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-22 09:37:38 +01:00
4811c2dc9f adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3

lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.

openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.

Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-15 15:26:32 +02:00
d11cad2a76 fdo#60924: autoinstall more libraries
This autoinstall thing is quite cool because we don't need #ifdefs in
scp2. Conditions in Repository.mk are enough.

Change-Id: I31525a7e1d3bf0e4484f838483a829490621a241
2013-04-11 16:44:24 +02:00
94d6136e1c install UI config. files using filelists
Change-Id: I422c8912bc2557c2c03bb885e5c193deb93d1d5e
Reviewed-on: https://gerrit.libreoffice.org/3233
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-11 03:44:11 +00:00
19d263f095 one variable to rule them all
one variable to find them,
one variable to deliver them all and into filelist put them,
in $INSTDIR where the installer searches.

Change-Id: I989f578f0ed6f9ef9167522249b36d95c15bfd1b
2013-04-10 17:05:44 +02:00
ce9bf0f868 upgrade icu to 51.1
Change-Id: I1c0d5ca4b2f88ca48225fcdbeb978f27fa91f7a6
Reviewed-on: https://gerrit.libreoffice.org/2953
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
2013-03-30 14:23:14 +00:00
b3644853d6 Report Builder should be an optional component in Windows installer
... because when it is installed, it hides the original template based
reporting UI, which is preferred by some users.

Change-Id: Id758b664d6b06c2c12e32c428b5dbcf7bfaf045d
2013-03-23 11:26:02 +01:00
90a326c702 fdo#61950 move report builder from bundled extensions to plain code
For test sample report from fdo#61726 can be used.

Change-Id: Iacf8ddc4cf8ad0a408d72e18ecb7237476afeffe
Reviewed-on: https://gerrit.libreoffice.org/2718
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-03-18 15:30:44 +00:00
66298dbfa7 fix typo
Change-Id: I1c92bbb3cc01655e38b0059df57650c517176939
2013-03-03 09:28:31 +01:00
c743324292 Remove the need to manually register libs in scp2
- we have all the needed information in gbuild
- reduce the amount of double and triple bookkeeping
- hopefully the generated files for scp2 are only a intermediate step
  and we can do whatever perl voodoo scp2 does directly in gbuild
- currently using basctl as an example
- this also means we have to be more strict in Repository.mk with what
  we register:
  - if we dont build a libs, it shouldnt be registered (otherwise scp2
    will want the nonexisting lib)
  - in the end, this is a Good Thing(tm): we dont want anyone trying to
    e.g. link against a lib we dont build
- should now hopefully work on all platforms
- added module bookkeeping to gbuild

Change-Id: I241ca67edbfabae83859274f9aa35d2d26165ef6
2013-02-15 19:31:40 +01:00
856c075e93 convert libxslt to gbuild and add to tail_build
Change-Id: I16eb442fd65b3a2f3a44108f670fd364dc7a64c0
Reviewed-on: https://gerrit.libreoffice.org/1988
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2013-02-05 19:47:04 +00:00
18bd1e7364 convert redland to gbuild and add to tail_build
Change-Id: I953fb203b1a24920f236c2f6e1fd9d82edda1f0f
Reviewed-on: https://gerrit.libreoffice.org/1493
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-30 14:50:49 +00:00
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
4565afec9e Clean up scp2 flags
Change-Id: Ib4f5c28478d24a97131b6d9b3b1539d4982f762d
2012-12-05 09:50:36 +01:00
19107879c7 package moz stuff only when WITH_MOZAB4WIN == YES
Change-Id: I2228d246e6d94f27d18d597c3833578592487b94
2012-12-04 16:03:45 +01:00
a75a79e327 Adapt scp2 to WITH_MOZAB4WIN
Change-Id: Ibef1ceb454eafba7129c774b8ced8c743ea3ce3d
2012-12-04 13:58:03 +01:00
79e5ee5f69 Isolate PDF Import so it can be made optionally installable
...which can be attractive for installation sets that use --with-system-poppler
but do not want the LO core package to depend on a poppler package.  See the
comment at the top of scp2/source/ooo/module_pdfimport.scp for details.

The build-time --disable-pdfimport configure switch is gone, PDF Import is built
unconditionally for all platforms but Android and iOS now.  (The
ENABLE_PDFIMPORT variable now uses TRUE/FALSE rather than YES/NO, to increase
consistency across those variables.)

Change-Id: I6509d0b2e770b276cd54540408fb1ec5a7dda058
2012-11-29 11:36:58 +01:00
332bd4296e MinGW: Bundle also the libpoppler-*.dll
Change-Id: I181e408e7bc585d93fbeb2ce76a32bc350845c91
2012-11-28 17:04:20 +01:00
d04ac66578 dung out berkeleydb gnumake / configure bits ... 2012-11-21 14:52:49 +00:00
a6139f6fe6 Key different browser plugin features to specific flags
This is a rework of f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 "Key all browser
plugin features to --enable-nsplugin."  The problem with that was that Mac OS X
supports pluging browser plugins into LO documents (which was originally
controlled by --enable-mozilla) but not plugging LO into browser windows (which
was originally controlled by --enable-nsplugin), so controlling the former with
the same switch as the latter did not actually work.

Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones,
ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and
ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows).  The
--enable-nsplugin configure switch is gone completely, setting the feature flags
is always done fully automatically now.

Change-Id: Iecf706637465e865c987563b5de489fa90b4c904
2012-11-20 11:24:05 +01:00