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>
It is not enough to just have CURL in BUILD_TYPE or not. At least the
ftp UCP requires libcurl unconditionally, so it can't be built if we
don't have either a system or bundled libcurl.
Change-Id: I38e9939acb160d581e9a070a6cd7a0c89ddb5266
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>
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>
This was introduced with f624144e41291c11f3892dda1027221989d704be
but hopefully should no longer be necessary nowadays because the
dependencies on the individual xcd files should be sufficient; it
can lead to not really necessary rebuilds of the registry xcd files.
Change-Id: I189c54d9c61eb0a1f8ec286b0a4e55e83eb08c26
- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME
Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
It is constant and can just be replaced by $(SRCDIR)/solenv.
Use BUILD_TYPE where it was used to check if config_*.mk is sourced.
Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
... not sure if it wouldn't be better to do this directly when linking,
but what do i know about this signing stuff anyway...
Change-Id: Iabebf21dd8c0198afb4fd03403fca3ca8a0c9b22
After recent instdir changes the SCPZIP_REPLACE thing was not used any
more for Info.plist, so all the ${FOO} things were left in Info.plist
unexpanded with predictably wonky results, a non-working app.
Instead just expand it from the configure script.
While at it, use a correct CFBundleShortVersionString: only three
integers should be in that.
Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION
as 1.0, and drop the "variables", as that is what those "variables"
*means*. They were used to refer to the OOo 1.0 formats. (It would
have been utterly wrong to define them as something else, like another
product name and a newer version number, in openoffice.lst, so
pointless to have them there.)
Drop the meaningless BUILDIDCWS.
Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
... by replacing gb_Rdb_install with a separate constructor so the right
target can be registered at the module. There is still an ugly special
case for the ure/services.
Change-Id: I81c004143f201aaf38daca99819888313ee24f49
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)
For Android and iOS, gb_INSTROOT probably still needs to be set.
The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.
Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
This commit breaks linkoo.
make dev-install continues to work as before but it's not necessary to
use it anymore.
make check now uses files copied into instdir by gbuild.
TODO: fix remaining issues so that instdir is the same as install/.
Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
The previous commit changed several nodes in main.xcd from
LibreOfficeDev to LibreOffice; revert that.
Change-Id: Ib1c114a0716a6a930c52c9c9a9144154fcb3934d
In main.xcd we have some variables which used to be defined mostly
in instsetoo_native/util/openoffice.lst and replaced in installer.
Process the file in custom target,
so we can copy correct main.xcd directly with gbuild.
Change-Id: Ie2b1b6da1adb161394f69c345bbe8671cfafb7c4
The lines that help dignose a problem is almost never the first one that
just states "there was an error". The explanation of the error follows
in the next lines. So don't quit immediately after the first error-line,
but wait what the command has to tell and log/print the whole info.
Change-Id: I2a4b3470b4b66ed37fa5e5a34d452c548d24b965
Reviewed-on: https://gerrit.libreoffice.org/5861
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
