Commit graph

3059 commits

Author SHA1 Message Date
Francois Tigeot
cd78967d03 Remove remaining M1500 and M1600 usage.
Use _MSC_VER instead. This macro is already defined by the compiler, no
need to do it twice.
Since mergemodules_ooo.scp is no longer used, we can simply remove it.
2011-04-12 10:55:08 +02:00
Francois Tigeot
f74e372ac6 Remove more code using M1310 and M1400. 2011-04-12 10:20:46 +02:00
Francois Tigeot
04c1061612 Remove code depending on M1310 and M1400.
These defines are no longer defined anywhere, there's no need to keep
conditionally-compiled code using them.
2011-04-09 09:25:18 +02:00
Tor Lillqvist
bf0d63071d Use less misleading terminology 2011-04-08 13:55:56 +03:00
Bjoern Michaelsen
468ba5cfd6 add lomenubar lib 2011-04-06 18:49:34 +02:00
Bjoern Michaelsen
b76f09e101 add lomenubar lib 2011-04-06 18:49:05 +02:00
Tor Lillqvist
8d1bac154b Add possibility to bundle some Agfa Monotype fonts
Based on the old novell-win32-agfa-monotype-fonts.diff patch.
2011-04-06 15:55:11 +03:00
Tor Lillqvist
2e705f35c2 Add two new lines to .versionrc (version.ini on Windows)
"Vendor" with the value of OOO_VENDOR, and "BuildVersion" with the
value of BUILD_VER_STRING. These get their values from the
--with-vendor and --with-build-version switches of the configure
script.

From the build-identification.diff patch, has been part of distro
OOo/LO builds for long.
2011-04-05 17:56:20 +03:00
Tor Lillqvist
b2c34b75f6 bnc#530872: Save old associations for MS doc types when installing
Then restore them, if still relevant, when uninstalling LibreOffice.

git log from build repository:
commit 1737ec9b6675cc7e30df03fa5537012a429425bb
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Thu Oct 14 15:28:55 2010 +0300

    Make win32-restore-associations.diff apply again

commit 72a25ab4a055cd1d3cf5aec627cfe120113bfb34
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Thu May 20 10:34:24 2010 +0300

    Make patches apply for a Windows build

commit d635f716a75d8c1648eab0c1d598b390be8c4f07
Author: Tor Lillqvist <tlillqvist@novell.com>
Date:   Thu Sep 17 22:16:40 2009 +0300

    Add new patch to restore MSO file associations on uninstall

    * patches/dev300/apply: Add it to Win32Only

    * patches/dev300/win32-restore-associations.diff: New file. Save
      previous associations of the MS Office file formats on installation
      of OOo. On uninstallation of OOo, restore them. Still a bit
      experimental, but seems to work.
2011-04-05 16:35:22 +03:00
Alexander Thurgood
f958c05128 remove invalid - symbols in par token names 2011-04-04 16:24:49 +01:00
Fridrich Štrba
c525a776b3 sal_textenc3 is not really an uno component, mmeeks dixit 2011-03-31 14:03:41 +02:00
Fridrich Štrba
5c89bdb493 fix windows packaging of sal_textenc3.dll 2011-03-31 13:53:34 +02:00
Tor Lillqvist
a1ce970032 Rename shellnew2 to 2shellnew
The "DosName" property of a directory item must apparently be unique
in first five chars, sigh. See the lovely code in
solenv/bin/modules/installer/windows/directory.pm, the
create_unique_directorynames subroutine, check for $startlength.
2011-03-31 12:47:22 +03:00
Petr Mladek
f2894bf189 sdk-gid-module-name.diff: rename module name to gid_Module_Root_SDK (i#64802)
so the generated list of files does not conflict with the main package
2011-03-30 18:10:54 +02:00
Norbert Thiebaud
701049414b harmomized the vbaobj library names with sw use and gnumake expectation 2011-03-26 15:26:28 -05:00
Andras Timar
2bd805cd33 remove localized palettes
they will be localized within the standard l10n framework
2011-03-26 15:32:55 +01:00
Fridrich Štrba
818cc0b97f Unix splash only for Unix 2011-03-25 14:48:07 +01:00
Petr Mladek
d9aaf20177 set build depencencies against the new "translations" module 2011-03-25 12:13:50 +01:00
Michael Meeks
849f137e67 disable spl_unx distribution for mac 2011-03-25 04:45:37 +00:00
Michael Meeks
46a73dead4 merge size-sal-textenc i#70166 2011-03-24 16:21:48 +00:00
Andras Timar
5fa0eba1c2 remove duplicated Occitan entry 2011-03-23 19:07:22 +01:00
Jan Holesovsky
d1862bfe1a Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-03-23 17:13:20 +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
38a29942c3 disable pagein and oosplash.bin compile/install for Mac 2011-03-22 10:06:38 +00:00
Michael Meeks
5c3f86934e use the unix quickstarter un-conditionally. 2011-03-21 21:17:57 +00:00
Caolán McNamara
b8665f1e8d missing 'End', which is why the smoketest failed 2011-03-20 21:28:08 +00:00
Thorsten Behrens
043f07134e Remove removed datacarrier from makefile 2011-03-18 17:35:01 +01:00
Thorsten Behrens
f5d9c8570d Remove undefined DataCarrier entries from scp2
Michael's fixes turned those into build breaker
2011-03-18 17:35:01 +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
Thorsten Behrens
bce1f07cac Fix ppt and wpg import
There's no STD_UNO_LIB_FILE_PATCH anymore
2011-03-18 17:35:00 +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
Hanno Meyer-Thurow
ff33fd9d5d Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
   against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
   available for more than two years. Noone cares, therefore rest in peace.
   Python2 is going to be ditched at some point. Simply do not fail then.
   Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
   handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
   interesting for Linux Distributions. Enforce the user to place JVMs in one
   base directory.
5. Fix build for libxml-2.7.8 with ICU support.

* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
2011-03-14 18:47:10 +01:00
Martin Hosken
4140a3a324 graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
f4a5286839 graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Martin Hosken
ecf0432588 graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
84e65e2613 graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Martin Hosken
fb298513ba graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
e87464af6a graphite2 consolidated patch 2011-03-10 22:36:32 +07: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
47f8c3989c CWS-TOOLING: integrate CWS native364 2011-03-07 13:18:13 +01:00
Caolán McNamara
03271a21b9 those were the wrong defines 2011-03-01 21:08:30 +00:00
Ivo Hinkelmann
b09657659f masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
Andras Timar
fc19bad5b7 l10n: add Breton spelling dictionary 2011-02-22 18:59:27 +01:00
Francois Tigeot
ab50df50a8 Add DragonFly defines. 2011-02-21 14:37:59 +01:00
Tor Lillqvist
d8f97bd4c9 Exclude java_uno_accessbridge.jar and .dll if no SOLAR_JAVA 2011-02-18 11:42:15 +02:00
David Tardon
657710a76d configure inclusion/exclusion of scripting providers 2011-02-18 09:47:50 +01:00
David Tardon
399a30d20e fix defs for scripting provider extensions 2011-02-17 16:21:35 +01:00
Ingo Schmidt
b7a6c674bd native364: #i116865# removing update script 2011-02-14 12:40:33 +01:00
sb
54a05a00d7 sb138: merged in re/DEV300_next towards DEV300_m100 2011-02-11 11:00:41 +01:00
Fridrich Štrba
fca25e4c4c Trying to remove the stlport mention from the code 2011-02-09 20:18:11 +01:00