Commit Graph

129 Commits

Author SHA1 Message Date
7a878f9c5f gbuild: s/AutoInstallLibs/AutoInstall/g
Change-Id: I582a841ea3b2a882cbdc1556058b007a8667024a
2013-06-10 20:03:02 +02:00
74f5df9bac gbuild: rework AutoInstallLibs and autoinstall ure executables
Change-Id: I7312d94f90758d450a69410819c5e8c142756a47
2013-06-10 20:03:01 +02:00
53070b048a fdo#60924 autoinstall - gbuild/scp2: add base module
Change-Id: Iee1000ff245c369446a9e671a3f7c637f76f989b
Reviewed-on: https://gerrit.libreoffice.org/4153
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
2013-06-06 12:46:10 +00:00
1e4422a4b4 re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        http://svn.apache.org/viewvc?view=revision&revision=1397337
        http://svn.apache.org/viewvc?view=revision&revision=1397315
        http://svn.apache.org/viewvc?view=revision&revision=1396797

	Patches contributed by Andre Fischer
	Fixed getcsym.awk to handle #-comments that contain special regexp chars.
        http://svn.apache.org/viewvc?view=revision&revision=1230971
	118778: Added ADDITIONAL_REPOSITORIES environment variable and its
	automatic setup in configure.
        http://svn.apache.org/viewvc?view=revision&revision=1232004
	118160: Added external CoinMP library.
        http://svn.apache.org/viewvc?view=revision&revision=1233909

	Patches contributed by Herbert Duerr
	#i119168# use generic LICENSE file for langpacks and sdks
        http://svn.apache.org/viewvc?view=revision&revision=1310178
	macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars
        http://svn.apache.org/viewvc?view=revision&revision=1183367
	allow gbuild with empty sysroot on linux
        http://svn.apache.org/viewvc?view=revision&revision=1179186

	Patches contributed by Ingo Schmidt
	native373: #164472# improvements for msi database
        http://svn.apache.org/viewvc?view=revision&revision=1167540
        http://svn.apache.org/viewvc?view=revision&revision=1167539

	Patches contributed by Jurgen Schmidt
	adapt setup package scripts to handle special DS_Store file for
	developer snapshot builds
        http://svn.apache.org/viewvc?view=revision&revision=1232430
	imported patch extensions_i117681.patch
	http://svn.apache.org/viewvc?view=revision&revision=1172102

	Patches contributed by Michael Stahl
	gbuild: RepositoryFixes.mk should be optional
        http://svn.apache.org/viewvc?view=revision&revision=1166123
	xslt filter: remove the FLA horror
	wordml import filter: replace FLA usage with plain XSLT
	http://svn.apache.org/viewvc?view=revision&revision=1363727

	Patch contributed by Oliver-Rainer Wittmann
	i#88652: applied patch, remove unicows deps
	http://svn.apache.org/viewvc?view=revision&revision=1177585

    Remove lots of OS2 conditionals, re-extract Rhino Java, unwind
    cppunit pieces, cleanup Mac image bits, remove coin-mp and
    re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand
    MPLv2 subset checking.

Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-06-03 11:41:36 +01:00
f74e390ef2 Let's assume nobody needs the sbase, scalc etc scripts on OS X
It's always possible to run the soffice executable from the same
location with a --base, --calc etc command-line option instead.

(That is not the normal way for Mac users to open an empty document
for the specific aspect of LibreOffice (Calc, Writer, etc) either.
Instead, the usual way (says cloph) is to keep a corresponding
template document in the Dock and click that.)

Change-Id: Iceea270c03a63f674e7dfdfa95117cb3bdd15184
Reviewed-on: https://gerrit.libreoffice.org/3930
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-17 10:47:11 +00:00
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
8d93373267 fdo#35785: LibreOffice is One for now
See developer mailing list for discussion, subject "LibreOffice is one or
several applications?"

Change-Id: I7a4a5a76f980eb458a2b6d4558a553b8508fd990
Reviewed-on: https://gerrit.libreoffice.org/3638
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-04-30 10:29:24 +00:00
95f2f5f4d1 fdo#60949: Move the last libs to OOOLIBS
Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Reviewed-on: https://gerrit.libreoffice.org/3561
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-04-24 17:40:51 +00:00
62badf3828 Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-22 09:37:38 +01:00
d23f8bb0ca gbuild: deliver help files as packages
Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
Reviewed-on: https://gerrit.libreoffice.org/3384
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-15 05:26:21 +00:00
83af55be71 install librpt* in the new gid_Module_Reportbuilder, not into Base...
Change-Id: I8e67108caaac379101173d49c957e7ec5c7652e4
2013-03-18 18:17:31 +01:00
6851c5fd43 bin PATCH_SO_NAME crack
In VersionInfo of Windows executables the FileDescription property originally contained
80 times 'x' character. These executables were marked as PATCH_SO_NAME and later the
installer maker perl program replaced the xxxxxxxxxxx to the actual file description
which was defined in scp2. WHy was it good, I have no idea. The problem was that it
happened after postprocess, where we signed the binaries, thus diigital signature became
corrupted. It is better to give file descriptions via makefiles.

Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89
2013-02-28 13:24:57 +01:00
aa2450cb51 advertised shotrcuts
The main goal of this patch was to simplify things. The LibreOffice
version that goes to Intel AppUp use advertsied shourtcuts, because
it is what Intel AppUp Center requires. We can reduce complexity a
bit, if we use advertised shortcuts in normal builds, too.

Change-Id: Ia35a753c83cb592137232428ab897a640e7ccc1f
2013-02-11 14:32:19 +01:00
0f33979fc8 .odb files do not have thumbnail image (related: fdo#53592)
Change-Id: Ib17bb0a2fc95207da69bfef11b2fab59aefa719d
2012-08-27 16:42:32 +02:00
b6db3e3acc re-base on ALv2 code.
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
2012-06-21 13:11:06 +01:00
6d9be05a6f fdo#47805 rework handling of 64-bit registry entries
64-bit registry entries were entered via a custom action, which
did not always work. By default the custom action ran with user
privileges, which were not sufficient to write the registry.
It is not necessary to use custom actions for this task. Windows
installer supports it well.

Change-Id: Id65458c363c2b90b3e7d166b4c836bfb1ff19bf4
2012-06-05 13:42:14 +02:00
d554198328 Make Win32 LibO installable side by side with other StarOffice derivatives 2012-05-31 18:19:08 +02:00
f449c8223a fix VersionNT condition for AppUserModelID 2012-05-31 09:46:25 +02:00
6aade607b8 Add FriendlyTypeNames to supported types 2012-05-31 09:39:39 +02:00
cdf8d40394 gbuildize scp2
Change-Id: If9a0906a76943160cfdbd647b26a801bc4389615
2012-05-29 07:34:18 +02:00
8521ad498e Use lowercase for the KindMap values instead of upper camel case 2012-05-22 13:35:12 +02:00
19e5bf6c2f don't set registry keys for Windows Vista+ on other systems 2012-05-22 09:39:50 +02:00
3cd1a896d4 Use Aplication User Model IDs for the native file types
Change-Id: I4941d97a8eb540bbf63320db83230707ced9f90f
2012-05-21 23:51:47 +02:00
93a9094657 Register Kind Names for supported file types for Windows Vista and higher 2012-05-21 12:28:05 +02:00
af9709c3cb remove adabas/adabasui 2012-02-19 13:38:45 +00:00
d9ebbe3e5f Disable Adabas UI *installation*, too 2012-01-27 08:01:09 +01:00
c97d74b5f0 fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.
Replaced --enable-ext-postgresql-sdbc with --disable-postgresql-sdbc.
Renamed postgresql-sdbc.uno{.ini,rc} to consistent postgresql-sdbc.ini
(which made the code a little easier).

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>

(cherry picked from commit 3a7ae48b6f610899200ae2800706533f7c4c9f80)
Conflicts:
	configure.in
	connectivity/source/drivers/postgresql/makefile.mk
2012-01-23 20:31:57 +01:00
ceb14e0143 fdo#37740 remove duplicate icons from soffice.bin/soffice.exe 2012-01-18 19:16:06 +01:00
e4610ffd2d remove PCH support in dmake-module 2011-11-27 12:26:12 -06:00
37676d162c only one launcher icon for silent MSI 2011-11-21 10:05:20 +01:00
f257664724 Undo basis/brand split: Moved the rest of the WNT-only stuff. 2011-10-24 13:59:57 +02:00
009765255f Undo basis/brand split: adapt scp2 WkDir. 2011-10-24 13:59:54 +02:00
2ff63bcdea Undo basis/brand split: merge basis share/ into brand share/. 2011-10-07 22:06:28 +02:00
bf3ff35d8c Adapt for MinGW cross-builds
Adapt some of the DLL names to match conventions we currently use in a
MinGW build. If those are changed to be exactly like when built with
MSVC (for SDK ABI stability reasons), will have to change here, too.

Bypass stuff that we can't build with MinGW when necessary. Should be
synchronized with the corresponding makefiles, obviously. We can't
currently build the Explorer extension or MSI installer custom actions
with MinGW due to lack of some required headers and/or import
libraries.
2011-08-30 11:13:34 +03:00
44cc719a46 Make the help repo optional 2011-08-12 00:17:01 +02:00
e59fbb0cb9 adaptions to dbaccess revert-to-master-gbuilidization 2011-07-23 10:17:18 +02:00
182b970b81 gnumake4: adjust scp2 to gbuild 2011-06-22 14:33:53 +02:00
81a1c065fd Merge branch 'master' into feature/gnumake4
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.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/platform/winmingw.mk
	solenv/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk
2011-06-19 11:36:52 +02:00
26561e4cee gnumake4: dbaccess: rename stuff so it builds again... [hg:6a688d53e64f] 2011-06-17 18:28:06 +02:00
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk
2011-05-27 20:39:04 +02:00
97bfc27b4b Kill BrOffice, fdo#36262 2011-04-26 14:27:20 +03:00
05808a2850 chmod -x 2011-04-08 10:56:17 +03:00
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
eadfd2123e BrOffice branding for windows shortcuts 2011-01-10 09:37:32 +00:00
2e8af315b2 Trying to conditionalize scp2 for helppack integration 2010-12-17 12:28:41 +01:00
d97f774703 Adding LANGUAGEMODULE flag to helppack files 2010-12-16 13:53:35 +01:00
304e7da4f5 First shot on helppacks 2010-12-16 09:15:54 +01:00
sb
c096e86385 sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
sb
dffd8ec02a sb111: merged in DEV300_m72 2010-02-25 13:53:42 +01:00
2490ad7e0f CWS-TOOLING: integrate CWS changefileheader2 2010-02-17 10:32:35 +01:00