Commit graph

3255 commits

Author SHA1 Message Date
Stephan Bergmann
16aa2c1dd6 Removed obsolete OOOBASEVERSION, OOOPACKAGEVERSION.
With the basis/brand split undone, they are always the same as
PRODUCTVERSION and ABOUTBOXPRODUCTVERSION, respectively.
2011-11-15 18:29:47 +01:00
Felix Zhang
eacfa0f77c removing obsolete layout code 2011-11-15 14:39:55 +01:00
Andras Timar
bd3ad390fe don't list Accessories category when it is empty fdo#37135 2011-11-15 12:04:25 +01:00
Stephan Bergmann
c1bd2a254b New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous. 2011-11-10 13:36:20 +01:00
Stephan Bergmann
de56b0f22d Removed unused URE version ini file. 2011-11-09 14:46:30 +01:00
Stephan Bergmann
4bfde371a8 OOo reference version for extension dependencies is still at 3.4. 2011-11-09 13:37:00 +01:00
Michael Meeks
17084c750d gtk: move the file-picker into vcl/ and add Application:: factory hooks
drop un-necessary uno service related fluff, and component instantiation.
nominal move to XMultiComponentFactory from XMultiServiceFactory
Include fpicker in compilation for gtk3, but more work required here
Simplify setting up transient parents for picker dialogs
2011-11-07 14:19:33 +00:00
Caolán McNamara
65270c4e93 fix encrypting odf documents
xsec_fw is always built, so always register and install
xsec_xmlsec is built when ENABLE_XMLSEC is true, match
    register and install
plugin is built when WITH_MOZILLA is not NO, match
    register
2011-11-04 11:21:54 +00:00
Thorsten Behrens
dab7974476 Give Mac master builds a nice background .dmg image, too
Added a new DevVersionCopy action to scp2, that fires if PRODUCTNAME
equals "LibO-dev" - in that case, we use the DS_Store_Dev one.
2011-11-03 19:02:55 +01:00
Stephan Bergmann
a72a7dc500 fdo#42312: Change bsh and js script providers from extensions to optional modules.
Their jar files reference other non-URE jars, so they cannot be extensions.
bsh.jar has been moved into the optional module (it used to be installed
always, but it looks like only the bsh script provider needs it; also, it
had been added to URE_MORE_JAVA_CLASSPATH_URLS if SYSTEM_BSH, which also
appears unnecessary as it is mentioned with an absolute file URL in the
Class-Path of the script provider jar).
js.jar has been included in the optional module (it used to be not installed
at all?).
2011-11-03 14:18:59 +01:00
Stephan Bergmann
8524330a74 Simplify addition of optional components to URE_MORE_{SERVICES,TYPES}.
Those bootstrap variables now support <XXX>* syntax to include all files (non-
recursively) contained in the directory denoted by XXX.  Optional components can
put their data simply into program/services/ and program/types/.
2011-11-02 17:25:36 +01:00
Stephan Bergmann
0559950864 Made ooinstall more deterministic, fixed Mac OS X Python module dependencies. 2011-11-01 11:17:07 +01:00
Stephan Bergmann
1635f66a3d Moved CONFIGURATION_LAYERS from soffice to fundamental ini.
...so that unopkg uses it, too.
2011-10-31 23:47:02 +01:00
Stephan Bergmann
a334403eb2 Cleaned up configmgr initialization.
Added CONFIGURATION_LAYERS bootstrap variable.
Removed OOO_CONFIG_REGISTRY[_EXTRA]_DIR bootstrap variables.
2011-10-31 16:51:35 +01:00
Stephan Bergmann
983360d3be Removed obsolete gid_Profile_Soffice_Ini items.
They have been duplicated to gid_Brand_Profile_Soffice_Ini a long
time ago.
2011-10-31 16:49:56 +01:00
Olivier Hallot
06e64daff1 Remove restriction for Liberation fonts in Windows build 2011-10-27 16:35:24 +02:00
Tor Lillqvist
4b83c02803 Make subdirectory names unique in the first five characters
Rename "shellnew" to "shlnew", and "2shellnew" then to "2shlnew" for
consistency.

See code in olenv/bin/modules/installer/windows/directory.pm:
create_unique_directorynames().

(Actually I think we don't even create any actual directory for
"shellnew" (and "2shellnew" even less), it is just a
placeholder... But oh well.)
2011-10-27 13:30:54 +03:00
Stephan Bergmann
977506ef8f Undo basis/brand split: removed obsoleted basis directories. 2011-10-27 10:27:02 +02:00
Stephan Bergmann
b786a33cfd Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation. 2011-10-24 13:59:58 +02:00
Stephan Bergmann
3535ceeac6 Undo basis/brand split: Removed obsoleted gid_Dir_Program. 2011-10-24 13:59:58 +02:00
Stephan Bergmann
f257664724 Undo basis/brand split: Moved the rest of the WNT-only stuff. 2011-10-24 13:59:57 +02:00
Stephan Bergmann
a37884bd52 Removed dead code. 2011-10-24 13:59:57 +02:00
Stephan Bergmann
3fce44fbe9 Undo basis/brand split: Moved WNT-specific patchlist.txt etc. 2011-10-24 13:59:56 +02:00
Stephan Bergmann
a32d05fbb9 Undo basis/brand split: move WNT-specific gid_Dir_Shellnew[Too].
Hope that's all that needs to be done here...
2011-10-24 13:59:56 +02:00
Stephan Bergmann
90713adf1b Removed some unused scp2 Directory definitions. 2011-10-24 13:59:55 +02:00
Stephan Bergmann
3416e30f6b Undo basis/brand split: move unpack_update script from basis to brand.
Not sure if this is (still) used anywhere; at least no code seems to ever
call it.
2011-10-24 13:59:55 +02:00
Stephan Bergmann
009765255f Undo basis/brand split: adapt scp2 WkDir. 2011-10-24 13:59:54 +02:00
Stephan Bergmann
a58b65d380 Undo basis/brand split: moved spadmin.bin from basis to brand. 2011-10-24 13:59:54 +02:00
Stephan Bergmann
9fe5f46025 Undo basis/brand split: moved pluginapp.bin from basis to brand. 2011-10-24 13:59:54 +02:00
Stephan Bergmann
6351fab9c8 Undo basis/brand split: moved nsplugin from basis to brand. 2011-10-24 13:59:53 +02:00
Stephan Bergmann
1af9425e82 Work around a problem creating symlinks in ooinstall.
It can happen that the ure-link symlink shall be created while its
parent directory has not yet been created.  The logic in the Perl code
is so confusing and beyond fixing, that an easy hack out was to flag
the respective directory as always-CREATE, which kind of works around
the problem.
2011-10-21 09:54:09 +02:00
Stephan Bergmann
fecde94354 Undo basis/brand split: moved Python from basis to brand.
The Windows-only code in pyuno/zipcore/python.cxx may still need fixing.
2011-10-20 23:04:12 +02:00
Stephan Bergmann
b1eae75f53 Undo basis/brand split: moved ini files from basis program/ to brand program/.
Moved uno ini, folded fundamentalbasis ini into fundamental ini, merged
version inis.
2011-10-20 23:04:11 +02:00
Stephan Bergmann
a015cda8f2 Undo basis/brand split: moved .rdb files from basis program/ to brand program/ (merging the two services.rdb files). 2011-10-19 16:39:26 +02:00
Jan Holesovsky
f4496d4478 Fix the SYSTEM_MOZILLA case. 2011-10-19 12:35:24 +02:00
Stephan Bergmann
0a158b7800 Undo basis/brand split: merge basis program/resource/ into brand program/resource/. 2011-10-19 12:23:01 +02:00
Stephan Bergmann
d0a0513a9c Undo basis/brand split: move program/{addin,filter,plugin} from basis to brand.
And let $(prog), $(progpath), $(progurl) point to brand program/
instead of basis program/.
2011-10-18 18:49:34 +02:00
Stephan Bergmann
fd1db0b8eb Undo basis/brand split: move program/classes/ from basis to brand.
Also removed apparently unused UNO_JAVA_COMPPATH ProfileItem.
2011-10-18 12:52:06 +02:00
Jan Holesovsky
d37209912b Decouple NSS build from the Mozilla build.
This allows xmlsecurity to be built even when --disable-mozilla is provided.
2011-10-18 12:10:05 +02:00
Stephan Bergmann
538d29f5a4 Undo basis/brand split: move presets/ from basis to brand.
Also let utl::Bootstrap::locateBaseInstallation return
$BRAND_BASE_DIR instead of $OOO_BASE_DIR, so that things match again.
2011-10-18 09:47:41 +02:00
Stephan Bergmann
0f96c76362 Undo basis/brand split: fold brand.xcd into main.xcd. 2011-10-17 18:49:48 +02:00
Stephan Bergmann
2418bae702 Undo basis/brand split: move help/ from basis to brand. 2011-10-17 13:29:18 +02:00
Jan Holesovsky
257ad3bfd3 MinGW does not need the external .dll's. 2011-10-13 01:00:59 +02:00
Peter Foley
624e90aa03 update external extension names 2011-10-07 23:03:46 +00:00
Stephan Bergmann
2ff63bcdea Undo basis/brand split: merge basis share/ into brand share/. 2011-10-07 22:06:28 +02:00
Stephan Bergmann
d550bc3f45 Undo basis/brand split: move some auxiliary executables from basis to brand. 2011-10-06 22:36:31 +02:00
Jan Holesovsky
27372c66fd libtextcat.dll -> libexttextcat.dll. 2011-10-05 15:56:10 +02:00
Fridrich Štrba
9e3f639df0 Don't package this one 2011-10-05 13:07:47 +02:00
Fridrich Štrba
3b53c579ce Fix Windows build and enable CMIS inconditionally
Since the provider should now build everywhere,
enable it inconditionally to catch minor problems
2011-10-05 13:05:01 +02:00
Fridrich Štrba
5b42577caf Don't package libcmis that we link statically 2011-10-05 11:31:58 +02:00