Commit graph

36 commits

Author SHA1 Message Date
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
Caolán McNamara
4dd4885566 revert this 2011-02-22 13:33:30 +00:00
Caolán McNamara
c11ef4be86 -r and -s doesn't do anything 2011-02-22 10:27:15 +00:00
Frank Schoenheit [fs]
9eddac4aac merge after pulling DEV300.m91 2010-10-29 09:56:29 +02:00
Mathias Bauer
318a0ac824 CWS changehid: no hid.lst generation anymore 2010-10-21 14:22:09 +02:00
Frank Schoenheit [fs]
21cac7dc39 dba34b: #i112779# allow more paths in default_images than <module>/* and res/* 2010-10-11 21:00:31 +02:00
Tor Lillqvist
abc28ea4ca Workaround for default_images symlink problem on Cygwin 2010-09-17 14:30:05 +03: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
Vladimir Glazounov
e89f88f7f1 CWS-TOOLING: integrate CWS buildverbosity
2009-10-13 15:51:48 +0200 fs  r276867 : allow building with 'nodep'==''
2009-10-11 22:39:56 +0200 fs  r276820 : silence a compiler warning in a file only used when VERBOSE!=""
2009-10-09 14:37:43 +0200 fs  r276807 : let not override the non-presence of $VERBOSE the given command line arguments
2009-10-09 14:36:25 +0200 fs  r276806 : also deliver spirit/home/classic/debug/impl
2009-10-08 13:38:07 +0200 fs  r276789 : not that many line feeds in --show mode
2009-10-08 13:13:01 +0200 fs  r276788 : minor adjustments requested by hjs:
- replaced space/tab mixes at beginning of lines with mere tab
- made "nothing to update" message for the ZIPALLTARGET target more prominent
- removed useless "echo > /dev/nul" statements
2009-10-07 13:32:12 +0200 fs  r276753 : #i105585#
2009-10-07 11:31:59 +0200 fs  r276742 : #i10000# missing dependency between stoc/security and stoc/util
2009-10-06 22:59:59 +0200 fs  r276729 : CWS-TOOLING: rebase CWS buildverbosity to trunk@276699 (milestone: DEV300:m61)
2009-09-29 12:04:58 +0200 fs  r276518 : #i10000#
2009-09-29 12:04:25 +0200 fs  r276517 : oops
2009-09-29 12:01:07 +0200 fs  r276516 : #i84497# removed some more (non-diagnostic) 'echo ------' directives
2009-09-29 11:59:29 +0200 fs  r276515 : #i84497# removed some more (non-diagnostic) 'echo ------' directives
2009-09-29 11:52:32 +0200 fs  r276514 : #i84497# removed the various 'echo ------------' directives from verbose mode, as per hjs' request
2009-09-29 11:44:16 +0200 fs  r276513 : do not duplicate IDLC call commands with different verbosity switches
2009-09-28 21:43:50 +0200 thb  r276502 : #i84497# fixed potential recursive macro def + extra ls
 * solenv/inc/settings.mk: now setting via VERBOSE!:=, removes warning
   and my spurious "recursive macro definition" error
 * solenv/inc/tg_app.mk: one extra ls silenced for app target (and 
   quiet mode, that goes without saying)
2009-09-23 08:57:01 +0200 fs  r276366 : use ULFEX_VERBOSITY instead of duplicating the ULFEX call
2009-09-21 11:42:26 +0200 fs  r276320 : ignore output paths
2009-09-21 11:04:27 +0200 fs  r276318 : silence another compiler warning, which only hits us when actually using this (debug) file, which is the case only when slideshow is compiled with a env variable VERBOSE, thus came up in CWS buildverbosity
2009-09-21 10:30:14 +0200 fs  r276313 : make some output depend on VERBOSE==TRUE, not COMMAND_ECHO=""
While both are equivalent at the moment, COMMAND_ECHO finally is an implementation
default of the VERBOSE flag only, so better rely on VERBOSE as the primary verbosity flag
2009-09-21 09:56:57 +0200 fs  r276311 : forgot to re-generate from tg_zip before committing
2009-09-21 09:52:11 +0200 fs  r276310 : #i84497# even less verbosity
2009-09-17 11:02:47 +0200 fs  r276232 : #i84497# verbose implies VERBOSE nowadays, and VERBOSE==FALSE should not lead to -DVERBOSE
2009-09-15 22:59:37 +0200 fs  r276189 : #i105022# copy fix for this P1 into this CWS
2009-09-15 11:56:35 +0200 fs  r276165 : CWS-TOOLING: rebase CWS buildverbosity to trunk@276043 (milestone: DEV300:m58)
2009-09-14 17:45:10 +0200 fs  r276137 : #i84497# don't duplicate zip lines w/ and w/o -q switch, use a variable instead (maintenance)
2009-09-14 15:01:33 +0200 fs  r276124 : #i10000#
2009-09-11 23:58:46 +0200 thb  r276083 : #i84497#: More quiet-build fine tuning
 - silenced rsc for real (properly filtering options for 
   cpp, and a pretty brutal amputation of the tool blurp,
   which would have needed cmd opt parser duplication)
 - silenced deliver.pl
 - silenced checkdll.sh
 - silenced zip via -q (in quiet mode)
 - silenced various idl, resource, transex whatever tool,
   passing appropriate options down to them '-QQ' sometimes
 - silenced dmake, pointless blurb that something does *not*
   need update removed
 - silenced the old starview idl compiler, to not output
   tool's name & progress chars in quiet mode
2009-09-11 21:13:59 +0200 thb  r276081 : #i84497#: More bits on the quiet mode of the build.
The bulk of the changes is disabling those annoying 
"echo ------------------" lines for the quiet build,
which has the stretch goal of outputting *exactly*
one line per file compiled/linked/processed.
Apart from that, silenced a few especialy annoying
module-specific makefiles (basically adding 
$(COMMAND_ECHO) in front of a gazillion rules).
Additionally, slightly tweaked what idlc regards
verbose, normal, and quiet mode; this was to have it
echo exactly one line per idl file processed (the
fact that quiet mode did not echo *anything* for idl
files was a bit too much for my taste) 
2009-09-04 09:14:35 +0200 fs  r275777 : don't emit the link parameters if VERBOSE!=TRUE
2009-09-02 10:31:15 +0200 fs  r275700 : #i10000#
2009-09-02 08:44:14 +0200 fs  r275697 : update svn:ignore to ignore the output paths
2009-09-02 08:40:54 +0200 fs  r275695 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
2009-09-02 08:40:28 +0200 fs  r275694 : GRAPHITE is missing in the BUILD_TYPE
2009-09-02 08:40:05 +0200 fs  r275693 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
2009-09-02 08:39:25 +0200 fs  r275692 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
2009-09-02 08:39:02 +0200 fs  r275691 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
2009-09-02 08:38:09 +0200 fs  r275690 : #i84497# less verbose output during build
2009-09-02 08:37:06 +0200 fs  r275689 : #i84497# don't emit that much noise, unless a '-verbose' switch is given
2009-10-21 10:43:22 +00:00
Oliver Bolte
ae0228cdb3 CWS-TOOLING: integrate CWS kick4nt 2009-09-07 13:35:07 +00:00
Rüdiger Timm
173eaf2c6b INTEGRATION: CWS changefileheader (1.25.48); FILE MERGED
2008/03/28 15:55:53 rt 1.25.48.1: #i87441# Change license header to LPGL v3.
2008-04-10 16:42:19 +00:00
Oliver Bolte
887478e27d INTEGRATION: CWS supdremove02 (1.24.376); FILE MERGED
2008/01/31 15:25:35 rt 1.24.376.1: #i85482# Remove UPD from resource name
2008-02-25 15:42:42 +00:00
Vladimir Glazounov
fd64cb48f5 INTEGRATION: CWS ause074 (1.23.8); FILE MERGED
2007/02/02 11:51:09 hjs 1.23.8.1: #i74085# avoid useless shell calls
2007-02-06 13:00:50 +00:00
Hans-Joachim Lankenau
618a111d86 #i10000# - missed specific construct in #i70359# breaking 4nt build 2007-01-26 09:59:05 +00:00
Oliver Bolte
979f3f1f6b INTEGRATION: CWS ause069 (1.21.2); FILE MERGED
2006/10/11 12:36:26 hjs 1.21.2.1: #i70359#: removing + sign in targets; adding to tool macro if required
2007-01-25 11:56:23 +00:00
Kurt Zenker
9ab9f06f91 INTEGRATION: CWS ause068 (1.20.112); FILE MERGED
2006/09/15 13:26:36 hjs 1.20.112.1: #i69536# don't force shell for echo
2006-10-05 09:41:27 +00:00
Kurt Zenker
2d1a41c21c INTEGRATION: CWS ause058 (1.19.330); FILE MERGED
2006/06/14 11:15:15 hjs 1.19.330.2: #i58351# applied relevant parts of the patch to support bash
2006/06/09 14:34:13 hjs 1.19.330.1: #i65725# first round
2006-07-05 20:58:53 +00:00
Rüdiger Timm
136c860308 INTEGRATION: CWS ooo19126 (1.18.82); FILE MERGED
2005/09/05 14:33:55 rt 1.18.82.1: #i54170# Change license header: remove SISSL
2005-09-08 08:47:43 +00:00
Rüdiger Timm
95c98b638c INTEGRATION: CWS hidforall (1.17.100); FILE MERGED
2005/06/16 10:49:55 gh 1.17.100.2: OK, commands have to start in 1st collum
2005/06/16 09:52:17 gh 1.17.100.1: #i40269#building HelpIDs on all platforms / mostly by AUSE
2005-06-20 13:52:06 +00:00
Vladimir Glazounov
7bc75bcabb INTEGRATION: CWS gh10 (1.13.40); FILE MERGED
2005/03/22 16:03:20 gh 1.13.40.2: RESYNC: (1.13-1.16); FILE MERGED
2005/01/11 13:16:35 gh 1.13.40.1: #i38151#fix too long commandline by using xargs instead
2005-03-23 14:51:02 +00:00
Oliver Bolte
56f27a0c78 INTEGRATION: CWS vq12 (1.15.14); FILE MERGED
2005/02/20 18:09:45 vq 1.15.14.1: #i29609# Use $(IFEXIST) and $(THEN) macros to use the correct syntax
for W32-4nt or W32-tcsh.
2005-03-18 09:14:25 +00:00
Jens-Heiner Rechtien
2f42f4fb0b INTEGRATION: CWS ause020 (1.14.54); FILE MERGED
2005/02/10 19:43:48 hjs 1.14.54.1: #i42456# fix numbering of image directories
2005-02-11 16:55:52 +00:00
Kurt Zenker
19d38273d9 INTEGRATION: CWS ause015 (1.13.54); FILE MERGED
2005/01/04 13:45:25 hjs 1.13.54.1: #i39882# remove RSCGLOINC and RSCLOCINC, last usage of RSCRES
2005-01-14 10:35:07 +00:00
Oliver Bolte
489fff74fd INTEGRATION: CWS oooicons (1.12.56); FILE MERGED
2004/10/08 12:39:00 hjs 1.12.56.1: #i35193# changed image location; changed customizing
2004-11-19 10:42:44 +00:00
Hans-Joachim Lankenau
92cd78b266 #i32010# rsc require -lg switch without equal sign 2004-07-23 13:15:05 +00:00
Rüdiger Timm
e6b172ddfc INTEGRATION: CWS ooo20040620 (1.9.2); FILE MERGED
2004/06/15 20:38:29 vq 1.9.2.1: #i30156# Change switches of rsc/rscdep with filename to -xx=<filename>.
2004-07-13 15:53:01 +00:00
Hans-Joachim Lankenau
249cf99cb6 INTEGRATION: CWS mergebuild (1.5.6); FILE MERGED
2004/06/14 13:31:54 hjs 1.5.6.8: #i8252# resolve resync problems
2004/06/02 10:54:20 hjs 1.5.6.7: RESYNC: (1.6-1.7); FILE MERGED
2004/06/01 08:31:55 hjs 1.5.6.6: RESYNC: (1.5-1.6); FILE MERGED
2003/11/12 17:03:16 hjs 1.5.6.5: #i8252# get rid of alllangext
2003/10/14 15:55:14 hjs 1.5.6.4: i8252# switch to genrating resources with iso names - no common tree
2003/10/14 09:52:12 hjs 1.5.6.3: i8252# switch to genrating resources with iso names; make rsc_once default
2003/09/29 16:25:54 hjs 1.5.6.2: #i8252# reslib with iso name
2003/09/11 15:11:09 hjs 1.5.6.1: #95755#, #111237#, #111260#, #i8252# preparing switch to iso codes as language identifiers
2004-06-25 15:33:57 +00:00
Hans-Joachim Lankenau
c2d8970ca3 #i10000# fix image/resource mess 2004-06-08 15:38:00 +00:00
Hans-Joachim Lankenau
b61e56a894 #i10000# back to ilst2 to fix OOo builds 2004-06-07 12:47:40 +00:00
Hans-Joachim Lankenau
5a3fc934aa #10000# remove now obsolete *.ilst2 2004-05-27 14:06:32 +00:00
Rüdiger Timm
c5ec823341 INTEGRATION: CWS bmpres01 (1.5.98); FILE MERGED
2004/05/04 15:10:51 hjs 1.5.98.2: #i22149# replace command for 4nt
2004/05/03 12:37:48 hjs 1.5.98.1: #i22149# required switches for new image handling
2004-05-21 12:47:11 +00:00
Kurt Zenker
3f387a4534 INTEGRATION: CWS ause04 (1.4.118); FILE MERGED
2003/08/25 12:58:03 gh 1.4.118.2: removed filtering of srs files on solenv when building hid particle
2003/08/12 12:55:09 gh 1.4.118.1: generate new hid.lst using particles
2003-08-25 13:47:27 +00:00
Hans-Joachim Lankenau
0fa49d7ff3 #95576# version number in resource file switchable 2002-01-09 16:19:09 +00:00
Hans-Joachim Lankenau
ab77b69c3c #94297# make use of new rsc multilanguage feature 2001-11-07 13:28:33 +00:00
Martin Hollmichel
20c4e427e3 add: header 2001-06-20 08:09:38 +00:00
Jens-Heiner Rechtien
22c7f3f170 initial import 2000-09-20 13:43:26 +00:00