Commit Graph

180 Commits

Author SHA1 Message Date
20feaeed7e the program dir is called MacOS on MacOS X
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
2013-05-13 18:32:11 +02:00
3805ee5f21 moz: build fix
Change-Id: I85e573add83d46550822e55e691b61fc2729475a
2013-05-05 12:44:23 -07:00
919f853278 moz: build fix
Change-Id: I1a8685ec5fff2e78aa9eb97ba9b331a1a2a99e74
2013-05-05 12:06:49 -07:00
ea9ba874c3 install moz. runtime files using filelist
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>
2013-05-04 14:43:58 +00:00
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
f290bc7835 don't copy the mozilla include files, use it in place
Change-Id: I75e8d897bc06806008c9b6e62b4741769f437dec
2013-02-25 22:18:07 +01:00
fb781bbf66 moz: makefiles don't need executable bit
Change-Id: If17f3fcd143abfe3870ae763052dcf135d831124
2013-02-25 22:10:28 +01:00
c66e2c4836 mozabdrv: add dependency to internal mozilla
Change-Id: Id22ba6632f273159838923bf26420d27dd8a89d3
2013-02-25 19:32:23 +01:00
61e7c592fa convert moz to gbuild and add to tail_build
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>
2013-02-24 10:34:40 +00:00
a0c53a961a First fix for fdo#56902
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>
2012-12-04 10:53:36 +00:00
67fca36dbe Better handling of well-know prerequisites under windows
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>
2012-11-19 09:29:52 +00:00
78d8557aab fdo#54015: At least FreeBSD ld requires -z origin, moz redux
Change-Id: Ide36957d1826f5ac20b14a6919abfc684c33cb9c
2012-08-30 09:36:08 +02:00
34ca8dd9ad fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN
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
2012-08-29 12:02:26 +02:00
c06bba0999 fix syntax errors in moz/zipped makefile, add chmod 2012-07-10 12:41:47 +02:00
e5ac3107e1 moz build fixed on Ubuntu
Change-Id: I48a4f43cc2e675d0f72bb7d87893f39f39450488
2012-07-05 21:55:26 +02:00
423479cd75 Resolves: fdo#51166 disconnect inclusion of nss libs in install from mozilla
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
2012-06-25 14:19:00 +01:00
403bdf7747 NSS_INCLUDE_LIST is always empty, so simplify based on that
Change-Id: I0b3fe5a6270ecc45ec1b4710ea008a17c600484b
2012-06-25 14:19:00 +01:00
9dbdf715eb .patch files don't need executable bits
Change-Id: I0b370ac227bbd833078804d8a276b48666df734c
2012-06-22 22:39:30 +02:00
dc82cf021f Make PyUNO work --with-macox-version-min-required=10.6
...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
2012-06-12 13:48:38 +02:00
39ec7832d1 Adapt to --with-macosx-version-min-required=10.6 and Xcode 4
...signature of TransitionWindowWithOptions apparently changed slightly in 10.6,
and /Developer/Tools/Rez can more reliably be found in /usr/bin.

Change-Id: Iba55478f3b6de1b4695b686095f4aa0bc0af8e7b
2012-06-06 14:05:23 +02:00
fb97224c94 deliver all used mozilla headers into one dir
This is to avoid problems with too long command lines on Windows.

Change-Id: Ifc99bedd37aea7619e002145d4acbb7ec2a14246
2012-05-30 14:56:00 +02:00
b1c3e8ae28 make gbuild the default assumption of build.pl
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
2012-04-29 03:50:46 +02:00
3934efe28c sigh, need a 64bit zlib too on windows, reverting 2012-04-13 14:06:55 +01:00
452af5f452 gbuildize internal zlib
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
2012-04-13 13:15:25 +01:00
30a29aa6f1 README files don't need executable bits 2012-03-23 21:58:17 +01:00
7c4f2ec8a7 Simplify install name handling for external libraries on Mac OS X
...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.
2012-02-29 18:46:38 +01:00
5fd1a34816 Revert "Work around g++ -std=c++0x rejecting "typeof" keyword"
We now default to -std=gnu++0x, so this shouldn't be necessary.

This reverts commit 437fe5a444411f68d1848c49121394f16f09611b.
2012-02-24 14:06:19 +01:00
437fe5a444 Work around g++ -std=c++0x rejecting "typeof" keyword 2012-02-21 09:31:34 +01:00
e12b26ef24 moz missing this pointers, default constructor 2012-02-20 16:32:51 +00:00
b469be0723 Added and improved READMEs for modules in libs-extern-sys 2012-02-09 18:23:49 +01:00
de21b9a50d Added and improved READMEs for modules in libs-extern-sys 2012-02-09 12:14:01 +00:00
7cee57f336 ups, that part should not have been committed.
cross-compiling is broken currently when using separate nss
2012-01-11 00:46:31 +01:00
abb1bcf7bf fix build on Mac - use SDK, map loader_path for nss-libs, remove HH cruft 2012-01-11 00:44:08 +01:00
dcfd4beb21 childs -> children 2011-12-08 11:32:41 +02:00
1097edc1e2 We always either build nss or use the system one
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
2011-11-04 11:34:28 +00:00
f6f5c89259 Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec.
This also finishes the uncoupling of NSS from the --with-system-mozilla.
2011-11-02 17:37:53 +01:00
fa70d98e72 moz: replace Linux 3.0 workaround with one for 3.x 2011-10-18 17:39:09 +02:00
a1a059467b Fix building moz on Mac OS X.
* 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.
2011-09-28 13:54:24 +02:00
fd652012ce sb140: #i117079# @executable_path -> @loader_path hack missed some instances 2011-09-09 17:46:38 +02:00
be8d553b9b use MKDIRHIER instead of MKDIR to avoid bogus error messages 2011-09-07 11:17:56 +02:00
34a3046698 moz ldap libraries: don't need LIBDIR to exist 2011-09-07 11:17:55 +02:00
d37a57326a moz: do not try to get into non-existent directory and ignore error 2011-09-07 11:17:55 +02:00
291b857786 Build our mozilla (module moz) against the nss we have built anyway.
Reduces the build time of the 'moz' module by 30% or so.
2011-08-30 16:10:16 +02:00
361ffc4805 Use MACOSX_SDK_PATH 2011-07-26 15:56:17 -05:00
304c490d72 nss/moz: Add Linux 3.0 profile
As this is a copy of Linux2.6.mk this has to be
MPL 1.1/GPL 2.0/LGPL 2.1 I think.
2011-07-24 23:14:15 +02:00
56f35e6b39 Drop %_EXT% which was always empty 2011-06-03 13:27:35 +03:00
ce74a5d149 Merge commit 'ooo/DEV300_m103'
Conflicts:
	graphite/makefile.mk
	libxml2/makefile.mk
2011-03-23 16:59:29 +01:00
3c07c026b5 #i115784# moz/d.lst: deliver windows libs, too. 2011-02-18 16:23:50 +01:00
074034a79e Clean up makefiles 2011-02-02 12:15:06 +01:00