Commit graph

187 commits

Author SHA1 Message Date
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
Peter Foley
c2aaa83660 dont echo ./g -z every time make is run
Change-Id: Id680d868ee77a8c52a030baddc8af97041d5a569
2013-02-13 17:19:59 -05:00
Norbert Thiebaud
2d3eec5929 Makefile.in, make sure that the git hooks are set
git hooks used to be set by virtue of calling ./g clone
but recent changes means that ./g is not always called
these day, so it is possible to end-up with no hooks.

Change-Id: I630066ee0e2961b93ddfbf177eb4e5fc09505911
2013-02-13 02:46:00 -06:00
Peter Foley
f20af6b888 use md5 for scp2 stamp
Conflicts:
	Makefile.top

Change-Id: Ib416077c6a866c265f7346df8a86ac7bc254c37d
2013-02-06 14:04:46 +01:00
Stephan Bergmann
396630ac2f Handle new lo.xcent in distclean
Change-Id: Ie5906be1efe637e833288345299a0308236a99b5
2013-02-04 08:48:25 +01:00
Stephan Bergmann
353e177095 Adapt distclean to moved config_host/*.h.in
Change-Id: I214274d4d843cefc8dbabb83e28fb4e1766b9111
2013-02-04 08:39:08 +01:00
Tor Lillqvist
24a29a1348 Undo temporary change accidentally committed
Change-Id: Iec24cb165009d4769ee3068739c6edc222799017
2013-02-03 11:52:13 +02:00
Tor Lillqvist
4783eea726 Experiment with sandboxing
Change-Id: If491917069ef7c474c27190c4759dd75f025f032
2013-02-03 11:37:54 +02:00
Tor Lillqvist
1f04735705 Cosmetics
Change-Id: Idbc7bd8ac3bca6b0a2d5e893de9a41cba8110c54
2013-02-02 10:39:32 +02:00
Tor Lillqvist
dc6fda0795 Do re-sign the bundle as a whole as soffice has been modified and/or renamed
Change-Id: I5e798fb94594ef4f91db7b57058f1c5cfb021d8e
2013-02-02 10:37:25 +02:00
Tor Lillqvist
3dfd5c9268 Sign executables right after linking
Change-Id: I27c929deffeb803e103609634b501622e04da033
2013-02-02 10:07:10 +02:00
Tor Lillqvist
ebdd616580 Add option to set bundle identifier and use it when signing
Sign also all the dylibs and frameworks in the bundle.

Change-Id: I7f67b9d7eda0204b24e2ea2ef44a53fb8db0f8aa
2013-02-01 14:51:20 +02:00
Tor Lillqvist
2b71c1a9b1 Sign the app bundle created by dev-install if an identity is available
Change-Id: If7c61b203b3ca307831187778b951e8310381ca8
2013-01-31 23:23:38 +02:00
Tor Lillqvist
c5b1441ede Use separate config_*.h files for BUILD and HOST when cross-compiling
We have only been lucky so far that there hasn't been any compilation errors
caused by using the HOST platform config_*.h files also for the BUILD
platform. But as more and more information found out during configury is
stored in config_*.h files, sooner or later it will be a problem.

Move config/* to config_host/*. When not cross-compiling, the config_*.h files
in config_host expanded from config_*.h.in are all there is. When
cross-compiling, the generated config_*.h files for the BUILD platform are
put into a config_build folder.

Then use config_build when building the cross_toolset and config_host
otherwise.

Change-Id: I3c28cc83866bffd696b45d00dfb68e00bc2ae538
2013-01-31 21:43:59 +02:00
Michael Stahl
2a9ecb89d4 Makefile.in: rebuild configure on .in file changes
Change-Id: I9359cca02f6c48efb50ce446d32695d14a0c81fa
2013-01-18 23:46:33 +01:00
Stephan Bergmann
cb50efb8cb Ignore and distclean generated files
(Modelling .gitignore-per-directory instead of a single one in the root dir
after exisiting config/.gitignore.  No idea which approach is better.)

Change-Id: I0ae90103ada4bfff48e90afcf3903bd3ba909314
2013-01-14 11:05:50 +01:00
Matúš Kukan
ca6aefe083 these are phony targets
Change-Id: I6de7842d5f03c6df5bffefdf77a90b5efee2fc78
2013-01-10 14:43:33 +01:00
Matúš Kukan
0723e6c57e remove effectively unused gb_PARTIALBUILD
Change-Id: I5d00db54748de0e1ce3de3dd9c99a88a82e7917b
2013-01-10 14:43:31 +01:00
Matúš Kukan
a5838b19bc add rule for generating fresh pot (po template) files
Moved from translations' custom makefile.

Change-Id: Ife58bfa3ee607b06617d7db80408afb453b9a10c
Reviewed-on: https://gerrit.libreoffice.org/1622
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-10 09:30:47 +00:00
Petr Mladek
a575f12433 more easier and better sortable download names
+ get rid of "install_multi"
+ move "SDK" and "Test" from the main name to the name suffix;
  use same position as "helppack" and "langpack"
+ move the content type identification "arc/deb/rpm" just
  after the <arch> string
+ use "archive" instead of the unclear "arc" content identification

The new names look like:

    LibreOffice_<version>_<os>_<arch>_<content>
    LibreOffice_<version>_<os>_<arch>_<content>_helppack_<lang>
    LibreOffice_<version>_<os>_<arch>_<content>_langpack_<lang>
    LibreOffice_<version>_<os>_<arch>_<content>_sdk
    LibreOffice_<version>_<os>_<arch>_<content>_test

, where the string "_<content>" is one of "_archive", "_deb", "_rpm".
This string is missing for .msi, and .dmg installers because
the content is described by the filename suffix.

Conflicts:
	Makefile.in

Change-Id: Ifecf947ba32e3381ef284d433096f7b37a02e9f5
2013-01-08 19:40:57 +01:00
Petr Mladek
568e489be4 another fix of install test to work with "LibreOffice" installer name
It is done by gbuild these days.

Change-Id: I5a01d42f8e25eacc3f1c63d6f52e4144c7312cff
2013-01-07 21:10:53 +01:00
Peter Foley
6eff6fae62 Get rid of nsinstall hackery
This removes the need for using NSS Build Tools on windows.
It also removes the nees to build nss for the build system while cross
compiling.

Change-Id: I13c9fdb575223f2940d3e4eda00e77ba9158f2b7
Reviewed-on: https://gerrit.libreoffice.org/1534
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-01-07 09:22:15 +00:00
Matúš Kukan
149277ba2f fix the if filter-expression
Let's use the orginal patch from https://gerrit.libreoffice.org/#/c/1479/
There is difference, visible e.g. by 'make help testtools'

Change-Id: Iaf929ed1d315f038eb29fca1b4ba37e2143c6294
2013-01-04 21:17:28 +01:00
Tor Lillqvist
13eca8620a More hacking on an iOS "Viewer" app that doesn't do much anything yet
The Viewer app is intended to eventually resemble the experimental
Android DocumentLoader app.

Build using the gbuild mechanism, which is also invoked from an Xcode
project. This seems to work out fine, the resulting app installs at
least on the simulator, and you can debug all the LO code involved
even if Xcode (obviously) has no knowledge of the LO source
files/classes/etc.

Change-Id: Ic96178d80b8d6467cac969b29e37f0d39513acf9
2013-01-03 20:21:51 +02:00
Michael Stahl
11199dd01b Makefile.in: un-break "make accessibility"
... caused by missing new-line after "\"

Change-Id: Ibdccf7f18e909308fbc1e58b6ddd3301e08a2223
2013-01-03 16:16:50 +01:00
Tor Lillqvist
879f3aa79f Fix icu cross-compilation
We need to pass the location of the icu build root for the BUILD platform with
the --with-cross-build option when configuring icu for cross-compilation (to
the HOST platform). I.e. we always need to build it for the BUILD
platform. Surely this could be done in a more elegant way, but I got lost in
the mess, and just hacked it in the cross-toolset rule in Makefile.in.

Change-Id: Ia5e9d13d01067c6dded1fdc86c56f8f39aae6bc8
2012-12-27 19:23:04 +02:00
Peter Foley
01402f9d4b dont build postprocess twice
Change-Id: I344030d48c3f872cc63b5c1f444d18075fd160f5
2012-12-26 17:41:49 -05:00
Matúš Kukan
ae20a668cc Do not run autogen.sh if we don't want to. (for help, clean, distclean)
Change-Id: Ic283ca4181fe5131a557bfb2cfd3d79ac1e9f82d
Reviewed-on: https://gerrit.libreoffice.org/1479
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-24 22:49:46 +00:00
Peter Foley
6763a59564 connectivity is now a gbuild module
Change-Id: I2c0b387aed6ae229f9ebe4e8b30abea37884a657
2012-12-24 17:42:39 -05:00
Matúš Kukan
0e6212c81a merge Makefile and Makefile.top again
Using MAKE_RESTARTS as indicator whether to source environment.
'make foo -o bar' should work again.

Change-Id: I6086b661559b39897f1d5378919541fb786bdf0e
Reviewed-on: https://gerrit.libreoffice.org/1478
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-24 22:39:59 +00:00
Norbert Thiebaud
e1087161cf export BUILDDIR in config_host.mk to allow partial build
Change-Id: I865a22e48a3125f40de786933ded8a70c0329a39
2012-12-11 13:23:13 -06:00
Luboš Luňák
c8c056fd20 BUILD_DIR -> BUILDDIR, to be consistent with the other *DIR
Change-Id: Ia80a1246a7e3c8862a50a3daf79aba5609b7df3a
2012-12-11 15:39:49 +01:00
Norbert Thiebaud
ae4e327739 Prepare for read-only source build
This patch allows to do

mkdir <build_dir>
cd <build_dir>
<src_root>/autogen.sh
make

Only the remaining dmake modules are poluting the <src_root>...
which will get eventually convererd to gmake...

Change-Id: Iefd64732fa12e096d554cff4eee6b777deb92338
Reviewed-on: https://gerrit.libreoffice.org/1273
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-11 14:26:30 +00:00
Bjoern Michaelsen
80f27b43e1 Makefile.in -- die, die, die! 2011-11-29 17:25:14 +01:00
Bjoern Michaelsen
6a6152a9a3 moved findunusedcode to gbuild 2011-11-29 17:25:14 +01:00
Bjoern Michaelsen
912ad68d34 move install target to gbuild 2011-11-29 17:25:13 +01:00
Bjoern Michaelsen
55da6a0907 these deps are already handled in gbuild 2011-11-29 13:19:06 +01:00