Commit Graph

563 Commits

Author SHA1 Message Date
32a617d8f0 move external packages registration to RepositoryExternal.mk
(with condition from configure.ac for cairo)

Change-Id: I7f4864a7f331f1a3da9c796b51f4e16c58382580
2014-02-17 11:39:28 +01:00
f70343bbbb fdo#60924: Move more libs/packages to autoinstall
Change-Id: I687f45eeea1e60e8076222865bd803c2ad18f758
2014-02-17 11:39:27 +01:00
4af38b099c fdo#60924: Move some packages to autoinstall
Change-Id: I5805c8d1c9978b8625ba0e0ea6c4337baf5a6cb5
Reviewed-on: https://gerrit.libreoffice.org/7903
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-10 13:23:33 +00:00
80e8f1e22d Repository.mk: respect --disable-lpsolve
Change-Id: Ibb9b54784d4a58d0c865d29237e2ef05218544e3
2014-02-06 11:06:37 +01:00
5784cafe46 scp2: migrate URE Packages to AutoInstall
Change-Id: I98a272e8cf009aa04bbd07ee333f9853e2a906d2
2014-02-04 21:16:16 +01:00
4f346c9c16 gbuild: component files for Jars in NONE layer and move testComponent
... from URE to NONE.

Change-Id: If43e07b88f2ab0e845f77d1f1a835627e5c48dd7
2014-02-04 21:16:16 +01:00
9870a5f73d scp2: move URE jars to AutoInstall
Change-Id: I68c5f5ac015e8c5d8efd60921f38eb31c6f8088d
2014-02-04 21:16:16 +01:00
26cb65db74 Make the OpenGL stuff in chart2 compile for OS X (but definitely won't work)
Change-Id: I487fcd12bf90e8ce2c05743244858f7b5145c355
2014-02-03 17:48:26 +01:00
9aa500f3ea Add a condition for chartopengl in Repository.mk.
Change-Id: I899fed47873ee48b556bbda9417570b2d637b7bb
2014-01-29 19:18:03 +01:00
d082e4fc38 Revert "disable building the OpenGL pieces"
This reverts commit 449157cae77fc6a1b2a96f53d78d7a93cb33436d.

Re-enable building the OpenGL pieces and limit it to Windows, Linux and
FreeBSD

Conflicts:
	chart2/Module_chart2.mk

Change-Id: I9edaaad4244b3c2c2b1174d91f57464dad69f214
2014-01-29 08:09:17 +01:00
cc2893834d related: fdo#73682 Introduce HTML detection service
Change-Id: I66bb579019ce8411b821c623955a454fd81cf811
Reviewed-on: https://gerrit.libreoffice.org/7600
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-01-23 14:49:22 +00:00
692c724f5e fdo#60698: Merge odbcbase into odbc
We odbcbase is just used inside odbc library, so merge them.

Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6
2013-12-24 09:12:16 +00:00
0591a98155 build fix
Change-Id: I6a2e8e69106584b6b7c9af35d4e0e79bf6ef5342
2013-12-21 13:49:33 -08:00
1327020b67 Re-enable building test-active.oxt
Change-Id: I56bd0630f8d238488d9d6598d87acefe1a08fdf0
2013-12-16 11:24:12 +01:00
eebc1e9a8a fdo#60698: Merge fastsax and sax_shared into expwrap
Change-Id: I6f8c6827c00db50184a46f39968f882b944d18d4
Reviewed-on: https://gerrit.libreoffice.org/6967
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
2013-12-11 20:45:30 +00:00
130833f80e fdo#39956 Delete JAB
JAB has been discontinued in favor of the native IA2 bridge.

Change-Id: I88461f73c620507d3e97b077ea2abdd2229322e1
Reviewed-on: https://gerrit.libreoffice.org/6819
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-12-05 05:31:43 -06:00
35c1d6f761 fdo#60698: Merge hatchwindowfactory into svt
They are used at same conditions, and hatchwindowfactory just have
four files, so we don'y have any reason to keep them separated.

Change-Id: Iae3bb26ab1e95a309bf0d83c4ef17a0bf0261179
Reviewed-on: https://gerrit.libreoffice.org/6811
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-04 04:47:39 -06:00
1c3d51fd68 fdo#60698: Merge tvhlp1 into ucpchelp1
tvhlp1 just have 2 files, and this lib is used always with ucpchelp1. By
these reasons, we can merge these 2 libs.

Change-Id: I515f9c12893c986279ffac91b83879c467b091c7
Reviewed-on: https://gerrit.libreoffice.org/6820
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-02 05:15:36 -06:00
24426c98a8 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Change-Id: I0de4b88eb076e53792aa6d16092dcbcbb548246c
Reviewed-on: https://gerrit.libreoffice.org/6763
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-11-24 15:09:07 -06:00
a18b56c225 only register updatecheck libs, when this is enabled
Change-Id: If7b882663ab5cd12d4d9ae01e14162f793d8dc8d
Reviewed-on: https://gerrit.libreoffice.org/6757
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-21 10:36:26 -06:00
31b91f6f8a --enable-ia2 no longer disables Java access bridge
Just install both; 448727e598ca0c35ee9cd6f2c25a847c8147943b already made
IA2 an experimental feature with fallback to Java access bridge if
experimental mode is disabled.

Change-Id: I4ca64adbc586bd87b4d28087709f5c2e02bf7990
2013-11-21 15:14:43 +01:00
668d6ada16 fdo#60698: Unify spl and spl_unx
Change-Id: Ifd328ff3ce12364e95d05405759df6588b3a86bc
Reviewed-on: https://gerrit.libreoffice.org/6503
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2013-11-21 03:54:00 -06:00
07d4ae3960 --enable-ia2 disables building java-bridge, so disable packaging it too
Change-Id: I7e3b2d47af9a9b91b22df43fc56cdfd3522de6d8
2013-11-21 00:41:08 +01:00
449157cae7 disable building the OpenGL pieces 2013-11-19 13:47:41 +01:00
678008264f add glew and make chartopengl a dynamically loaded lib 2013-11-19 13:47:39 +01:00
cbf2a0d90c Gbuildify winaccessibility service
Conflicts:
	winaccessibility/source/UAccCOM/UAccCOM.def
	winaccessibility/source/service/AccObjectWinManager.cxx
	winaccessibility/source/service/checkmt.cxx
	winaccessibility/source/service/checkmt.hxx

Change-Id: Ia66872bee7c70c840c1bd5caa626bf63eac9ef7c
2013-11-19 10:02:24 +00:00
026a7dc385 Gbuildify UAA to IA2 bridge
Change-Id: I1aae7ec50c3bb78ac1035d70eaf39c6efef465ab
2013-11-19 10:02:24 +00:00
4c530d3d18 good-bye stringex, you served well
It will be better to handle Android Impress Remote localization
independent of the big LibreOffice source tree. Instead of
stringex, we will use android2po, a 3rd party utility for conversion
strings.xml <-> pot/po.

Change-Id: I4eae53e4f8d94c55e5564d54c5e5c214bc9569d7
2013-11-17 11:03:36 +01:00
c3e55a1f3b Hard-code the path to libgetuid.so in epmfile.pm
...so that it is still found after 7b3133ad882b24834f87b478d00bf4ee92d3cd63
"instsetoo_native: shouldn't need instdir in include path."  And no idea why
getuid was in PLAINLIBS_URE instead of PLAINLIBS_NONE.

Change-Id: I5de2a79cbd3c0064cd7776e269f4792304ec34e3
2013-11-08 12:35:15 +01:00
6f16fd620d liblibo: fix static library linkage.
Change-Id: Ic6b69b322c819ff07d55e3b452dadafc60041e1d
2013-11-07 14:21:40 +00:00
3a009c427f fdo#60698: Merge all libs of io...
creating the libio. All these libraries are always used together, so we can put them
together in one single library.

This save almost 500 kb of the size of the final library.

Change-Id: Ib32fec36cc4eb80ca646ce472c1f1bcdd98ac62b
Reviewed-on: https://gerrit.libreoffice.org/6567
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-11-05 01:02:13 -06:00
80b4191537 fdo#70393: move bluez_bluetooth to a subdir of external
Change-Id: Ia1c5eb2e6c5193256b61ec878abdb648632e1f47
Reviewed-on: https://gerrit.libreoffice.org/6570
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-11-04 23:48:23 -06:00
1f07a1c722 Forgot to remove fpicker from Repository.mk too
...in b40ffd288baf6dc5989cc09c5b5007eee97dd1bf "fdo#60698: Move generic fpicker
to svtools."

Change-Id: Ib0aaf010d61c8a77315430991f41941b57b560e8
2013-11-04 15:01:21 +01:00
5f9cda2dc5 Repository*: no need to register libraries built via ExternalProject
Only libraries (and similar for executables) built as Library need to be
registered; those built via ExternalProject are delivered by Project and
used via gb_LinkTarget_add_libs.  This also means there is no need to
mangle the names in RepositoryFixes.mk.

Change-Id: Ib0b67f54e2eb6efdb0c454c9e2dd599ada229676
Reviewed-on: https://gerrit.libreoffice.org/6533
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-11-02 18:06:06 -05:00
412975713b integrate Apple Keynote import filter
Change-Id: Icc36b761da9262a99af730cfe71f576bcaab3ee1
Reviewed-on: https://gerrit.libreoffice.org/6488
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-30 19:49:34 +00:00
decf809674 fdo#69601: refactor CliNativeLibrary
- stop copying the DLL to OUTDIR
- since that was the main reason for the separation between
  CliNativeLibrary and CliNativeLibraryTarget, merge the targets;
  the newly inherited variables are not expected to cause problems
- the Library remains in layer NONE; the derived CliNativeLibrary
  is in INSTDIR
- hardcode target to URE bin dir for now, no immediate need for
  multiple layers

Change-Id: I3bf4859e8c574f84d69eb43d12ddce0d34b5730c
2013-10-28 14:01:07 +01:00
621b30e277 Revert "Repository.mk: adjust layer of libraries in smoketest instset"
This reverts commit 1b736bf55e8ca79a06faabfa9866fffa6cab6c81.

Obsoleted by commit 359472b2b50165966c27c239eccd3ecfb03e2acc.
2013-10-22 14:42:17 +02:00
504ceee46b Tiled rendering: VCL test app skeleton.
Change-Id: I465dcadf14935bce4f610376b41b9a66963e2cf8
2013-10-21 14:32:56 +02:00
ce038cf8d7 Revert "ucpp is not an ExternalExecutable"
Wrong! It is.

This reverts commit 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec.
2013-10-21 08:01:12 +02:00
359472b2b5 Remove *_Test product, so cppunittester can be NONE again
...as per #libreoffice-dev IRC:

Sep 19 10:32:24 <mst__> sberg, moggi  why the hell is that thing named
  "cppunit/cppunittester" and inside a subdir?  it's obstructing my attempt to
  put it in $(INSTDIR)/program
Sep 19 10:33:28 <mst__> (... and if you wonder "wtf does it have to do with
  INSTDIR" you have never heard of awesome LibreOffice_Test installset.... not
  that i would know who needs it :)
Sep 19 10:36:36 <sberg> mst__, it is in a subdir of solver/*/bin so that on
  Windows it would not accidentally have picked DLLs next to itself instead of
  the module-local DLLs it was supposed to test (back when we had module-local
  output trees)
Sep 19 10:37:02 <mst__> sberg, ahh hysteric reasons then, /me renames it
Sep 19 10:37:55 <tml> mst__, if nobody you know uses LibreOffice_Test, just kill
  it?
Sep 19 10:38:59 <sberg> mst__, tml, LibreOffice_Test was conceived by pmladek
  and/or kendy, IIRC
Sep 19 10:40:31 * kendy does not remember anything about it :-)
Sep 19 10:42:17 <sberg> wasn't that something so users (or QA people?) could
  easily run the smoketest against an installation, to see whether the
  installation is any good at all, by installing that LibreOffice_Test alongside
  the installation proper?
Sep 19 10:43:26 <sberg> mst__, ...and I'd unscientifically vote to kill it
Sep 19 11:34:23 <pmladek> mst__, sberg: I have created the LibreOffice_Test
  package for one QA guy. He does not longer work on LO. I am not sure if anyone
  else started to use it. So, I think that it can be killed.

Oct 17 18:18:07 <tml_> sberg: have you ever noticed that when you try to
  actually run instdir/unxmacxi/LibreOfficeDev.app , the system actually tries
  to run cppunittester inside the app bundle (it says so in the crash report)
  (it crashes because cppunittester requires a specialized DYLIB_LIBRARY_PATH
  apparently)
Oct 17 18:19:29 <tml_> I suspect that the system when cppunittester as part of
  the build process is run from inside instdir (i.e. inside an app bundle) the
  system "caches" this false knowledge, and thinks that the executable of the
  app bundle is cppunittester...
Oct 17 18:19:36 <sberg> tml_, no, never noticed; with "run
  instdir/unxmacxi/LibreOfficeDev.app" you mean calling "open
  instdir/unxmacxi/LibreOfficeDev.app"?  (I always call
  .app/Contenst/MacOS/program explicitly)
Oct 17 18:19:52 <tml_> yes, I mean "open instdir/..."
Oct 17 18:20:53 <tml_> some googling tells me that at least years ago, the
  CFBundleExecutable key in the Info.plist is ignored if it is manually changed,
  so I guess similar caching of mapping between an app bundle and which
  executable to actually run happens in this case
Oct 17 18:23:17 <tml_> and last year somebody even claims "And while on Mountain
  Lion, CFBundleExecutable seems to be a no-op", which would be odd, surely
  there must be widely used apps that have several executables inside the MacOS
  directory; how would the system know which one to run when the app is run?
Oct 17 18:24:38 <tml_> hmm, apparently the code that handles this might be open
  source even, http://www.opensource.apple.com/source/CF/CF-744.18/CFBundle.c
Oct 17 18:25:52 <tml_> some mention of "caches" there yes, my guesses might be
  right
Oct 17 18:27:05 <tml_> if I cp -R instdir/unxmacxi/LibreOffice.app foo.app and
  open foo.app, it works fine
Oct 17 18:28:33 <tml_> anyway, I guess it would be cleaner to have cppunittester
  somewhere else even without this problem
Oct 17 18:37:09 <sberg> tml_, yes, IIRC having cppunittester in instdir was a
  misguided mst decision, because that odd LibreOffice_Test product (that
  pmladek said nobody needs any longer anyway) includes it; I think consensus
  was to kill LibreOffice_Test and move cppunittester where all the other NONE
  executables are, but looks like nobody executed
Oct 17 18:37:55 <tml_> ah ok, so mst should know what needs to be done? good, no
  need for me to try to hack this now then
Oct 17 18:38:19 <sberg> tml_, I'll do the cleanup tomorrow, unless somebody
  beats me

This removes smoketest/losmoketest et al along with the *_Test product, as they
seem to not make sense without it anyway.  smoketest/Executable_libtest.mk
appears to be a test that could also be run during the build, and only ended up
in the *_Test product by accident, so I left it untouched for now.

Change-Id: I8024472c909fe0a885eb08ef4d3777f8a9e1f7c8
2013-10-18 14:44:47 +02:00
b538fc543e fdo#60698: Move fileaccess module to ucb
Change-Id: I4c688a4aeedcae56ed6404574bd1bb392d4190cb
Reviewed-on: https://gerrit.libreoffice.org/6311
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-18 12:25:11 +00:00
14bb85e0a3 Resolves: rhbz#919070 offload set span-all-displays to a gtk3 utility
Jaw dropping hack to set a slideshow to span all
monitors if gtk3 is available at runtime

Change-Id: I363f63c9855d5cb1f92d65d0b34add0c60f7263c
2013-10-18 11:11:50 +01:00
2aa5d13ed0 fdo#61950 De-extensionize presentation minimizer
Change-Id: I87805ceacf184d5aa5faae68e8bb932391ace7fb
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-14 12:21:39 +02:00
6019a15751 only build openGL canvas when libGL supports shader
and disable for Mac until code is adjusted to compile

Change-Id: I48c69962ae5e59ae3bdd35d343deeeffdde6e903
Reviewed-on: https://gerrit.libreoffice.org/6160
Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-10-07 21:29:26 +00:00
e52f1bd7b3 Add opengl canvas implementation.
Adds opengl canvas implementation - display-list-based, all
rendering done as textured geometry. Needs shader support.

Currently compiles and works on Linux, Mac should be ~easy to
add, win32 eventually.

Change-Id: Ibf3eb88d6a36a91b2960a3a6320d708160e4fc14
2013-10-07 17:33:45 +02:00
cb177b6d79 libxmlsec: stop delivering static and import libraries
... and also check COM instead of CROSS_COMPILING.

Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c
2013-10-01 10:39:56 +02:00
b5fa3764c7 fdo#69601: quick fix for wrong cli_cppuhelper.dll in instset
This needs more investigation to find proper solution but the problem is
probably that URE/bin/cli_cppuhelper.dll is not signed by "sn.exe".

Change-Id: I318293603be838c41d09791136697de74091d37d
2013-09-22 22:03:31 +02:00
764e688fcf desktop: soffice.bin and unopkg.bin cleanup
Clean up the horrible mess around unopkg.bin unopkg.com unopkg.exe and
soffice.bin soffice.exe and crashrep.com executables and associated
renaming via Packages in the desktop makefiles by simply using
RepositoryFixes to correct the names.

Change-Id: I4d3a549462cfa90a63d62b35db1b0407b25239f7
2013-09-22 11:08:32 +02:00
a546bf8d5b pyuno: rename the python wrapper executable
Putting it in a subdirectory on solver is no longer necessary since
python3 started delivering to INSTDIR, so lose the crazy naming.

Change-Id: I17e924e5d872768a64f6a3112f1294f3def7120e
2013-09-22 11:08:31 +02:00
70f834827b sal: rename "cppunit/cppunittester" executable
... and put it in OOO layer since it's used by the smoketest instset.

It was in subdirectory for hysteric reasons, to pick up libraries from
module local output directories in the dmake build system.

Change-Id: I73b66672b17ede52c03071eb2ddee1a23c059ea9
2013-09-22 11:08:31 +02:00