Commit graph

223 commits

Author SHA1 Message Date
Stephan Bergmann
bb01340a5c UnoApiMerge has become unused now
Change-Id: I9e4e153e1a9ac82d4015b73ecf3a9a2429ab346f
2013-04-24 11:09:49 +02:00
Tor Lillqvist
685a12ac0e Prefer simple and working solution to obscure and non-working
Change-Id: I5c7d02daced542222c2cb3881fafd2d58fe7f14d
2013-04-19 09:28:54 +03:00
Michael Stahl
3094d72d79 Makefile: add convenience targets for PythonTest
Change-Id: I4a20a69fb9dfe6619b7f6dafb3306b529b949e1c
2013-04-19 00:30:12 +02:00
David Tardon
3d50cfa224 gbuild: ZipPackage is gone
Change-Id: I6652a0e9a04c21531ed5b6d60ade9cbccc91608c
2013-04-14 08:53:17 +02:00
David Tardon
9d54f0e1de add gbuild class PackageSet
This is intended for bundling filelists of multiple Packages together,
to simplify the scp2 configuration.

Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4
Reviewed-on: https://gerrit.libreoffice.org/3230
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-11 03:39:36 +00:00
David Tardon
ed72983131 rename UI to UIConfig
I plan to use it to deliver all */uiconfig files, not just .ui, as a
preliminary step to get rid of postprocess/packconfig.

Change-Id: Ie7b4434b2f247165e3ab69a4d0c193418720a149
Reviewed-on: https://gerrit.libreoffice.org/3225
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-11 03:37:30 +00:00
David Tardon
bba6e9ebeb allow Package to install to other dir than $OUTDIR
This is preparatory work for creating installation directly by gbuild.

Change-Id: I1b11db37c76ff781731845650169f39cb78fe820
Reviewed-on: https://gerrit.libreoffice.org/3189
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-05 23:33:29 +00:00
Tor Lillqvist
ca0c54d0fe Make autogen.sh prefer to read an autogen.input file
For backward compatibility, an autogen.lastrun file will still be used if it
exists and autogen.input does not exist. The recommended workflow is now to
keep the configuration parametets in autogen.input which is never written by
autogen.sh.

Most (?) developers used to treat autogen.lastrun as a valuable parameter file
to be edited manually anyway, and not as an ad-hoc backup copy of command-line
parameters last used. The name autogen.input better reflects this usage.

Change-Id: I7e3c747fa95e9f2f0bc44036419aaab8f4ad01e7
Reviewed-on: https://gerrit.libreoffice.org/3111
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-04-03 13:16:56 +00:00
David Tardon
ea18ca0702 fix user-friendly targets' deps
An user-friendly target sometimes needs to depend on a different target
than gb_Classname_get_target to really build everything (esp. to deliver
the built product). The rule of thumb is: use the same target that is
used for gb_Module_register_targets.

Change-Id: I874751871b4569b2a68766cc3f3b5c7645347af0
2013-03-31 20:35:31 +02:00
David Tardon
1ef1695b6b do not run unit tests when cross-compiling
We already do this for full build (see solenv/gbuild/Module.mk).

Change-Id: Icdb6f0e91d8e6674868926e79f63130942295353
2013-03-27 17:08:08 +01:00
Stephan Bergmann
a21266f223 Use explicit "SHELL=/usr/bin/env bash" in Makefile.in after all
...instead of "SHELL=@BASH@" from d3f7d05d1b
"Clean up OOO_SHELL" which could expand to SHELL=/bin/sh which, at least on
Mac OS X 10.7 with /usr/bin/make 3.81, could apparently lead to recipe lines
calling ooinstall being directly exec'ed from make and failing to find ooinstall
in solenv/bin, instead of going via the shell and taking into account PATH from
included config_host.mk.

Change-Id: I841dc30f72d1d8841c64f48408a669eb6a37a1f3
2013-03-27 11:16:36 +01:00
Stephan Bergmann
d3f7d05d1b Clean up OOO_SHELL
...which is no longer used.  Also, use the detected BASH value in Makefile.in
instead of re-detecting there.  (Though setting SHELL in Makefile.in is likely
bogus anyway, cf. "this is overridden by solenv/gbuild/gubild.mk [...] i don't
know what needs the 'SHELL=bash' in top-level makefile",
<http://lists.freedesktop.org/archives/libreoffice/2013-March/048552.html> "Re:
need help with shell / configure.")

Change-Id: I09c8b5eb9fb1244321d1fb998bb78e458e8ebf37
2013-03-26 17:21:46 +01:00
Peter Foley
96f943045a match gbuild rules that contain a slash
Change-Id: Id50d89114a7569a9c7429204ce73217cf7a4c131
2013-03-24 10:21:31 -04:00
Matúš Kukan
bdfdd054bd more subtle dependencies for cross-compilation
Now we build only what we really need for 'build' platform - there is
new build-tools make target.
The list of tools is in solenv/gbuild/extensions/pre_BuildTools.mk.
Also similar is done to some extent for 'host' platform using
gb_Module_add_targets_for_build which is ignored for 'host'.

Change-Id: I6acd1762b16aca366aac1a0688500f27869cfca2
2013-03-13 16:26:10 +01:00
David Ostrovsky
0670c3f3da module-deps.pl: extend dependency graph generation
Induce the module name from the library name. Report the libraries that can
not be mapped to a module. Make the resulting module dependency graph unique.
Add diagnostic options:

--help
--verbose
--version

Add convenience options (primary for caching):

--from-file
--to-file

Add output option

--output

Provide a manual page with hints how to hack on it.

Change-Id: Ib5c029c6ea197ca4f66fe6958ecbc3f78452c603
2013-03-09 23:26:38 +01:00
Matúš Kukan
ab70eb0c96 do not execute unit tests when cross-compiling
For both build and host platform.

Change-Id: I0fa9b5d85449887c2c6bd758fb1fecec9776d97c
2013-03-06 12:47:08 +01:00
Matúš Kukan
96409470b1 reintroduce gb_PARTIAL_BUILD to know if we want to run slowcheck
Also kills horrible SKIP_TESTS hack along the way.

Change-Id: Ida59fb44d247b52ef11ee7ba5e4e006996a87ebf
2013-03-06 12:39:28 +01:00
Michael Meeks
956c8eed2c world's lamest code for generating graphviz from module deps. 2013-03-05 18:32:11 +00:00
Caolán McNamara
afae9b56a0 update unusedcode target and list
Change-Id: I53344d6a17570c044ad6e24cc148e07fe6f99ae8
2013-03-05 12:35:29 +00:00
Michael Meeks
d614ca7ebe initial gnumake module deps dumping. 2013-03-05 10:23:17 +00:00
Matúš Kukan
ce1bdc424f Let's use only one Makefile forwarding to gbuild.
Well, there is still another one: solenv/gbuild/partial_build.mk
This enables you to do in SRCDIR:
make gb_Side=build -r -f Makefile.gbuild <target>
which was not possible previously.

Change-Id: I6f8ce1c6503124526986e192b7d3552b909fc157
2013-03-05 09:06:18 +01:00
Peter Foley
61add5c77d propagate use flags to sub-make processes
Change-Id: I7974e68f3dd55c5ad859276e482d93a94af0cd28
2013-03-04 19:16:59 -05:00
Stephan Bergmann
a32283f452 Resiliance against dropped prerequisites for rerunning autogen.sh
Change-Id: I6ff56eb00cf6367d7b4de96ac887cb4e807bddb3
2013-03-04 08:49:23 +01:00
Peter Foley
ac3e90b596 build userfriendly targets from toplevel
Change-Id: Iffbe6d4570bf4d4bdd7347260a6bb4160af24515
2013-03-03 16:08:04 -05:00
Matúš Kukan
ee0dd36715 remove minor.mk
Hopefully all stays the same except for vcl/unx/gtk/a11y/atkutil.cxx.

Change-Id: I49108007ee6d045f045de86c8654efc7ca5fd3d0
Reviewed-on: https://gerrit.libreoffice.org/2491
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-03-02 16:02:39 +00:00
Caolán McNamara
4e1dd61364 reduce callcatcher call post dmake death
Change-Id: I05a68199c606c815ab007cb662c0b29053eb3609
2013-03-01 12:20:24 +00:00
Peter Foley
902fdf4563 move android and ios to tail_build
Change-Id: Ic192b063a4ccc1249194bc7a62a8a90682de08f0
2013-02-28 19:59:24 -05:00
Tor Lillqvist
0f599b89a7 Fix Android and iOS build when SRCDIR!=BUILDDIR
Change-Id: I8906b736551c6ca9f96fec2df9d4b7fd12198f00
2013-02-28 22:37:24 +02:00
Peter Foley
c9f637c882 don't build modules twice
Change-Id: I179f81b92b815f17cd5da77a921b563ee36cb467
2013-02-28 15:31:51 -05:00
Matúš Kukan
13bb2310e3 fix make <module> for BUILDDIR <> SRCDIR
Change-Id: I63528f351685167c1d67551d92afc2826a8b42ac
2013-02-28 11:47:14 +01:00
Matúš Kukan
2057218fbc fix BUILDDIR <> SRCDIR in makefiles
Change-Id: I7b6cc6b638cec5e552492548a878325b3fe1119d
2013-02-28 09:52:01 +01:00
Matúš Kukan
f2e7365ebc various small cleanups
Change-Id: I81898c622279e97403efa05d7d2179102db6676a
2013-02-28 08:27:40 +01:00
Matúš Kukan
bdd921453e remove RepositoryModule_ooo.mk duplicated by Module_tail_build.mk
Also remove pseudo-module tail_build. All we need is one makefile.

Change-Id: Idb7f3a15db33adf4398136a142f175094ef4bc6c
2013-02-28 08:26:41 +01:00
Bjoern Michaelsen
2b791f1cc5 remove dmake, build.pl, deliver.pl and zipdep.pl
This is writing history: LibreOffice builds in ONE non-recursive make process
with full dependencies. We will now be able to really move forward without the
old build system. A big 'Thank you!' goes out to everyone contributing to
solenv/gbuild, especially:

- David Tardon
- Norbert Thiebaud
- Tor Lillqvist
- Michael Stahl
- Matúš Kukan
- Stephan Bergmann
- Luboš Luňák
- Caolán McNamara
- Mathias Bauer
- Jan Holesovsky
- Peter Foley
- Andras Timar
- Hans-Joachim Lankenau

and all the heroes migrating all the modules of LibreOffice to gbuild.

By explicit request this commit has to be completed with this quote:

    I say we take off and nuke the entire site from orbit.
    It's the only way to be sure.

Hold on a second.
This installation has a substantial dollar value attached to it.

    They can bill me.

Change-Id: I72fa17cfb24fae00ca78cfe0eb5782c1788d2dcc
Reviewed-on: https://gerrit.libreoffice.org/2445
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Niko Rönkkö <ronkko@iki.fi>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-28 02:37:34 +00:00
Matúš Kukan
a4a7a580a7 add solenv to Module_cross_toolset.mk too
It's already in tail_build, so hopefully the dependencies are fine.

Change-Id: Id2b2474c76895bd25dd34208654d924ad1c4be66
2013-02-27 12:17:37 +01:00
Stephan Bergmann
823ef20035 Clean up deliver, showdeliverables, showmodules targets
- deliver was only relevant for dmake
- showdeliverables works only per-module
- "'showmodules' is now pointless, it was used to identify modules from
  tail_build"
  [<http://lists.freedesktop.org/archives/libreoffice/2013-February/046510.html>
  "Re: Show module dependencies"]

Change-Id: I400ec5bed4397a12ce4c5b604253c74ef7de0ce7
2013-02-27 11:32:18 +01:00
Peter Foley
5fcb553c86 fix typo in Makefile.in
Change-Id: I3a9c2f7887e3eb6b2b0cf2a2be4f2a793c6525e7
2013-02-26 17:14:30 -05:00
Peter Foley
7f3c006d9b fixes for building in a separate dir
Change-Id: I244fa0c54c8d98827ab0a987ba353dedf733e695
2013-02-26 16:51:55 -05:00
David Tardon
56b44d0123 helpcontent is not dmake module anymore
Change-Id: I6114f35f50282ccf7e9c3f69d28e7a53b5eb78f7
2013-02-26 15:46:02 +01:00
Peter Foley
1d84e9d1d3 instsetoo_native: convert to gbuild
Removes:
 * instsetoo_native/util/update.xml
      - gen_update_info.pl can be removed ?

      On Windows the binary artifacts are created now in:
      workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-02-24 17:26:19 +00:00
Peter Foley
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
Caolán McNamara
d48d8c5da8 add a glade catalog so glade can manage our custom widgets
export GLADE_CATALOG_SEARCH_PATH=install/share/glade

distro maintainers can link/move this to
/usr/share/glade/catalogs

Change-Id: Id4d8d51103d0ef91eea5cd0da9742a28838028cc
2013-02-21 10:53:15 +00:00
Luboš Luňák
f37df270f1 Revert "Improve the make dev-install message."
The one command running the soffice wrapper that does also
some extra work is the usual and simple case, running soffice.bin
is needed only when launching LO in gdb.

This reverts commit eee2fe2e7e.

Conflicts:
	Makefile.in
2013-02-19 15:22:03 +01:00
Tor Lillqvist
95e2c26a08 How to run the "make dev-install" result is platform-specific
Change-Id: I48353df6fbcb960e660202392107432654207e39
2013-02-19 10:38:23 +02:00
Jan Holesovsky
eee2fe2e7e Improve the make dev-install message.
Change-Id: I331f97601234efe08d47d4716492232ada528edc
2013-02-19 08:13:14 +01:00
Jan Holesovsky
bbca22229e Reintroduce message how to run the build after make dev-install.
Change-Id: I78f8073b4a5f1cb8d8b9ec499db95e51b035b225
2013-02-19 08:06:46 +01:00
Matúš Kukan
a5cf6acfab We still need to export gb_Side for host platform
..where makefiles are not just included.

Change-Id: I9c5590c1c846d88955ee153f2af786df020ef991
2013-02-18 17:05:49 +01:00
Matúš Kukan
a811e047be Make building of cross-toolset build.pl and dmake free.
Adds more modules to Module_cross_*.mk.

Change-Id: I9a7a12ff07649262355bfa82bdf09fbf93b1530e
Reviewed-on: https://gerrit.libreoffice.org/2240
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
2013-02-18 15:44:01 +00:00
Peter Foley
162a4f8d01 remove cross_toolset
Change-Id: Ib707b3d17a2e091c150dc116f01c8d151d9461eb
Reviewed-on: https://gerrit.libreoffice.org/2193
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2013-02-18 12:07:51 +00:00
Miklos Vajna
f6251134c9 configure: drop no longer working --with-linked-git option
--with-referenced-git works with submodules, --with-linked-git does not.
And I don't see a way to fix it, either.

Change-Id: Ib6cdb065a022665cd62e9fdc7fc37a9e916e50ad
Reviewed-on: https://gerrit.libreoffice.org/2165
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-15 20:11:26 +00:00