Age | Commit message (Collapse) | Author |
|
Had been totaly broken by the recent changes. (Which is fine, it is
just an experimental hack anyway, I am not sure whether it will ever
be used in anger. Just a pet peeve of mine, I dislike seeing
libraries, configuration files, resources etc mixed together in one
"program" folder, especially on OS X, where the convention is to have
app-specific dylibs and frameworks in "Frameworks", and resource files
in "Resources". But this is not any requirement as such; there are
apps in the Mac App Store that blatantly "break" this convention.)
Basically, replace uses of gb_PROGRAMDIRNAME and
gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which
for normal builds all expand to the same "program" anyway.
Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
|
|
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
|
|
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
|
|
program is only a symlink to it there, created by the installer.
(Hmm, would it be possible to have MacOS symlink to program instead? It
would simplify things :-)
Change-Id: If21df47da5ac7c77358656f40d9caaaa62a7e87f
|
|
Change-Id: I85e573add83d46550822e55e691b61fc2729475a
|
|
Change-Id: I1a8685ec5fff2e78aa9eb97ba9b331a1a2a99e74
|
|
Change-Id: Iddc1a86d34a6d05f2a2939fb72f057fb387bbe1f
Reviewed-on: https://gerrit.libreoffice.org/3781
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
|
|
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
|
|
Change-Id: I75e8d897bc06806008c9b6e62b4741769f437dec
|
|
Change-Id: If17f3fcd143abfe3870ae763052dcf135d831124
|
|
Change-Id: Id22ba6632f273159838923bf26420d27dd8a89d3
|
|
Change-Id: I2d3f5d127f831ee9abc020d46558f7cfbe8c9380
Reviewed-on: https://gerrit.libreoffice.org/2349
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
|
|
Restrict moz to windows, and build vars also
impacts nss, connectivity
Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282
Reviewed-on: https://gerrit.libreoffice.org/1233
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Add moz prebuilt & msvcrt80 copy
Change-Id: I335c25904c16db534a4878ff6a17db202eaef4f5
Reviewed-on: https://gerrit.libreoffice.org/1100
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
|
|
Change-Id: Ide36957d1826f5ac20b14a6919abfc684c33cb9c
|
|
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* bulk replacement of "-Wl,-z,origin,-rpath,..." with
"-Wl,-z,origin -Wl,rpath,..."
* additional hunk for directory/c-sdk/config/FreeBSD.mk in
moz/seamonkey-source-1.1.14.patch did not apply and has been dropped
Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
|
|
|
|
Change-Id: I48a4f43cc2e675d0f72bb7d87893f39f39450488
|
|
We need the nss libs in our final install always (unless using system-nss libs)
so finally disentangle nss from mozilla because --disable-build-mozilla had the
sideeffect of *not* including the nss libraries in the final install. Which
means that the xml_xmlsec.dll on windows couldn't be loaded due to missing
dependencies.
a) Strip out the nss libs from the pre-builds if those are being used.
b) Strip out the nss libs from the mozilla build itself if that's being used.
c) Don't include the nss libs in the weird mozillaruntime.zip which gets unpacked
into the install.
d) Package the nss libs directly in scp2 like everything else
Change-Id: Ia89d75cb0c0b83e84e60d0444ffc7997103fbc55
|
|
Change-Id: I0b3fe5a6270ecc45ec1b4710ea008a17c600484b
|
|
Change-Id: I0b370ac227bbd833078804d8a276b48666df734c
|
|
...by using system libsqlite3.dylib instead of nss one (see comment in
nss/makefile.mk for details).
(dmake knows neither < nor ! in conditional expressions, that is the reason for
the strange .IF .ELSE ... .END constructs.)
Change-Id: I5abe0f74ad55aac06b91163751bb8145b759b9ca
|
|
...signature of TransitionWindowWithOptions apparently changed slightly in 10.6,
and /Developer/Tools/Rez can more reliably be found in /usr/bin.
Change-Id: Iba55478f3b6de1b4695b686095f4aa0bc0af8e7b
|
|
This is to avoid problems with too long command lines on Windows.
Change-Id: Ifc99bedd37aea7619e002145d4acbb7ec2a14246
|
|
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file
Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
|
|
|
|
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
|
|
|
|
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc. This removes
the need for the special extshl and EXTRPATH=LOADER. Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
|
|
We now default to -std=gnu++0x, so this shouldn't be necessary.
This reverts commit 437fe5a444411f68d1848c49121394f16f09611b.
|
|
|
|
|
|
|
|
|
|
cross-compiling is broken currently when using separate nss
|
|
|
|
|
|
We always either build nss or use the system one, so there isn't a case where
we want to bundle the ancient nss in the pre-builds
|
|
This also finishes the uncoupling of NSS from the --with-system-mozilla.
|
|
|
|
* On Mac, nss-config must not emit -rpath-link switch.
* --with-system-nss/-nspr horribly broke in combination with the
routine use of MOZ_ARCH and resulting MOZ_CROSS_COMPILE for Mac,
and the latter appears to be unnecessary for a normal build, anyway,
so is now conditional CREATE_UNIVERSAL_MAC_MOZ_ZIP, in case anybody
still uses the code to create universal moz archives.
* This in turn revealed two issues in moz that have been addressed
with a new macosx_build_fix.patch.
|
|
|
|
|
|
|
|
|
|
Reduces the build time of the 'moz' module by 30% or so.
|
|
|
|
As this is a copy of Linux2.6.mk this has to be
MPL 1.1/GPL 2.0/LGPL 2.1 I think.
|
|
|