Commit graph

37 commits

Author SHA1 Message Date
Michael Meeks
b102e842ce remove obsolete linkoo piece 2011-03-15 17:09:45 +00: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
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
Luboš Luňák
148739e8bd make ooenv work even when not invoked when in its directory 2011-01-21 16:03:21 +01:00
Caolán McNamara
6fcbe777e4 spit error to stderr so that it's visible 2011-01-18 10:12:26 +00:00
Michael Meeks
09bffa9a4f make linkoo scan the solver too, for Norbert's gnumake work 2011-01-10 21:39:39 -06:00
Michael Meeks
2929c2a4c6 make linkoo scan the solver too, for Norbert's gnumake work 2011-01-10 21:02:31 +00:00
David Tardon
a516a964e1 don't link soffice.bin and stuff back into src tree
Experiments suggest that it's not needed anymore.
2010-12-09 12:56:23 +01:00
David Tardon
92bf6ff745 link the right file 2010-12-09 12:22:34 +01:00
David Tardon
eade467383 the file format changed from bmp to png 2010-12-09 12:04:57 +01:00
Cédric Bosdonnat
9bd58d2220 linkoo: link the URE libs and jars as well 2010-12-08 00:32:25 +01:00
Michael Meeks
89ae31e7f8 link pagein files 2010-12-03 16:57:17 +00:00
Luboš Luňák
cbc4cd4fdb avoid error message from ooenv if java is disabled 2010-10-15 15:47:49 +02:00
Michael Meeks
6683ae6bb5 switch to g_slice 2010-10-08 16:41:55 +01:00
Jan Holesovsky
c4b271f21a testtool-more-defaults.diff: Moved the linkoo change here. 2010-08-24 15:55:33 +02:00
Jan Holesovsky
a1311aa20f linkoo-dev300.diff: Update linkoo for dev300. 2010-08-24 14:40:58 +02:00
Jan Holesovsky
b07fd41ee5 linkoo-type.diff: Make oovbaapi as a link. 2010-08-24 14:33:48 +02:00
Jan Holesovsky
a216c1f50f fix-linkoo.diff: Fix linkoo to work again.
We cannot absolutize all the links, otherwise we have bootstrap
problems - i#83548.
2010-08-24 13:54:49 +02:00
sb
dffd8ec02a sb111: merged in DEV300_m72 2010-02-25 13:53:42 +01:00
Jens-Heiner Rechtien
f281d77a21 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Rüdiger Timm
9c8f666825 INTEGRATION: CWS changefileheader (1.16.320); FILE MERGED
2008/03/28 15:55:28 rt 1.16.320.1: #i87441# Change license header to LPGL v3.
2008-04-10 15:50:09 +00:00
Oliver Bolte
2f32747671 INTEGRATION: CWS mh23 (1.14.74); FILE MERGED
2007/07/17 15:53:04 kendy 1.14.74.2: #i79670# One 'if' less ;-)
2007/07/17 14:35:41 mh 1.14.74.1: fix: linkoo brokeness, #i79670#
2007-07-18 13:59:37 +00:00
Rüdiger Timm
dea27b4415 INTEGRATION: CWS aquavcl01 (1.13.4); FILE MERGED
2007/06/06 17:27:42 ericb 1.13.4.5: resync conflicts with linkoo
2007/06/06 16:45:49 ericb 1.13.4.4: RESYNC: (1.13-1.14); FILE MERGED
2007/06/06 15:54:51 ericb 1.13.4.3: reverse changes for resync of aquavcl01 with m214
2007/05/30 07:48:17 thb 1.13.4.2: #i77328# Fixed typo (un-break *nix platforms that use the decent .so shared lib postfix)
2007/05/29 22:07:32 thb 1.13.4.1: #i77328# Also rename search path for linkoo from program to MacOS
2007-07-05 08:01:53 +00:00
Kurt Zenker
5835b7d02f INTEGRATION: CWS pj77 (1.13.92); FILE MERGED
2007/04/25 16:23:24 thb 1.13.92.1: #i76693# Make linkoo work under OSX
2007-05-10 12:21:51 +00:00
Rüdiger Timm
188c0364ae INTEGRATION: CWS buildfixes02 (1.12.284); FILE MERGED
2006/11/24 09:43:27 thb 1.12.284.1: #i71883# Making linkoo work also with lib.so.1.1 shared libs
2007-01-30 07:23:55 +00:00
Rüdiger Timm
2bcbd54ecc INTEGRATION: CWS ause048 (1.11.24); FILE MERGED
2006/02/06 15:03:08 hjs 1.11.24.1: #i61266# DLLSUFFIX is obsolete. use DLLPOSTFIX instead
2006-03-08 12:59:14 +00:00
Oliver Bolte
9236025419 INTEGRATION: CWS mmeeks13 (1.10.56); FILE MERGED
2006/01/18 12:42:47 mmeeks 1.10.56.1: #i56192#
fix linkoo issues with m149 & add magic malloc checking env
2006-01-19 15:16:16 +00:00
Rüdiger Timm
fd00fc1731 INTEGRATION: CWS canvas04 (1.9.114); FILE MERGED
2005/11/24 17:16:47 thb 1.9.114.1: #i58254# Made missing platform output subdirs non-fatal.
2005-12-14 13:58:24 +00:00
Rüdiger Timm
02ccc30318 INTEGRATION: CWS ooo19126 (1.8.116); FILE MERGED
2005/09/05 14:33:03 rt 1.8.116.1: #i54170# Change license header: remove SISSL
2005-09-07 21:10:09 +00:00
Kurt Zenker
b17355a1e4 INTEGRATION: CWS mmeeks08 (1.7.24); FILE MERGED
2005/05/27 15:43:07 mmeeks 1.7.24.2: #i49929#
tolerated copies of directories
2005/05/27 14:22:01 mmeeks 1.7.24.1: #i49104#
teach linkoo about types.rdb
2005-05-31 15:22:06 +00:00
Oliver Bolte
f2d446bf35 INTEGRATION: CWS mmeeks06 (1.6.44); FILE MERGED
2005/05/05 11:23:13 mmeeks 1.6.44.1: #i48767#
linkoo symlink related fix
2005-05-06 08:24:30 +00:00
Jens-Heiner Rechtien
73a4b885c5 INTEGRATION: CWS kendy05 (1.5.80); FILE MERGED
2005/04/08 13:34:34 kendy 1.5.80.3: Issue number: #i47021#
Submitted by: kendy
"env" script renamed to "ooenv" not to be confused with /usr/bin/ooenv.
2005/04/08 13:15:13 kendy 1.5.80.2: Issue number: #i47021#
Submitted by: kendy
We should ask pkg-config about the Mozilla libraries location, otherwise it
breaks with system Mozilla.
2005/04/08 11:41:10 kendy 1.5.80.1: Issue number: #i45071#
Submitted by: mmeeks
This patch allows one to run linkoo multiple times without trouble & yet still
doesn't screw up the recent files implementation.
2005-04-11 07:58:17 +00:00
Jens-Heiner Rechtien
643d8a396c INTEGRATION: CWS kendy01 (1.3.70); FILE MERGED
2005/02/09 15:13:10 kendy 1.3.70.2: #i41034# Set STAR_RESOURCEPATH in env.
2005/02/09 14:34:45 kendy 1.3.70.1: #i24253# Let recent-files work even after linkoo.
2005-02-11 14:23:57 +00:00
Rüdiger Timm
14533425d3 INTEGRATION: CWS mmeeks04 (1.3.62); FILE MERGED
2005/01/31 16:42:05 mmeeks 1.3.62.1: Issue number: #i41286# #i41465#
Submitted by: mmeeks
Reviewed by:  mmeeks

Trivial hacker tooling fixes.
2005-02-03 07:57:04 +00:00
Vladimir Glazounov
698e1e1c82 INTEGRATION: CWS mmeeks03 (1.2.96); FILE MERGED
2004/12/20 13:04:33 mmeeks 1.2.96.1: Issue number: #i39335#
Submitted by: mmeeks
Trivial improvement to linkoo
2004-12-23 09:52:43 +00:00
Jens-Heiner Rechtien
2e4c7a3df7 INTEGRATION: CWS unixtools01 (1.1.2); FILE ADDED
2004/10/12 13:27:27 mmeeks 1.1.2.1: Issue number: #i34805# #i34801#
Submitted by: mmeeks
Reviewed by:  mmeeks

Some useful unix tools.
2004-10-12 15:06:43 +00:00
sb
3a8d6c1a74 #i101955# some minor clean up 2009-10-08 15:48:40 +02:00