Commit graph

2889 commits

Author SHA1 Message Date
Tor Lillqvist
83c048b89b Don't check the directories for uniqueness multiple times
Wen building a multi-language installer the subroutine
create_unique_directorynames() is called for each language. The same
directory names will be traversed each time. It needs to check the
uniqueness of them only the first time, otherwise it will think every
directory name is repeated.

The check is new, from OOo, but they don't build multi-language
installers so they have not noticed this problem.

The solution is a bit hacky but works.
2011-03-31 14:35:44 +03:00
Petr Mladek
16da377da8 solenv-installer-lang-filelist-names.diff: avoid double lang string
do not print twice the lang name in the filelist
for example, generate gid_Module_Langpack_Basis_es instead of
gid_Module_Langpack_Basis_es.es
2011-03-30 17:23:12 +02:00
Petr Mladek
985532f27c solenv-installer-cleaner-paths.diff: do not create '.' subdirectories
omit './' in paths
2011-03-30 17:19:53 +02:00
Tor Lillqvist
da0aa4715e Move code inserted in previous commit to correct place 2011-03-30 14:40:04 +03:00
Tor Lillqvist
a7c3b749ae Don't pass a Cygwin path no a non-Cygwin program 2011-03-30 14:00:38 +03:00
Bjoern Michaelsen
e02579ab73 getting reid of the perl cruft in all 2011-03-28 02:57:15 +02:00
Bjoern Michaelsen
3d12ac1c29 remove old build system cruft from subsequenttests 2011-03-28 02:44:49 +02:00
Bjoern Michaelsen
0955d9f54c hacking way to reenable subsequenttests 2011-03-25 18:47:17 +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
Michael Meeks
b846e8e650 fix scp2 errors, re-factor, accelerate, and add error detection to parser 2011-03-18 17:35:01 +01:00
Jan Holesovsky
a8bf8b9fc0 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-03-18 16:03:09 +01:00
Caolán McNamara
b07ac2bfbf output actual error message on failure 2011-03-18 10:50:21 +00:00
obo
e3511dc343 masterfix DEV300: #i10000# fix for LAN" 2011-03-18 07:22:29 +01:00
Jan Holesovsky
61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	set_soenv.in
2011-03-17 16:06:07 +01:00
obo
ac7a93d1b2 CWS-TOOLING: integrate CWS jl164 2011-03-16 10:11:17 +01:00
obo
22f91c4b17 CWS-TOOLING: integrate CWS l10n36 2011-03-16 09:37:48 +01:00
Michael Meeks
b102e842ce remove obsolete linkoo piece 2011-03-15 17:09:45 +00:00
Ivo Hinkelmann
d47730a56b masterfix DEV300: #i10000# always add gb_deliver.log to zip 2011-03-14 16:01:46 +01:00
Andras Timar
68a38407f5 remove legacy SOURCE_ROOT_DIR variable 2011-03-12 09:29:25 +01:00
Fridrich Štrba
69c9005e8c Revert "A lame fix for the rebuilding of external libraries"
This reverts commit f9bfd5e53bf4b962b8a8d15255edb1cd35660e88.
2011-03-10 21:02:55 +01:00
Fridrich Štrba
ce6ad9d908 A lame fix for the rebuilding of external libraries 2011-03-10 22:36:32 +07: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
Ivo Hinkelmann
8b87f89223 l10n36: #i117281# add isocodes fur jbo kab nso ny so 2011-03-08 12:55:52 +01:00
Bjoern Michaelsen
7572bcf0b1 solenv/bin/subsequenttests is intended to be executable 2011-03-07 14:55:26 +01:00
Ivo Hinkelmann
47f8c3989c CWS-TOOLING: integrate CWS native364 2011-03-07 13:18:13 +01:00
Joachim Lingner
b38c5bfecf #i117186# call unopkg sync when building type installed or archive with the proper arguments, remove assertion from framework for the case that there is no user installation. 2011-03-03 17:01:11 +01: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
Kalman Szalai - KAMI
3268af2a1a Refine compression of Windows installer
I increased the efficiency of LZM compression of makecab. I found that we can use .Set CompressionMemory=21 setting. This setting produces 83,91% of original installer size and if we combine it with a simple zip compression the download size can reduce to 83,54%.

Reference:
http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg07068.html
2011-03-02 01:25:13 +01:00
Christian Lohmaier
5fc1df0379 fix nested quantifiers in regex 2011-03-01 13:41:25 +01:00
Jan Darmochwal
b6aa0e8110 Accelerate Perl installer builder
* subs in converter.pl rewritten
* fixed bug in convert_whitespace_stringlist_into_array
* removed copy_array_from_reference (can be written as "$copy = [@{$source}]")
* removed copy_hash_from_reference (can be written as "$copy = {%{$source}}")
* removed convert_stringlist_into_array_without_linebreak_and_quotes
  (equivalent to convert_stringlist_into_array_without_newline)
2011-02-28 17:20:24 +00:00
Matthias Huetsch [mhu]
82b10c6aab Update from master repository (DEV300_m100). 2011-02-23 21:03:15 +01:00
Ivo Hinkelmann
53d0a1320a masterfix DEV300: #i10000# INPATH -> OUTPATH 2011-02-23 17:08:45 +01:00
Ivo Hinkelmann
63bed58e6b masterfix DEV300: #i100000# dep. fix 2011-02-22 15:50:31 +01:00
Caolán McNamara
978cc9511e remove javainstaller2 2011-02-22 12:07:32 +00:00
Christian Lohmaier
bd157ad1ed Avoid forking to output the logfile. 2011-02-18 13:22:57 +01:00
Release Engineering
ba345960da merged DEV300 2011-02-18 11:14:19 +01:00
Francois Tigeot
f327939bb9 Remove javaldx /proc test. 2011-02-18 10:41:06 +01:00
Danny Roberts
b7b0250d83 Removed some commented code. 2011-02-18 10:30:50 +01:00
Ivo Hinkelmann
94f7fa3c81 CWS-TOOLING: integrate CWS l10nmove 2011-02-17 17:08:18 +01:00
Ivo Hinkelmann
ba7ad4e642 CWS-TOOLING: integrate CWS native359 2011-02-17 17:04:06 +01:00
Ivo Hinkelmann
42d31088dd CWS-TOOLING: integrate CWS locales34 2011-02-17 16:39:56 +01:00
Thomas Arnhold
666bb3e6e4 Remove unused update_module_ignore_lists.pl
Was used to update the svn ignore list
2011-02-16 20:56:02 +01:00
Thomas Arnhold
474c75df7a Remove usused osarch.pm 2011-02-16 20:45:35 +01:00
Thomas Arnhold
f8253fb7dd Remove SCO support 2011-02-16 20:32:55 +01:00
Thomas Arnhold
e260e51842 Remove HPUX support 2011-02-16 20:30:38 +01:00
Ivo Hinkelmann
123d6c5db9 l10nmove: adjust repository handling 2011-02-16 16:24:42 +01:00
Ivo Hinkelmann
27ed5fe89d CWS-TOOLING: integrate CWS spc01_DEV300 2011-02-15 18:14:02 +01:00