Commit graph

58 commits

Author SHA1 Message Date
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
Fridrich Štrba
b8f39c5c41 Uploading a new shiny libcdr-0.0.9
Change-Id: I5bb93f9228e69dfd46b450089f34cac7204f10b8
2012-10-05 16:04:01 +02:00
David Tardon
ca124c4b04 fix delivery of headers in ExternalPackages
Change-Id: Id686e9eeef9d64943360c6d7187f13b76a6c374a
2012-09-22 16:23:00 +02:00
David Tardon
f8afd6e282 update ext. projects to use ExternalPackage
Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0
2012-09-22 14:57:30 +02:00
Matúš Kukan
7f0a36540a libcdr: use set_warnings_not_errors
Change-Id: I37049887926513885872e3ffe3f94e8bb0796b17
2012-09-08 14:50:58 +02:00
Matúš Kukan
b409f11f8b rename: set_cxx_suffix -> set_generated_cxx_suffix; used for external libs
Change-Id: I023c6b35c2a65da566ff5bb3aea772c99c90dda3
2012-09-08 13:09:34 +02:00
Matúš Kukan
85e34a4f3a libwpd: convert to gbuild
Change-Id: I5a8d3979e8b3e1e3d33882715fbb61f37bf27e35
2012-09-08 12:51:49 +02:00
Matúš Kukan
be742b279a libwpg: convert to gbuild
Change-Id: If440c551aedf805eb364c0fe575e8c5f4f66c18f
2012-09-08 12:51:20 +02:00
Matúš Kukan
0c6fbcad3f libcdr: convert to gbuild
Change-Id: I067ab0a4559bf7ee0da36a67567e0db9a6e34f87
2012-09-08 12:51:00 +02:00
Michael Stahl
4779c77570 .mk files don't need executable bits
Change-Id: I3ee442ab6dac31eb7daac32e7a9ed5c6526f07ba
2012-06-22 22:39:28 +02:00
Stephan Bergmann
d6576f9dd1 MSC fix
Change-Id: I12c8ab5779d952eb640298478da7084b5f643568
2012-06-11 15:17:29 +02:00
Fridrich Štrba
3a678a9fb1 Uploading a new version of libcdr with initial text support
Change-Id: I616d284bb300c803d29786e50bb019fa3f2dff19
2012-06-11 14:29:19 +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
Fridrich Štrba
9886c39238 Patch to build libcdr with clang 2012-04-24 16:58:46 +02:00
Fridrich Štrba
17d0819776 uploading new shiny libcdr-0.0.7 release 2012-04-24 15:54:38 +02:00
Fridrich Štrba
4bbb2cd002 Uploading new shiny libcdr 0.0.6 2012-04-02 15:42:24 +02:00
Fridrich Štrba
be79f65e92 Some changes in libcdr to appease valgrind 2012-03-22 09:55:00 +01:00
Tor Lillqvist
f257c29b6c Revert "lcms2 uses stdcall for some reason"
Nah, will use the patch by Lubos instead.

This reverts commit 85f0745547.
2012-03-19 09:42:19 +02:00
Tor Lillqvist
85f0745547 lcms2 uses stdcall for some reason 2012-03-19 09:40:19 +02:00
Fridrich Štrba
06427dfad3 Uploading libcdr-0.0.5 2012-03-16 15:41:48 +01:00
Fridrich Štrba
1390a2ce01 Upload new libcdr-0.0.4 release 2012-03-09 15:59:08 +01:00
Fridrich Štrba
a5f27616ed Revert "Upload new libcdr-0.0.4 release"
This reverts commit 4147de1873.
2012-03-09 14:31:00 +01:00
Fridrich Štrba
055f8eaf12 Reverting accidental commit 2012-03-09 14:30:00 +01:00
Fridrich Štrba
8b0be97f13 Define SYSTEM_LCMS2 in scp2 when appropriate 2012-03-09 13:56:18 +01:00
Fridrich Štrba
4147de1873 Upload new libcdr-0.0.4 release 2012-03-09 13:39:42 +01:00
Fridrich Štrba
b64b955a38 libcdr will depend on lcms2 2012-03-09 09:55:53 +01:00
Fridrich Štrba
2fefaa2852 And silence warnings in libcdr too 2012-02-23 13:52:21 +01:00
Fridrich Štrba
ada908ab14 New release of libcdr 0.0.3, the best FOSS CDR converter ever 2012-02-23 13:34:24 +01:00