Commit graph

40 commits

Author SHA1 Message Date
Norbert Thiebaud
ed26c01be1 quiet external module build log unless failure
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-22 08:25:56 +00:00
Tor Lillqvist
a65f6ef56e /p:VisualStudioVersion=11.0 here, too
Change-Id: I7843d3e9565b6577d7c84e547f5b913672cfe1d8
2012-12-18 18:34:18 +02:00
Caolán McNamara
0d08bef014 fix to make MacOSX run again
Change-Id: I7a021c38e1c2e39641a28d95cc9cc7e3d5ee8225
2012-11-12 11:18:29 +00:00
Peter Foley
44b96a2fce fix lcms2 for mac
Change-Id: If2477b9a391d75672a349ba240ceb61e0b06611a
2012-11-09 08:25:55 -05:00
Fridrich Štrba
0aa1baa80b Trying to fix lcms2 again
Change-Id: I376b03d12f8ae59fcf75046c42bcd6ba5d29af2c
2012-11-09 09:27:28 +01:00
Tor Lillqvist
c9930a0bf3 Fix path to the VC2008 project
Change-Id: I9f520ca7fb88c6843582595cd2d999d8060c9528
2012-11-09 08:56:00 +02:00
Peter Foley
a8251cfed1 make does not like commas
Change-Id: Icc1e7f5be1a4c06242793948a07de20cf3e03b61
2012-11-08 21:45:59 -05:00
Peter Foley
7816667a62 blind fix for mingw
Change-Id: I10433beb4c2cea508760083812bc63f4eab02ed0
2012-11-08 20:45:47 -05:00
Peter Foley
d035b3fb1f fix gbuildified lcms2 on mac
Change-Id: I8359e1d441cf7bd8fb01233fe0303dbd6b35895b
2012-11-08 20:35:34 -05:00
Peter Foley
f745212f96 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-08 19:56:11 -05:00
Michael Meeks
ed7d5822c0 cleanup README files.
Convert DOS -> unix newlines.
Cleanup and clarify several files.
2012-11-05 12:30:34 +00:00
Alia Almusaireae
4aed4f436c add a README files
Change-Id: I4bd9a7d00df220e2a3deae3cc1b7b0f4a1098e24
Reviewed-on: https://gerrit.libreoffice.org/989
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
2012-11-05 11:53:53 +00:00
Norbert Thiebaud
1b61693a15 Enough with that...
peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess

reverting the whole mess for now...
to be resubmited when a bit less borked...

This reverts commit c4c160a451.
This reverts commit faef2e51d0.
This reverts commit 057ce1fe29.
This reverts commit a7d34af344.
This reverts commit befae0ceb8.
This reverts commit 433b43bcd2.
This reverts commit 93e2c4a9d2.
2012-11-04 16:33:21 -06:00
Norbert Thiebaud
faef2e51d0 fix some lcms2 gbuildification breakages...
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
2012-11-04 15:23:51 -06:00
Norbert Thiebaud
057ce1fe29 lcms2: fix deliver for Mac
Change-Id: Iee360073d30e490231b4383720d95bdb7cb0fd30
2012-11-04 08:41:12 -06:00
Peter Foley
433b43bcd2 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-04 09:02:09 -05:00
Matúš Kukan
ed0b160041 fix parallelism variables and let's have only --with-parallelism from now on
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
  modules outside of tail_build anyway.

Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
  use parent's jobservers in sub-make where possible

Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-30 20:34:03 +00:00
Peter Foley
bac631c43d fix lcms2 build with VC2012
Change-Id: I665da7fbb3fb9f991d952658b247c9a80e8abede
Reviewed-on: https://gerrit.libreoffice.org/786
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-10-07 01:57:38 +00:00
Fridrich Štrba
858751d723 It seems that the VS2008 files are only maintained in the VS2008 directory
Change-Id: I6fcb0a9045b81ea291904f92396df88ffd351c49
2012-10-05 22:45:03 +02:00
Fridrich Štrba
56c520fa70 Upgrade lcms2 to 2.4 release
Change-Id: I21186cef7fe30542eaabbdeeb8920c3839724805
2012-10-05 16:38:24 +02:00
Fridrich Štrba
d18455e246 Revert "It seems that we have endianness problem in internal lcms2"
This reverts commit d9ae757308.
2012-10-05 16:35:43 +02:00
Fridrich Štrba
27a8a02826 Revert "Oops"
This reverts commit 03c766e601.
2012-10-05 16:35:43 +02:00
Fridrich Štrba
03c766e601 Oops
Change-Id: I84e8a3833ae16cc9197b8b772404587a3dea1158
2012-10-05 16:16:40 +02:00
Fridrich Štrba
d9ae757308 It seems that we have endianness problem in internal lcms2
Change-Id: I1bec67344ddd5d1caf417355fafd344f48517f77
2012-10-05 14:57:14 +02:00
Peter Foley
48fd7112d3 fix build with VS2010
Change-Id: Ifee45475f8cfeee6b2a4f880f0ff1cc7f9024715
2012-08-15 17:59:49 -04:00
Tor Lillqvist
bd4d371178 Build lcms2 statically for Android, too.
A quick way to avoid the problem with its name ending with ".so.2"
which the Android app machinery doesn't like. Plus, one less shared
library...

Change-Id: I102e29dd13d1be1a134be8c09459259fe8fbe2e1
2012-06-07 21:54:17 +03:00
Norbert Thiebaud
927c22241a play with the Layer thinggy for lcms2 to get the macosx build to finish
Change-Id: I9901d2ef270a096993630103b3cdb5b89e2bb829
2012-06-05 21:07:25 -05:00
Lionel Dricot
646c6681f5 fdo#50680: lcms2 should use GNUMAKE for solaris
Module lcms2 is now using $GNUMAKE instead of the hardcoded "make" in order to allow compilation under Solaris

Change-Id: If4b3395e2b255f6199971792988c242dc5c13a69
2012-06-04 16:35:50 +02:00
Bjoern Michaelsen
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
Jan Holesovsky
f3e4e3ea94 Better check when to use the lcms2-windows-export.patch. 2012-03-19 13:42:15 +01:00
Jan Holesovsky
aa79014710 Fix libcms2 build on MinGW. 2012-03-19 13:33:26 +01:00
Lubos Lunak
6ea1578264 Define CMS_DLL in the header as that is how we build it
Otherwise code using the lcms2 we build won't get the stdcall
decorations and linking will fail.
2012-03-19 09:51:07 +02:00
Fridrich Štrba
073ea37399 Revert "Pass /useenv to vcbuild so that rc and link find SDK headers and libs"
It breaks on a clean installs of Windows, and registration of SDK with Visual
Studio seems to be the answer.

This reverts commit f3f6c9be98.

Conflicts:

	lcms2/makefile.mk
2012-03-13 14:15:20 +01:00
Tor Lillqvist
494ce8b51b Build static liblcms2 for iOS 2012-03-13 12:55:40 +02:00
Tor Lillqvist
2f465a8863 Add patch to recognize Android 2012-03-12 10:53:06 +02:00
Fridrich Štrba
347de41707 The project files for vs2008 are identical in the two directories 2012-03-09 16:13:35 +01:00
Tor Lillqvist
f3f6c9be98 Pass /useenv to vcbuild so that rc and link find SDK headers and libs 2012-03-09 12:38:49 +02:00
Tor Lillqvist
4839f97492 VC2008 and 2010 were swapped 2012-03-09 12:38:47 +02:00
Fridrich Štrba
02888164e7 Make lcms2 build on windows too 2012-03-02 11:52:48 +01:00
Fridrich Štrba
8a0a25dba0 Creating a module lcms2 2012-03-02 10:16:30 +01:00