Khaled Hosny
13818a69d7
fdo#70393: move icu to a subdir of external
...
Change-Id: I9d8191848b093240f79207446afb13ca6fd708e4
Reviewed-on: https://gerrit.libreoffice.org/6309
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 07:00:22 +00:00
Khaled Hosny
0ba2b78a07
fdo#70393: move hyphen to a subdir of external
...
Change-Id: I5a112b6f588a704e682e7b50d5399d3da77fbacf
Reviewed-on: https://gerrit.libreoffice.org/6308
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:58:44 +00:00
Khaled Hosny
64b6499371
fdo#70393: move hunspell to a subdir of external
...
Change-Id: Id3aafd95cb8c064f84898844a91f350e9aad0ed4
Reviewed-on: https://gerrit.libreoffice.org/6307
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:57:57 +00:00
Khaled Hosny
89b7435b9a
fdo#70393: move hsqldb to a subdir of external
...
Change-Id: I01d383442ed43c602d4e4664da822c2fbb1a026f
Reviewed-on: https://gerrit.libreoffice.org/6306
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:57:02 +00:00
Khaled Hosny
d985257069
fdo#70393: move graphite to a subdir of external
...
Change-Id: If0f3c19fd539d2b1323016df032b9f959a0adf66
Reviewed-on: https://gerrit.libreoffice.org/6305
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:56:32 +00:00
Khaled Hosny
27d330950f
fdo#70393: move freetype to a subdir of external
...
Change-Id: I533d855e30e46b937d27d185eabc0ca3a3473f4d
Reviewed-on: https://gerrit.libreoffice.org/6304
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:55:57 +00:00
Khaled Hosny
27a1ae650d
fdo#70393: move fontconfig to a subdir of external
...
Change-Id: I467e83b4c1ca938f5cdc333d9af103bcd01832f2
Reviewed-on: https://gerrit.libreoffice.org/6303
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:55:25 +00:00
Khaled Hosny
1fdb6185a1
fdo#70393: move firebird to a subdir of external
...
Change-Id: I2cb4f4b63ab526c3d034adf8c006103cde7e7304
Reviewed-on: https://gerrit.libreoffice.org/6302
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:54:47 +00:00
Khaled Hosny
1a6264aa12
fdo#70393: move libatomic_ops to a subdir of external
...
Change-Id: Ic79dddea1e366019f5a1d919ad0b9568b4d8cdf7
Reviewed-on: https://gerrit.libreoffice.org/6301
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:52:56 +00:00
Khaled Hosny
3c61695a82
fdo#70393: move expat to a subdir of external
...
Change-Id: I4735c3b10081ac62b4620ff5180f12c30b077627
Reviewed-on: https://gerrit.libreoffice.org/6300
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:52:15 +00:00
Khaled Hosny
86c32b4196
fdo#70393: move epm to a subdir of external
...
Change-Id: Ifa10b01d9dce947a0153b9d3e1399d9842ba6241
Reviewed-on: https://gerrit.libreoffice.org/6299
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:51:17 +00:00
Khaled Hosny
a777285f9b
fdo#70393: move curl to a subdir of external
...
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d
Reviewed-on: https://gerrit.libreoffice.org/6298
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:50:42 +00:00
Khaled Hosny
39f73d9387
fdo#70393: move ct2n to a subdir of external
...
Change-Id: If93ae0fa968539f72c9dbf29b4496355b6d66e05
Reviewed-on: https://gerrit.libreoffice.org/6297
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:49:50 +00:00
Tor Lillqvist
2b8b417401
We don't use cppunit when cross-compiling
...
Change-Id: I8ff723233546d9becd001ab54a7df5ad98223f90
2013-10-17 22:53:44 +03:00
Khaled Hosny
7223027a3a
fdo#70393: move cppunit to a subdir of external
...
Change-Id: I96ab796757af0c6c6741059b35fcaeefc2bf4507
Reviewed-on: https://gerrit.libreoffice.org/6286
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 17:17:22 +00:00
Khaled Hosny
894f5e46a6
fdo#70393: move clucene to a subdir of external
...
Change-Id: Ia9b7b18526119e29e21eb315d84d099861e15ea0
Reviewed-on: https://gerrit.libreoffice.org/6285
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 17:15:05 +00:00
Khaled Hosny
214fc91341
fdo#70393: move cairo to a subdir of external
...
Change-Id: I5a5d43521d3d7227dadd05525e2c69c63a3f1c1b
Reviewed-on: https://gerrit.libreoffice.org/6284
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 10:44:03 +00:00
Khaled Hosny
4641fd9aec
fdo#70393: move beanshell to a subdir of external
...
Change-Id: I7e8324fd366a25db59becedfb3f00a10723f45be
Reviewed-on: https://gerrit.libreoffice.org/6283
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 10:42:45 +00:00
Khaled Hosny
174e24ffff
fdo#70393: move boost to a subdir of external
...
Change-Id: Ib6aa36e296dfc1237463c4257f7ea1bd1fe72a1b
Reviewed-on: https://gerrit.libreoffice.org/6282
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 10:39:39 +00:00
Khaled Hosny
694248e978
fdo#70393: move apache-commons to a subdir of external
...
Change-Id: I97f27f1fd53e416767c7aa3478deb23aae0427e0
Reviewed-on: https://gerrit.libreoffice.org/6281
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 10:36:32 +00:00
Khaled Hosny
6cef5936a9
fdo#70393: move afms to a subdir of external
...
Change-Id: I73d7998a9a36d466b4c6d9cac408506a42bceebf
Reviewed-on: https://gerrit.libreoffice.org/6280
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 10:35:03 +00:00
Khaled Hosny
268a321407
fdo#70393: move harfbuzz to a subdir of external
...
Change-Id: I3eaa6d95aaa1753822e20d21f90f39cadb939332
Reviewed-on: https://gerrit.libreoffice.org/6276
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 09:50:18 +00:00
Lionel Elie Mamane
ce40605a8f
Revert "no need to double the conditional, once is enough"
...
This reverts commit b63029c8072c10c03b2fc36fe82619f0cff0ca18
This might be a bug in gb_Helper_optional or some such, but I get:
make[1]: *** No rule to make target `/home/master/src/libreoffice/workdirs/master/src/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz', needed by `/home/master/src/libreoffice/workdirs/master/workdir/unxlngx6/UnpackedTarget/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz'. Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [build] Error 2
Change-Id: Ib9cd0cbe800f158bf50aaeb95f848cc2fd805de3
Reviewed-on: https://gerrit.libreoffice.org/6287
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2013-10-17 02:38:40 +00:00
Bjoern Michaelsen
98404a8431
remove glibc stub and tarball, it seems to be completely unused
...
Change-Id: I1638d4cfc0e6025bd33ed6770ede8556304d6919
Reviewed-on: https://gerrit.libreoffice.org/6278
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 22:16:23 +00:00
Bjoern Michaelsen
82a3c3f702
move mingw-externals to subdir
...
Change-Id: I324225ac397d8e4bb1f58f0b8040eb08b7142ee9
Reviewed-on: https://gerrit.libreoffice.org/6277
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 20:46:13 +00:00
Bjoern Michaelsen
e2cec503d2
empty statement is empty
...
Change-Id: I1b9dacea79b978384b61240bdecf83b9bd924a66
Reviewed-on: https://gerrit.libreoffice.org/6267
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 16:21:37 +00:00
Bjoern Michaelsen
b63029c807
no need to double the conditional, once is enough
...
- the whole module wont be loaded with --with-system-libpng because of the
gb_Helper_optional thingie one level up
Change-Id: I885fedf82bdbb383a3caee343422dc79528838e0
Reviewed-on: https://gerrit.libreoffice.org/6266
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 16:20:48 +00:00
Bjoern Michaelsen
29a5707821
move MSVC externals to subdir
...
see http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html for details
Change-Id: I5ebf3a6162a8f977d1ddf0d445f076afd53332e4
Reviewed-on: https://gerrit.libreoffice.org/6265
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 16:20:08 +00:00
Bjoern Michaelsen
99f8cf1221
fdo#70393: move libpng to a subdir of external
...
Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-16 12:51:10 +00:00
Tor Lillqvist
4c63fd10a5
Try to fix cross-compilation
...
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
2013-09-23 00:54:43 +03:00
Stephan Bergmann
5397b49f4d
Towards a working instdir for Mac OS X
...
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
2013-09-11 00:50:54 +02:00
Tor Lillqvist
cabd23916f
We don't seem to actually need glibc getopt
...
Change-Id: I1f221533f5ea684d113bdc45c04bf84405140f9f
Reviewed-on: https://gerrit.libreoffice.org/5539
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-21 07:44:38 +00:00
Michael Stahl
7f4a622f9f
stop copying MSVC debug runtime DLLs
...
This is apparently not necessary with MSVC 2012; builds and all tests
run here without those DLLs in the solver.
Change-Id: If352fb3702d7dae57deb19959eab8eb0fedea318
Reviewed-on: https://gerrit.libreoffice.org/4414
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28 09:35:12 +00:00
Michael Stahl
9a6d5f15af
fdo#65975: do not put MSVC 64bit runtimes in solver/bin
...
Apparently causes problems for some people.
Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
2013-06-27 14:07:45 +02:00
Fridrich Štrba
abd89db2a9
Fix bean linking on wntgccx
...
Change-Id: I8d5d62be630f85e9a807dc108baca8be2930224e
2013-06-07 16:26:59 +02:00
Mathias Michel
8e784b59f1
Build: fix non-existent merge modules for MS Visual Studio Express versions
...
Change-Id: Id19f3fde0803e9242ca1e7279fd814262c74f6ef
Reviewed-on: https://gerrit.libreoffice.org/4182
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2013-06-07 14:11:23 +00:00
Fridrich Štrba
6db2752e17
Newer mingw-w64 has gdiplus headers, though a bit buggy
...
Change-Id: Ibc25c621c0a97c11b617e920494cd311449c04d3
2013-06-06 23:29:12 +02:00
Tor Lillqvist
cb6d67c21f
Spelling "separate" (etc) correctly is hard
2013-05-15 11:14:28 +03:00
Michael Meeks
72e5d0c8fb
Move to MPLv2 license headers, with ESC decision and author's permission.
2013-04-30 13:34:06 +01:00
David Tardon
fdd24a5765
msvc80 dlls are only needed for mozab driver
...
Change-Id: I6225926807122ed6b6a3fda4fb4067da9eb240b4
2013-04-22 06:43:52 +02:00
Michael Stahl
54ba172dc1
configure: find the MSVC debug runtime libraries
...
... and copy them to solver bin in "external"
Change-Id: I6850495d1abb848a3f6b17de6518d05890b13c32
2013-04-15 15:26:31 +02:00
David Tardon
19d263f095
one variable to rule them all
...
one variable to find them,
one variable to deliver them all and into filelist put them,
in $INSTDIR where the installer searches.
Change-Id: I989f578f0ed6f9ef9167522249b36d95c15bfd1b
2013-04-10 17:05:44 +02:00
Michael Meeks
79b0046ba0
remove legacy build.pl prj/build.lst files.
2013-03-14 17:05:51 +00:00
Fridrich Štrba
8ecb2c52a6
If Mozab is built, look for VS2005 dlls
...
Change-Id: Id5585ff27af8e743adbecbdad3587db9224a394b
2013-03-04 17:29:52 +01:00
Michael Stahl
b768611724
remove all d.lst
...
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
Fridrich Štrba
3708fe8434
Kill the --without-system-stdlibs option
...
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
2013-02-19 10:05:23 +01:00
David Tardon
544a6d70fb
ignore errors
2013-02-13 10:54:40 +01:00
Petr Mladek
b4801abd2e
gbuild: copy stdlibs into solver again when they are bundled in the installer
...
Otherwise the build --without-system-stdlibs fails; This option is used
for the universal Linux build
Change-Id: I0f7d87bb161d50748fee05f9c3f6a4b87b788aa4
Reviewed-on: https://gerrit.libreoffice.org/1938
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-02-01 11:27:15 +00:00
Luboš Luňák
dc277bc6a1
use MINGW_SYSROOT consistently
...
Restore all cases to expect /mingw/ included in the path.
2013-01-02 17:05:10 +01:00
David Tardon
acfd176c30
name the libs to deliver correctly
...
Change-Id: Ib1017e36339b8a3eaba8351d12b700d5b29c49b0
2012-12-31 21:34:08 +01:00