Commit graph

65 commits

Author SHA1 Message Date
Miklos Vajna
d1ed8366af Merge remote-tracking branch 'feature/gsoc2011_rtfimport' 2011-07-02 00:21:16 +02:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00
Miklos Vajna
fdb6813861 Merge remote-tracking branch 'origin/master' 2011-06-25 01:51:04 +02:00
Michael Meeks
5ad60c5d69 more configure, and scp2 pieces for gtk3 integration 2011-06-14 16:30:20 +01:00
Caolán McNamara
ac41a4d5f2 gbuildize hwpfilter 2011-06-14 09:53:54 +01:00
Tor Lillqvist
240c1266d8 chmod -x 2011-05-30 17:54:38 +03:00
Tor Lillqvist
32805760a2 The graphite2 library is called graphite2_off 2011-05-30 17:54:35 +03:00
Jan Holesovsky
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk
2011-05-27 20:39:04 +02:00
Miklos Vajna
f30f032d41 Add rtftok library to Repository.mk 2011-05-24 13:28:40 +02:00
Jan Holesovsky
7667fa2e3c Updates to make vcl building. 2011-04-29 19:14:29 +02:00
Tor Lillqvist
b923fa2536 Fix crypto stuff when building on Windows 2011-04-29 15:35:17 +03:00
Jan Holesovsky
fc1e9f253d Merge branch 'DEV300_m106' into libreoffice-3-4
Conflicts:
	Module_ooo.mk
	Repository.mk
	configure
	configure.in
	ooo.lst
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	solenv/config/sdev300.ini
	solenv/config/ssolar.cmn
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/JunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/Module.mk
	solenv/gbuild/Output.mk
	solenv/gbuild/SdiTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/platform/winmingw.mk
	solenv/inc/minor.mk
2011-04-22 15:07:18 +02:00
David Tardon
ab77c99818 gbuildize reportdesign 2011-04-21 20:50:28 +02:00
David Tardon
ad773c4cc3 gbuildize slideshow 2011-04-21 20:50:28 +02:00
David Tardon
98d8b2b999 gbuildize sd 2011-04-21 20:50:27 +02:00
David Tardon
11430c7074 gbuildize dbaccess 2011-04-19 07:05:11 +02:00
Bjoern Michaelsen
2f44506669 introduce toolshelpers static lib to avoid duplicate linking errors 2011-04-16 15:51:41 +02:00
Bjoern Michaelsen
7c5fe761d3 remove ssprety 2011-04-16 15:37:04 +02:00
David Tardon
c2c0f1d51e register dynamic libs for openssl as well 2011-04-15 19:14:08 +02:00
David Tardon
3feaa80ebe declare internal static openssl libs 2011-04-15 16:16:37 +02:00
David Tardon
1b7717c242 gbuildize chart2 2011-04-15 10:42:17 +02:00
David Tardon
62b2fea57e gbuildize writerfilter 2011-04-14 16:16:08 +02:00
David Tardon
9a4fc75113 gbuildize lotuswordpro 2011-04-14 16:16:08 +02:00
David Tardon
adf4bb8fea gbuildize drawinglayer 2011-04-03 19:14:07 +02:00
David Tardon
af544c8f84 gbuildize forms 2011-04-03 17:43:22 +02:00
David Tardon
c54700d192 gbuildize unotools 2011-04-03 10:58:02 +02:00
David Tardon
5baa4c0e3a convert fileaccess to gbuild 2011-04-02 16:52:37 +02:00
Bjoern Michaelsen
dbc1d2d9e2 adding lomenubar lib 2011-03-31 21:04:43 +02:00
Bjoern Michaelsen
cfbf640369 register test library 2011-03-28 02:28:57 +02:00
Norbert Thiebaud
51c01745ec add starmath libraries to Repository.mk 2011-03-26 15:26:28 -05:00
Norbert Thiebaud
80035e9fb8 add library declaration for sc gnumake 2011-03-26 15:26:28 -05:00
Philipp Lohmann [pl]
f9c3fb7d91 vcl2gnumake: fix a merge problem (thanks mst !) 2011-03-24 11:57:24 +01:00
Philipp Lohmann [pl]
961edfc01d vcl2gnumake: rebase to DEV300m103 2011-03-23 18:06:39 +01:00
Jan Holesovsky
5f08d6e5a4 Merge commit 'ooo/DEV300_m103'
Conflicts:
	configure
	configure.in
	instsetoo_native/util/openoffice.lst
	set_soenv.in
	solenv/bin/cws.pl
	solenv/bin/modules/installer/simplepackage.pm
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/extensions/post_PackModule.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/installationtest.mk
	solenv/inc/minor.mk
	soltools/cpp/_eval.c
2011-03-23 16:58:44 +01:00
Bjoern Michaelsen
35701ddafd killing off stl in gbuild 2011-03-17 13:42:24 +01:00
Norbert Thiebaud
589f7ed2b4 Merge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101
* origin/feature/gnumake2.1: (202 commits)
  Revert "starmath need to have _DLL_ defined, even on MacOS"
  tweak library name on MacOS
  starmath need to have _DLL_ defined, even on MacOS
  add helper to set-up the libraries env, to run executable during build
  the startmath module in Module_ooo must use the name of the directory
  add starmath libraries to Repository.mk
  make linkoo scan the solver too, for Norbert's gnumake work
  -Wunitialized is not compatible with -DDEBUG
  rename gb_HIRESTIME to gb_LOWRESTIME. Assume highres precision by default
  add missing library for sc.  Massage the delivered libraries name.
  support USE_GMAKE=1 envvar to build with gmake the modules that can be.
  add sc in the list of gmake-Modules
  support for an alternate gbuild.lst to support gmake build
  add a few comment to balance quotes, to make the editor less confused
  add all the sub-directory of the RESLOCATION to search for resource
  add calc related library to the Repository
  tweak MacOs platform specific include to build on Macos
  fixing variable exports for windows compiler (thanks ause)
  fixing variable exports for windows compiler (thanks ause)
  also accept debug=t
  ...

Conflicts:
	Makefile.in
	Module_ooo.mk
	Repository.mk
	RepositoryFixes.mk
	configure.in
	solenv/bin/build.pl
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/packmodule
	solenv/doc/gbuild/doxygen.cfg
	solenv/doc/gbuild/solenv/gbuild/types.mk
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/BuildDirs.mk
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/Helper.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/Module.mk
	solenv/gbuild/Output.mk
	solenv/gbuild/Package.mk
	solenv/gbuild/PrecompiledHeaders.mk
	solenv/gbuild/SdiTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/processdelivered.awk
	solenv/gbuild/processdeps.awk
	solenv/inc/unxgcc.mk
	soltools/mkdepend/def.h
	soltools/mkdepend/include.c
2011-03-08 22:31:15 -06:00
Ivo Hinkelmann
c2b9b4e515 CWS-TOOLING: integrate CWS xmlfix3 2011-02-28 18:27:24 +01:00
Philipp Lohmann [pl]
121d025d6a rebase to DEV300_m100 2011-02-14 18:20:23 +01:00
Philipp Lohmann [pl]
c852d6a655 rebase to DEV300_m100 2011-02-14 16:17:22 +01:00
Michael Stahl
766e4079d8 xmlfix3: merge to-be-m100 DEV300_next 2011-02-11 15:35:40 +01:00
Michael Stahl
1ef780d9f5 xmlfix3: convert unoxml to gbuild 2011-02-10 18:37:54 +01:00
Hans-Joachim Lankenau
db66b65ad8 gnumake3: remove comphelper version; fix including extract.hxx 2011-01-28 12:49:53 +01:00
Philipp Lohmann [pl]
2b2de53ac0 vcl2gnumake: #i116588# support all optional link and cflags 2011-01-27 18:37:48 +01:00
Philipp Lohmann [pl]
31f889825e vcl2gnumake: #i116588# move vcl to gbuild (step 4, windows) 2011-01-27 12:31:21 +01:00
Philipp Lohmann [pl]
65bff13b5d vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos) 2011-01-26 19:18:52 +01:00
Carsten Driesner
e1171c154c gnumake3: adjust comphelper to new build env 2011-01-26 12:32:27 +01:00
Philipp Lohmann [pl]
e60595b380 vcl2gnumake: #i116588# move vcl to gbuild (step 1, linux) 2011-01-25 17:35:20 +01:00
Mathias Bauer
b83f838807 CWS gnumake3: convert editeng module to gbuild 2011-01-25 08:56:46 +01:00
Mathias Bauer
150d8155d9 CWS gnumake3: build gengal with gbuild 2011-01-24 18:57:04 +01:00
Philipp Lohmann [pl]
8c5a96fcc4 vcl118: #i116501# additional needed fixes for gbuild migration 2011-01-20 13:38:53 +01:00