Commit graph

85 commits

Author SHA1 Message Date
Michael Stahl
10fc13c948 lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
2013-05-07 01:41:26 +02:00
Michael Stahl
276021c761 gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.

Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
2013-05-07 01:41:25 +02:00
Fridrich Štrba
99ff6b84cd Less of Fridrich on the console
Change-Id: I83f4e97d52f3be1de5e2eec08c080c6ac96d6e3d
2013-04-27 15:27:30 +02:00
Fridrich Štrba
1e392ea7a0 Trying to avoid linking with boost on Windows
Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
2013-04-22 19:39:51 +02:00
Fridrich Štrba
4757ffcc5c Uploading LGM2013 version of libcdr
Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4
2013-04-22 14:59:14 +02:00
Fridrich Štrba
29339357cf Uploading libcdr-0.0.12: fixing fdo#62538 and fdo#53278
Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff
2013-04-07 22:50:33 +02:00
Michael Stahl
829851c290 libcdr, libmspub: revert more ISYSTEM
Change-Id: I6acc0d6424cb3ed0ca2fcba12bb7c63dee13cb0d
2013-04-01 13:01:16 +02:00
Peter Foley
ce9bf0f868 upgrade icu to 51.1
Change-Id: I1c0d5ca4b2f88ca48225fcdbeb978f27fa91f7a6
Reviewed-on: https://gerrit.libreoffice.org/2953
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
2013-03-30 14:23:14 +00:00
Matúš Kukan
409ba4cc0b libcdr: do not export empty ICU_CFLAGS
Change-Id: Ib56864cbb9509135572322a274a727fb5fc7c97d
2013-03-16 10:57:17 +01:00
Peter Foley
7abc6baab1 move libcdr to gcc-wrapper
Change-Id: Ic1e9c86e83f5896fdd90b3a66e392bfa2c4f77a6
2013-03-15 20:25:07 -04:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Fridrich Štrba
2f4d160bd6 Libcdr and libvisio need zlib
Change-Id: Ie48c7305e7acca17d3c488a76e8fc47984c51679
2013-03-14 12:53:41 +01:00
Caolán McNamara
f351d1a3fd typo: 1q -> 11
Change-Id: I13c1665b0d4b266256d225c1f7b213d18f7ca0ba
2013-03-01 13:36:32 +00:00
Fridrich Štrba
4b063c0e5b CDR: Respect override of encoding information
Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505
2013-03-01 14:13:00 +01:00
Fridrich Štrba
8fad92201d Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
2013-03-01 10:42:28 +01:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
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
Bjoern Michaelsen
fb455e5013 rename SYSTEM_LIBCDR to SYSTEM_CDR to remove specialcasing
Change-Id: I14bd9c0a4b9b55963da67102468d573f7132fab7
2013-02-19 13:23:06 +01:00
Luboš Luňák
f8a9131dc6 add missing export of variable passed to configure
ICU_CFLAGS=" " && ./configure  does not actually set anything
2013-01-29 11:55:34 +01:00
Fridrich Štrba
302eebf0c8 CDR: Actually apply the patch
Change-Id: I9ffd7123b8f79128c559f30eade6ae49bf809981
2013-01-25 16:56:55 +01:00
Fridrich Štrba
7a50b16839 CDR: We want ICU_LIBS always empty since this is a static library
Change-Id: I90730e08b07182fa73a1e3a60bed6da11cfd9e06
2013-01-25 16:43:12 +01:00
Fridrich Štrba
f1ebdbd541 CDR: Override pkg-config with SYSTEM_ICU
Change-Id: I8c802ae3ee91978bb445a47ba80c64eef355907b
2013-01-25 16:23:51 +01:00
Fridrich Štrba
ab0195a5a4 CDR: fix large-angle computation
Change-Id: Ia3f937b0b49093fbdbbe259b835a2d8a81633fe1
2013-01-25 16:23:51 +01:00
Tor Lillqvist
a541135d0d Avoid stray && in the system ICU case
Change-Id: I65a803824fd79cd6ac5136861bba0b64998d0868
2013-01-25 14:59:02 +02:00
Tor Lillqvist
d0c3eaf87f Blind "fix" for when using system ICU
No point in pointing to nonexistent ICU headers in solver if building
against a system ICU.

Change-Id: I5a151f3bfefd1913ad84a33d74af749558926312
2013-01-25 14:49:10 +02:00
Fridrich Štrba
8e9675d233 Trying to fix libcdr build
Change-Id: Ifcadb0e7be11d32e370b578e21f5d8881bab640f
2013-01-25 10:55:04 +01:00
Fridrich Štrba
851ca9c0c2 Uploading libcdr 0.0.10, hoping it works
Change-Id: Ibf21b856c0f9da276df60680513421be3c871a2d
2013-01-25 10:29:59 +01:00
Michael Stahl
374f746572 rhbz#891082: CMXDocument::isSupported: catch exceptions
Change-Id: I715975dfa93d736cb537076feab4afe6b75c162a
2013-01-04 23:58:16 +01:00
Tor Lillqvist
b7f2fc6696 One more MSBuild build fix for VS 2012
Don't know why others who have built with VS 2012 don't have this
problem (?), but otherwise I get:

Project "Q:\ooo\git\master\workdir\wntmsci14\UnpackedTarball\cdr\build\win32\libcdr.vcxproj" on node 1 (default targets).
C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\Platforms\Win32\Microsoft.Cpp.Win32.Targets(518,5): error MSB8008: Specified platform toolset (v110) is not installed or invalid. Please make sure that a supported PlatformToolset value is selected. [Q:\ooo\git\master\workdir\wntmsci14\UnpackedTarball\cdr\build\win32\libcdr.vcxproj]
Done Building Project "Q:\ooo\git\master\workdir\wntmsci14\UnpackedTarball\cdr\build\win32\libcdr.vcxproj" (default targets) -- FAILED.
2012-12-12 16:59:28 +02:00
Michael Stahl
691c8fc64c libcdr: move LCMS2_CFLAGS/LIBS setup to configure
Change-Id: I50f4396e6a8abf32d1a0f63cbfa93d2c59375326
2012-11-09 17:37:02 +01:00
Michael Stahl
cedd9ebdd2 configure: define FOO_CFLAGS/FOO_LIBS so that they are never empty
This allows us to simply pass the already exported variables to invoked
configures, where the non-empty values will override the detection logic
there.

Change-Id: I7353a313814c58922e34843aeae380e5afa442ca
2012-11-09 17:37:01 +01:00
Luboš Luňák
52a7a8e81a fix libcdr with system lcms2
LCMS2_CFLAGS must be non-empty for it to override pkg-config.
2012-11-09 10:40:37 +01:00
Peter Foley
f745212f96 convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
2012-11-08 19:56:11 -05: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
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
Michael Stahl
1f0cda7d94 tweak some build.lsts for the group photo... 2012-10-15 14:21:34 +02:00
Peter Foley
d19932ac57 fix libcdr with VS2012
Change-Id: I9943dce422bd43b826baeaccaeb494d870aaaa77
2012-10-07 10:42:29 +02:00
Fridrich Štrba
f2e6220fef Fixing some obscurous linking errors on windows
Change-Id: I519d02da58ce5a2915f1e18b5a295f7c093e0f2e
2012-10-06 11:17:35 +02:00
Fridrich Štrba
2ca57fb3a9 Fix libcdr windows build
Change-Id: I33a6c4659cf9e3792f17f73977637dab4667f58e
2012-10-06 07:10:01 +02:00
Michael Stahl
348d2fd870 libcdr: fix --with-system-lcms2 build:
It breaks because LCMS2_CFLAGS happens to be empty, which the libcdr
configure script then complains about, because it thinks it hasn't found
lcms2.  Work around that by including a space in the variable...

Change-Id: I16cc8278097dc7119d11fdabcc3be5d1ae8b4327
2012-10-05 23:42:44 +02:00
Fridrich Štrba
8bf3faf995 Don't patch configure.ac not to run autotools ever during build
Change-Id: Ib481a70fdb67fcec1b72762c408b27f854fe4d1a
2012-10-05 23:00:35 +02:00
Michael Stahl
12decfc33d libcdr: fix typo
Change-Id: Iecf6609a35d4ecff728903d262ec10d3f8faf3bf
2012-10-05 22:56:07 +02:00
Michael Stahl
e80f565c38 libcdr: remove boilerplate:
Define the various FOO_CFLAGS/FOO_LIBS used by libcdr in configure even
for the case of internal FOO, and then just pass those variables into
libcdr configure to get rid of SYSTEM_FOO conditionals.

Change-Id: I0edabc13f8a068cb13792a16499593b8c589da1a
2012-10-05 22:30:21 +02:00
Michael Stahl
2b7536a998 gbuild: add gb_ExternalProject_use_external:
Or rather, re-purpose that for consistency (and rename original to
gb_ExternalProject_use_external_project), to abstract over the
system/internal status of dependencies of external projects.

Use it in libcdr and replace exisiting uses in apache-commons.

Change-Id: Ie144600688fa884b5b6faa986c6b95bdfc1ee15c
2012-10-05 21:19:58 +02:00
Michael Stahl
52304f3083 libcdr: argh i am getting senile
Change-Id: I1674da35bf1d756bda5c4b991cc586462325c838
2012-10-05 18:06:39 +02:00
Michael Stahl
1a9740671c libcdr: hopefully get this to build
unfortunately the ExternalProject uses a StaticLibrary built in libwpg.

Change-Id: Ie4a8933247edbd2d53f697432a0848a05216237f
2012-10-05 17:48:45 +02:00
Fridrich Štrba
7ef7e60c11 No need to apply a patch
Change-Id: Idf9ad88293ca6a51f16f1230176d5c97558c66ed
2012-10-05 17:18:05 +02:00
Fridrich Štrba
349bbf8f06 More typos
Change-Id: I6e3bdf0cfcdfa46cf47e4db1e0703c948b4a35b2
2012-10-05 16:18:58 +02:00
Fridrich Štrba
343e12f0c3 A typo
Change-Id: I115cc8e17ae6cb89d215528acb0d0fe25eb71d85
2012-10-05 16:14:04 +02:00