Commit graph

260 commits

Author SHA1 Message Date
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
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
2011-03-08 19:43:29 -06:00
Fridrich Štrba
0469b1a4e7 Don't regenerate dependencies, just try second time
Since the dependencies generation is broken strategy with external libraries
2011-03-02 16:39:25 +01:00
Fridrich Štrba
25ff71f2c8 Revert "A lame fix for the rebuilding of external libraries"
This reverts commit 42dd24db865ec0112fac4781e63ed11959f02472.
2011-03-02 15:57:26 +01:00
Fridrich Štrba
8ffc225070 A lame fix for the rebuilding of external libraries 2011-03-02 15:40:19 +01:00
Ivo Hinkelmann
63bed58e6b masterfix DEV300: #i100000# dep. fix 2011-02-22 15:50:31 +01:00
Christian Lohmaier
bd157ad1ed Avoid forking to output the logfile. 2011-02-18 13:22:57 +01:00
Michael Koch
139995630f Added --verbose param to build.pl
"--verbose" substitutes the needed functionality of
"--html --dontgraboutput". The unneeded parts will be removed in
a second step.
2011-02-15 10:39:03 +01:00
Tor Lillqvist
ba0c6830cb Drop CWS-related and "Heiner's proprietary" code 2011-01-26 17:09:25 +02:00
Caolán McNamara
3b1a33287a use new differentiated dmake return value to decide if regenerate dependencies 2011-01-19 20:33:49 +00:00
Caolán McNamara
b0ae2ae486 Related: rhbz#670895 don't halt build if zenity crashes 2011-01-19 16:10:03 +00:00
Bjoern Michaelsen
16275914be gnumake3: complex tests in sfx2 2011-01-11 12:43:09 +01:00
Norbert Thiebaud
826659a2f2 support for an alternate gbuild.lst to support gmake build
This is to support the possibility of building some modules with gmake
instead of dmake, while still maintaining the dmake method
fully functional
2011-01-10 21:35:29 -06:00
Norbert Thiebaud
89e480447b add a few comment to balance quotes, to make the editor less confused 2011-01-10 21:35:29 -06:00
Michael Meeks
4f8add5f5c ignore SIGPIPE for zenity 2011-01-05 13:39:04 +00:00
Michael Meeks
401df5b8f1 only enable zenity for local (unix socket) displays 2011-01-05 13:36:37 +00:00
Michael Meeks
ed401d017c add command to clean a modules' output on error. 2010-12-16 15:20:44 +00:00
Caolán McNamara
3428ef5eb4 try and rebuild dependencies on first dmake failure 2010-12-14 11:04:56 +00:00
Bjoern Michaelsen
6ca77c5609 gnumake2: resync to DEV300_m95 2010-12-08 14:12:49 +01:00
Caolán McNamara
eb37094d68 closing the stream is sufficient to close zenity 2010-12-07 12:14:04 +00:00
Ivo Hinkelmann
516b3f1d2e CWS-TOOLING: integrate CWS l10nnewlangs 2010-12-03 13:44:12 +01:00
Bjoern Michaelsen
8c982338ec gnumake2: fixing build.pl message 2010-12-02 01:03:08 +01:00
Mathias Bauer
2e377ca28d CWS gnumake2: resync to m94 2010-11-26 15:27:38 +01:00
Vladimir Glazunov
1a5c9a9fc0 l10nnewlangs: #i115677# removed unneeded condition 2010-11-22 15:19:49 +01:00
Ivo Hinkelmann
19f6193043 l10nnewlangs: #i115677# Write error to stderr, single / multi process error msg fix 2010-11-19 14:04:37 +01:00
Bjoern Michaelsen
f27ae921a2 gnumake2: make build.pl complain about module-only builds in migrated modules 2010-11-12 16:05:02 +01:00
Sebastian Spaeth
babab2c53f Avoid outputting duplicate empty lines
All these did were outputting empty lines where already some were
being output leading to duplicate empty lines in the build log.
2010-11-10 15:40:49 +01:00
Jordan Ayers
bf33898aa0 Cleanup build.pl
Remove commented out code.
Remove $html_last_updated (unused).
Correct a few spelling mistakes.
Translate a few bits of German.
2010-11-09 09:04:10 +01:00
Thomas Klausner
1e66187e48 ENV_SCRIPT contains .sh, don't append it. Use only ASCII chars in messages. 2010-11-04 15:46:15 +01:00
Vladimir Glazunov
628feac11e CWS-TOOLING: integrate CWS vgbugs12 2010-11-02 16:09:22 +01:00
Mathias Bauer
efc073db76 CWS gnumake2: resolve conflicts and make sources buildable on Linux 2010-10-29 15:36:30 +02:00
Vladimir Glazunov
91f02c263c vgbugs12: some changes for strict 2010-10-26 19:40:00 +02:00
Jesús Corrius
0eb2798eb4 Remove redundant zenity message (that also breaks the script on Windows) 2010-10-26 18:04:47 +02:00
Michael Meeks
0bb037ce8c enable zenity only when DISPLAY is set 2010-10-26 14:32:59 +01:00
Jesús Corrius
b94cbf5762 Don't check if ENABLE_ZENITY is defined but the value 2010-10-26 15:17:31 +02:00
Michael Meeks
c79f682618 cleanup for multi-process builds ... 2010-10-26 11:35:56 +01:00
Luke Dixon
4fa790ad7b Add zenity systray support to the build.
Adds also a configure option '--enable-zenity' used to enable this feature.
2010-10-26 11:15:24 +01:00
Michael Meeks
5270167c75 print all broken modules out correctly, not just one 2010-10-14 21:46:22 +01:00
Michael Meeks
f0b3aaf345 add warning about occasional need to remove outpath 2010-10-14 19:01:32 +01:00
Michael Meeks
15c61bb323 Improve error reporting accuracy, to help people re-build 2010-10-14 12:54:29 +01:00
Vladimir Glazunov
99fc79b0b7 vgbugs12: #i114878# combine --from with selecting modules via source_config 2010-10-01 17:10:04 +02:00
Rene Engelhard
332538fc4e make build.pls message to "prolongue" the build more understandable 2010-09-30 01:21:13 +02:00
Jan Holesovsky
34156c2473 Make the build.pl executable. 2010-09-14 20:30:15 +02:00
Vladimir Glazunov
22a524e924 vgbugs11: #i114348# fix for --all:project builds 2010-09-07 16:54:51 +02:00
Vladimir Glazunov
3bebfdc362 vgbugs11: #i114348# fix for --all:project builds 2010-09-06 16:24:06 +02:00
Vladimir Glazunov
63b41e2967 #i113965# fix for start directory 2010-08-19 15:13:01 +02:00
Kurt Zenker
543f129680 masterfix: #i113912# fixed creating log directory 2010-08-18 17:20:56 +02:00
Kurt Zenker
64a49647b3 CWS-TOOLING: integrate CWS vgbugs10_OOO330 2010-08-11 14:03:45 +02:00
Vladimir Glazunov
3d31ac2617 vgbugs10: verbose dmake output in html mode 2010-07-02 12:40:16 +02:00
Vladimir Glazunov
79efb54f42 vgbugs10: moved repository detection to the new module RepositoryHelper 2010-06-11 14:33:56 +02:00