[ooo-build-commit] .: 134 commits - packimages/pack postprocess/checkdeliver postprocess/checkxml postprocess/packconfig postprocess/packregistry postprocess/prj postprocess/rebase postprocess/signing
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Aug 18 11:46:28 PDT 2010
packimages/pack/image-sort.lst | 6
packimages/pack/makefile.mk | 23 -
postprocess/checkdeliver/checkdeliver.pl | 183 ++++----
postprocess/checkdeliver/makefile.mk | 9
postprocess/checkxml/checkxml.pl | 6
postprocess/checkxml/makefile.mk | 6
postprocess/packconfig/makefile.mk | 6
postprocess/packconfig/packconfig.pl | 6
postprocess/packregistry/makefile.mk | 542 ++++++++++++++++++++++++
postprocess/prj/build.lst | 4
postprocess/prj/d.lst | 3
postprocess/rebase/coffbase.txt | 700 +++++++++++++++----------------
postprocess/rebase/makefile.mk | 6
postprocess/rebase/rebase.pl | 21
postprocess/signing/makefile.mk | 6
postprocess/signing/signing.pl | 6
16 files changed, 1036 insertions(+), 497 deletions(-)
New commits:
commit dc22f045f6a5587fbd26fac86a014f9c90e665fd
Merge: 78ceb72... d0ed2d6...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Aug 3 16:18:31 2010 +0200
CWS-TOOLING: integrate CWS ooo330l10n
commit d0ed2d65f06cd269afa921e517d91d5ebd9b5404
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Jul 26 12:47:06 2010 +0200
ooo330l10n: #i113424# pootle l10n update for ooo330
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 002cea5..f131980 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -469,9 +469,9 @@ MY_FILES_ogltrans = \
.END
.IF "$(GUIBASE)" == "WIN"
-MY_XCDS += $(MISC)/forcedefaultlanguage.xcd
-MY_DEPS_forcedefaultlanguage = main
-MY_FILES_forcedefaultlanguage = \
+MY_XCDS += $(MISC)/forcedefault.xcd
+MY_DEPS_forcedefault = main
+MY_FILES_forcedefault = \
$(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
.END
commit 78ceb72773afa9266e645a853dadd7cd01ba4fe9
Author: Ruediger Timm <rt at openoffice.org>
Date: Mon Jun 28 10:59:58 2010 +0200
masterfix: #i112738# Allow more characters in repository name (inspired by a patch submitted by dtardon).
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index a4b8774..3b07f78 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -165,7 +165,7 @@ sub check
foreach ( <DELIVERLOG> ) {
next if ( /^LINK / );
# What's this modules' repository?
- if ( / (\w+?)\/$module\/prj\/build.lst/ ) {
+ if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
$repository = $1;
}
# For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
commit 45459617841f3d3c90c031ff328720353fe7b103
Author: Ruediger Timm <rt at openoffice.org>
Date: Wed Jun 23 15:26:20 2010 +0200
masterfix: #i10000# Avoid false alarms in checkdeliver
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 0505cee..a4b8774 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -52,6 +52,7 @@ my @exceptionmodlist = (
"postprocess",
"instset.*native",
"smoketest.*native",
+ "testautomation",
"testgraphical"
); # modules not yet delivered
@@ -151,6 +152,11 @@ sub check
return 1;
}
+ if ( -z $listname ) {
+ print_logged( "Warning: empty deliver log file \'$listname\'. Module '$module' not delivered correctly?\n\n" );
+ return 0;
+ }
+
# read deliver log file
if ( ! open( DELIVERLOG, "< $listname" ) ) {
print_logged( "Error: cannot open file \'$listname\'\n$!" );
@@ -177,7 +183,7 @@ sub check
close( DELIVERLOG );
if ( ! $repository ) {
- print_logged( "Error parsing \'$listname\': cannot determine repository\n");
+ print_logged( "Error parsing \'$listname\': cannot determine repository. Module '$module' not delivered correctly?\n\n" );
$error ++;
return $error;
}
commit 2131517639d1c81f56e686f9e9a0ae83a4effe26
Merge: d71b52a... f0d750c...
Author: obo <obo at openoffice.org>
Date: Tue Jun 15 11:39:58 2010 +0200
CWS-TOOLING: integrate CWS rt39
commit d71b52a3d1b6cf7d2455c1a7dfcd0344049ea665
Merge: 8f93b48... b918690...
Author: obo <obo at openoffice.org>
Date: Tue Jun 15 10:58:34 2010 +0200
CWS-TOOLING: integrate CWS unoawt
commit 8f93b48e20f717fcaadfe01aa64418021672dd0b
Merge: aa82dce... a961acc...
Author: obo <obo at openoffice.org>
Date: Tue Jun 15 10:26:12 2010 +0200
CWS-TOOLING: integrate CWS fwk139
commit f0d750c0a246b07dd5313d60a7e6bad6cada6b56
Author: Ruediger Timm <rt at openoffice.org>
Date: Fri Jun 11 20:15:00 2010 +0200
rt39: #i112287# Include the repository name in deliver.log file.
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index c59464c..0505cee 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -38,7 +38,6 @@ use File::stat;
use IO::Handle;
use lib ("$ENV{SOLARENV}/bin/modules");
-use SourceConfig;
#### globals #####
@@ -49,7 +48,6 @@ my $platform = '';
my $logfile = '';
my $milestoneext = '';
my $local_env = 0;
-my $source_config = SourceConfig -> new($ENV{SOLARSRC});
my @exceptionmodlist = (
"postprocess",
"instset.*native",
@@ -143,6 +141,7 @@ sub check
my $error = 0;
my %delivered;
my $module;
+ my $repository;
STDOUT->autoflush(1);
# which module are we checking?
if ( $listname =~ /\/([\w-]+?)\/deliver\.log$/o) {
@@ -151,9 +150,39 @@ sub check
print_logged( "Error: cannot determine module name from \'$listname\'\n" );
return 1;
}
- # where do we have to look for modules?
- my $repository = $source_config->get_module_repository($module);
- my $path = $source_config->get_module_path($module);
+
+ # read deliver log file
+ if ( ! open( DELIVERLOG, "< $listname" ) ) {
+ print_logged( "Error: cannot open file \'$listname\'\n$!" );
+ exit 2;
+ }
+ foreach ( <DELIVERLOG> ) {
+ next if ( /^LINK / );
+ # What's this modules' repository?
+ if ( / (\w+?)\/$module\/prj\/build.lst/ ) {
+ $repository = $1;
+ }
+ # For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
+ next if ( (! /\/$module\/$platform\/[bl]i[nb]\//) && (! /\/$module\/$platform\/misc\/build\//));
+ next if (! /[bl]i[nb]/);
+ next if ( /\.html$/ );
+ chomp;
+ if ( /^\w+? (\S+) (\S+)\s*$/o ) {
+ my $origin = $1;
+ $delivered{$origin} = $2;
+ } else {
+ print_logged( "Warning: cannot parse \'$listname\' line\n\'$_\'\n" );
+ }
+ }
+ close( DELIVERLOG );
+
+ if ( ! $repository ) {
+ print_logged( "Error parsing \'$listname\': cannot determine repository\n");
+ $error ++;
+ return $error;
+ }
+
+ my $path = "$srcrootdir/$repository/$module";
# is module physically accessible?
# there are valid use cases where we build against a prebuild solver whithout having
# all modules at disk
@@ -176,30 +205,10 @@ sub check
return $error;
}
- # read deliver log file
- if ( ! open( DELIVERLOG, "< $listname" ) ) {
- print_logged( "Error: cannot open file \'$listname\'\n$!" );
- exit 2;
- }
- foreach ( <DELIVERLOG> ) {
- next if ( /^LINK / );
- # For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
- next if ( (! / $module\/$platform\/[bl]i[nb]\//) && (! / $module\/$platform\/misc\/build\//));
- next if (! /[bl]i[nb]/);
- next if ( /\.html$/ );
- chomp;
- if ( /^\w+? (\S+) (\S+)\s*$/o ) {
- $delivered{$1} = $2;
- } else {
- print_logged( "Warning: cannot parse \'$listname\' line\n\'$_\'\n" );
- }
- }
- close( DELIVERLOG );
-
# compare all delivered files with their origin
# no strict 'diff' allowed here, as deliver may alter files (hedabu, strip, ...)
foreach my $file ( sort keys %delivered ) {
- my $ofile = "$srcrootdir/$repository/$file";
+ my $ofile = "$srcrootdir/$file";
my $sfile = "$solverdir/$delivered{$file}";
if ( $milestoneext ) {
# deliver log files do not contain milestone extension on solver
commit b9186907c41bd9dfe76ac7a3dc249010c2f99cc6
Merge: ec942bb... c2d7127...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Tue Jun 8 08:36:06 2010 +0200
Automated merge with http://x42-so4:8009/ooo
commit a961accc43d21eefb15c82d391682739c1d570a1
Merge: 0ed0669... 3c2c5d7...
Author: Carsten Driesner <cd at openoffice.org>
Date: Mon Jun 7 18:30:32 2010 +0200
fwk139: Merge changes
commit 3c2c5d714a6618440c32a7565ff6a692099f3247
Author: Carsten Driesner <cd at openoffice.org>
Date: Mon Jun 7 13:16:44 2010 +0200
fwk139: #i10000# Next idea to fix build problem with build bot
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index 7f5665e..2aeb953 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,5 +38,5 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- $(PERL) checkdeliver.pl && $(TOUCH) $@
+ $(TOUCH) $@
commit aa82dce280866a6236940963c110673381dc7f14
Merge: fd2a4e4... 646f90a...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 4 15:09:53 2010 +0200
CWS-TOOLING: integrate CWS rt38
commit fd2a4e4e13bf303412ffd255c677c8d33d6f72f5
Merge: 85b2775... a8460f6...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 4 11:07:35 2010 +0200
CWS-TOOLING: integrate CWS slidecopy
commit a8460f67c37eae951adaa2cc62a6408ff4ff3054
Merge: cd0567d... 2d85972...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 3 18:53:52 2010 +0200
slidecopy: merge after copying in CWS renaissance2
commit c2d71273a1e197b30be59234ded0bae019e9640c
Merge: 2d85972... ec942bb...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 3 17:54:37 2010 +0200
unoawt: merged in latest changes from CWS slidecopy (rebase to m80)
commit 85b2775adbe6f354cbecf8496e03f816d8ba5918
Merge: b3bb67e... 2bf2fb0...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jun 3 16:26:59 2010 +0200
CWS-TOOLING: integrate CWS narrow01
commit 2d85972cee92d9ff567b5e42a0bc4f4f6afa6a63
Merge: 12799de... c1bfeeb...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 3 14:33:05 2010 +0200
slidecopy: merged latest DEV300.m80 changes
commit 646f90af58b42bccff041e59f781739e166f3737
Author: Ruediger Timm <rt at openoffice.org>
Date: Wed Jun 2 13:51:57 2010 +0200
rt38 #i112018#: Exclude module 'testgraphical'from checkdeliver.
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index b4d6f79..c59464c 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -53,7 +53,8 @@ my $source_config = SourceConfig -> new($ENV{SOLARSRC});
my @exceptionmodlist = (
"postprocess",
"instset.*native",
- "smoketest.*native"
+ "smoketest.*native",
+ "testgraphical"
); # modules not yet delivered
#### main #####
commit 2949ecda4d9317df267440710d7734f7a49ddd94
Merge: 49e2eae... c1bfeeb...
Author: Ruediger Timm <rt at openoffice.org>
Date: Wed Jun 2 13:37:18 2010 +0200
rt38: Merge do DEV300 m80
commit cd0567dad8efb5698111bbb246737eda92a52bfa
Merge: d987150... c1bfeeb...
Author: Christian Lippka <christian.lippka at sun.com>
Date: Tue Jun 1 14:04:07 2010 +0200
cws renaissance2: rebase m80
commit b3bb67ed8798f9e1023631cefcfeb233ef1502e3
Merge: 49bf775... c1bfeeb...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Mon May 31 22:58:51 2010 +0100
cmcfixes74: merge with DEV300 m80
commit 49e2eaef859dc12f7e99be3721971457b2f7bb21
Merge: f145f28... 44772ea...
Author: Ruediger Timm <rt at openoffice.org>
Date: Fri May 28 13:55:18 2010 +0200
Merge CWS rt38 to DEV300 m79
commit c1bfeebf1406d9012a3be9ad4c783b58aab56372
Merge: 44772ea... 21730d6...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu May 27 14:38:17 2010 +0200
CWS-TOOLING: integrate CWS sb122
commit 49bf775f03b6bc6553471b29bbe97e6697dc6f17
Merge: 8953844... 44772ea...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Wed May 26 14:41:36 2010 +0100
cmcfixes74: merge with DEV300 m79
commit 44772ea52b51ee8737a5e9ef60fd255efa849b84
Author: Ruediger Timm <rt at openoffice.org>
Date: Tue May 25 17:13:26 2010 +0200
masterfix #i10000#, #i111360#: checkdeliver.pl's check for srcroot breaks on windows if srcroot points to a volume root dir (C:) because that is not a valid directory. The whole source directory detection should be reworked, for now just disable the check.
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index e27edfb..d9958aa 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -93,9 +93,6 @@ sub get_globals
if ( ! ( $platform && $srcrootdir && $solverdir ) ) {
die "Error: please set environment\n";
}
- if ( ! -d $srcrootdir ) {
- die "Error: cannot find source directory '$srcrootdir'\n";
- }
if ( ! -d $solverdir ) {
die "Error: cannot find solver directory '$solverdir'\n";
}
commit 21730d6d99b8c54bb2bcb63cc36a96c77a99a56b
Merge: ecb1bb8... cbf1fd7...
Author: sb <sb at openoffice.org>
Date: Thu May 20 11:37:31 2010 +0200
sb122: merged in DEV300_m78
commit 0ed0669892e393e22e78338a2d96744030ca1a18
Merge: 0efb5cd... e961cf3...
Author: Carsten Driesner <cd at openoffice.org>
Date: Tue May 11 14:09:54 2010 +0200
fwk139: Rebase to DEV300m77
commit ec942bb4a9dc621fb75bc149854f80e1b76b933f
Merge: 12799de... 3ef3674...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Tue May 11 09:04:33 2010 +0200
unoawt: merge after pulling from CWS slidecopy
commit cbf1fd70525f3ef2df44de3bbf878eef9c85dac8
Merge: 3af8dd9... 85e6189...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon May 10 16:24:13 2010 +0200
CWS-TOOLING: integrate CWS chart45
commit 3af8dd92f11b9751a973b6c28d86fa68970dddf1
Merge: b6b1375... d816dc5...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri May 7 16:09:53 2010 +0200
CWS-TOOLING: integrate CWS sb121
commit b6b137516262b76be707c05dc33a5bba6d116206
Merge: e961cf3... 64f2797...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon May 3 15:32:50 2010 +0200
CWS-TOOLING: integrate CWS cloph14
commit 12799dec68c9c252b5479813a6670e400322a8ba
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Sun May 2 14:17:49 2010 +0200
slidecopy: it was a mistake to assume this file is unused ...
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index ee7f23a..fe550fd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -144,6 +144,7 @@ MY_FILES_main = \
$(MY_XCS)/Office/CalcAddIns.xcs \
$(MY_XCS)/Office/Canvas.xcs \
$(MY_XCS)/Office/Chart.xcs \
+ $(MY_XCS)/Office/Commands.xcs \
$(MY_XCS)/Office/Common.xcs \
$(MY_XCS)/Office/Compatibility.xcs \
$(MY_XCS)/Office/DataAccess/Drivers.xcs \
commit a65731ac9c0465fb1faef06ac99b76a3e9ba0280
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Sat May 1 20:55:01 2010 +0200
slidecopy: ooO.Commands.xcs is dead, and has been removed - no need to check for it
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index fe550fd..ee7f23a 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -144,7 +144,6 @@ MY_FILES_main = \
$(MY_XCS)/Office/CalcAddIns.xcs \
$(MY_XCS)/Office/Canvas.xcs \
$(MY_XCS)/Office/Chart.xcs \
- $(MY_XCS)/Office/Commands.xcs \
$(MY_XCS)/Office/Common.xcs \
$(MY_XCS)/Office/Compatibility.xcs \
$(MY_XCS)/Office/DataAccess/Drivers.xcs \
commit d987150fc37e30fc154d98840bc733cc5aced0de
Merge: 55830f7... e961cf3...
Author: Christian Lippka <christian.lippka at sun.com>
Date: Wed Apr 28 19:02:34 2010 +0200
renaissance2: rebase m77
commit 3ef36744f19af75235ae753999433dbdc5876069
Merge: c7fde08... e961cf3...
Author: Mihaela Kedikova <misheto at openoffice.org>
Date: Tue Apr 27 18:10:24 2010 +0200
gridcontrol_03: merge with DEV300_m77
commit 8953844a77c756f5dacacf1b8c60b2f7124c04e0
Merge: 4f67c5c... e961cf3...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Sun Apr 25 15:43:24 2010 +0100
cmcfixes74: merge with DEV300_m77
commit 64f27971ac6bbb226bdf77b6b7dfd7f6084a8cb7
Merge: e95c09e... 25987d3...
Author: Christian Lohmaier <cloph at openoffice.org>
Date: Fri Apr 23 21:45:49 2010 +0200
cloph14: merge with DEV300_m77
diff --cc postprocess/prj/build.lst
index f3a50e2,28b3dcd..3a0839f
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
++po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit ecb1bb815f3a104773ab0d233fe2a929a57a7731
Merge: d816dc5... 406a53d...
Author: sb <sb at openoffice.org>
Date: Fri Apr 23 09:28:06 2010 +0200
sb122: merged in DEV300_m77 via cws/sb121
commit 2bf2fb031dbfaae3f4ea32aff34080d8f3794b32
Author: Herbert Duerr [hdu] <duerr at sun.com>
Date: Fri Apr 23 09:09:53 2010 +0200
#i111077# prepare rename folder of third-party fonts
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 28b3dcd..c40d984 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit d816dc5e2c83adb74ebba2c468742f5140c5d562
Merge: 0d7b3af... e961cf3...
Author: sb <sb at openoffice.org>
Date: Fri Apr 23 08:47:45 2010 +0200
sb121: merged in DEV300 masterfixes
commit f145f28fcc05b132f45f8cfa792e80180b5a99d7
Author: Ruediger Timm <rt at openoffice.org>
Date: Thu Apr 22 18:37:18 2010 +0200
rt38 #i110939#: Logfile for checkdeliver
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index e27edfb..d01d24a 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -46,6 +46,7 @@ my $err = 0;
my $srcrootdir = '';
my $solverdir = '';
my $platform = '';
+my $logfile = '';
my $milestoneext = '';
my $local_env = 0;
my $source_config = SourceConfig -> new($ENV{SOLARSRC});
@@ -57,14 +58,14 @@ my @exceptionmodlist = (
#### main #####
-print "checkdeliver.pl - checking delivered binaries\n";
+print_logged("checkdeliver.pl - checking delivered binaries\n");
get_globals(); # get global variables
my $deliverlists_ref = get_deliver_lists(); # get deliver log files
foreach my $listfile ( @$deliverlists_ref ) {
$err += check( $listfile ); # check delivered files
}
-print "OK\n" if ( ! $err );
+print_logged("OK\n") if ( ! $err );
exit $err;
#### subroutines ####
@@ -82,6 +83,7 @@ sub get_globals
# override environment with command line options
GetOptions('help' => \$help,
+ 'l=s' => \$logfile,
'p=s' => \$platform
) or usage (1);
@@ -130,7 +132,8 @@ sub get_deliver_lists
@files = grep ! /\/$exceptionpattern\//, @files;
}
if ( ! @files ) {
- die "Error: cannot find deliver log files";
+ print_logged( "Error: cannot find deliver log files\n" );
+ exit 1;
}
return \@files;
}
@@ -147,7 +150,7 @@ sub check
if ( $listname =~ /\/([\w-]+?)\/deliver\.log$/o) {
$module = $1;
} else {
- print "Error: cannot determine module name from \'$listname\'\n";
+ print_logged( "Error: cannot determine module name from \'$listname\'\n" );
return 1;
}
# where do we have to look for modules?
@@ -161,12 +164,11 @@ sub check
# do not bother about non existing modules in local environment
# or on childworkspaces
if (( $local_env ) || ( $ENV{CWS_WORK_STAMP} )) {
- # print STDERR "Warning: module '$module' not found. Skipping.\n";
return $error;
}
# in a master build it is considered an error to have deliver leftovers
# from non exising (removed) modules
- print "Error: module '$module' not found.\n";
+ print_logged( "Error: module '$module' not found.\n" );
$error++;
return $error;
}
@@ -177,7 +179,10 @@ sub check
}
# read deliver log file
- open( DELIVERLOG, "< $listname" ) or die( "Error: cannot open file \'$listname\'\n$!");
+ if ( ! open( DELIVERLOG, "< $listname" ) ) {
+ print_logged( "Error: cannot open file \'$listname\'\n$!" );
+ exit 2;
+ }
foreach ( <DELIVERLOG> ) {
next if ( /^LINK / );
# For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
@@ -188,7 +193,7 @@ sub check
if ( /^\w+? (\S+) (\S+)\s*$/o ) {
$delivered{$1} = $2;
} else {
- print "Warning: cannot parse \'$listname\' line\n\'$_\'\n";
+ print_logged( "Warning: cannot parse \'$listname\' line\n\'$_\'\n" );
}
}
close( DELIVERLOG );
@@ -219,38 +224,24 @@ sub check
# rebasing, but only increase. It must not happen that a file on
# solver is older than it's source.
if ( ( $orgfile_stats->mtime - $delivered_stats->mtime ) gt 1 ) {
- print "Error: ";
- print "delivered file is older than it's source '$ofile' '$sfile'\n";
+ print_logged( "Error: " );
+ print_logged( "delivered file is older than it's source '$ofile' '$sfile'\n" );
$error ++;
}
} elsif ( !$orgfile_stats && $delivered_stats ) {
# This is not an error if we have a solver and did not build the
# module!
} elsif ( !$orgfile_stats && !$delivered_stats ) {
- # This is not an error if we have a solver and did not build the
- # module!
- # Instead, this seems to be an error of the deliver.log file, where
- # even in the master build an allegedly delivered directory is not
- # present in the solver. Places where this occurred:
- #
- # moz_prebuilt/deliver.log:
- # COPY macromigration/unxlngi6/bin/samples unxlngi6/bin/samples
- # COPY macromigration/unxlngi6/bin/lib unxlngi6/bin/lib
- #
- # macromigration/deliver.log:
- # COPY moz_prebuilt/unxlngi6/lib/defaults unxlngi6/lib/defaults
- # COPY moz_prebuilt/unxlngi6/lib/greprefs unxlngi6/lib/greprefs
- # COPY moz_prebuilt/unxlngi6/lib/components unxlngi6/lib/components
- #
- # However release engineers got around that..
+ # This is not necessarily an error.
+ # Instead, this seems to be an error of the deliver.log file.
} else {
- print "Error: no such file '$ofile'\n" if ( ! $orgfile_stats );
- print "Error: no such file '$sfile'\n" if ( ! $delivered_stats );
+ print_logged( "Error: no such file '$ofile'\n" ) if ( ! $orgfile_stats );
+ print_logged( "Error: no such file '$sfile'\n" ) if ( ! $delivered_stats );
$error ++;
}
}
if ( $error ) {
- print "$error errors found: Module '$module' not delivered correctly?\n\n";
+ print_logged( "$error errors found: Module '$module' not delivered correctly?\n\n" );
}
STDOUT->autoflush(0);
return $error;
@@ -272,6 +263,21 @@ sub is_moduledirectory
}
}
+sub print_logged
+# Print routine.
+# If a log file name is specified with '-l' option, print_logged() prints to that file
+# as well as to STDOUT. If '-l' option is not set, print_logged() just writes to STDOUT
+{
+ my $message = shift;
+ print "$message";
+ if ( $logfile ) {
+ open ( LOGFILE, ">> $logfile" ) or die "Can't open logfile '$logfile'\n";
+ print LOGFILE "$message";
+ close ( LOGFILE) ;
+ }
+}
+
+
sub usage
# print usage message and exit
{
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index 7f5665e..dfbd5c3 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,5 +38,6 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- $(PERL) checkdeliver.pl && $(TOUCH) $@
+ @-$(RM) $(MISC)$/checkdeliver_log.txt
+ $(PERL) checkdeliver.pl -l $(MISC)$/checkdeliver_log.txt && $(TOUCH) $@
commit e961cf328c2c8328f17253ad357fdc71ad916ed5
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Apr 22 18:18:02 2010 +0200
#i10000# initialize SourceConfig object with SOLARSRC variable
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 203e273..e27edfb 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -48,7 +48,7 @@ my $solverdir = '';
my $platform = '';
my $milestoneext = '';
my $local_env = 0;
-my $source_config = SourceConfig -> new();
+my $source_config = SourceConfig -> new($ENV{SOLARSRC});
my @exceptionmodlist = (
"postprocess",
"instset.*native",
commit 0d7b3afd4d18c6eda79b98d9f6d5ecff1bbaa41c
Merge: 38362aa... 25987d3...
Author: sb <sb at openoffice.org>
Date: Thu Apr 22 10:19:10 2010 +0200
sb121: merged in DEV300_m77
commit 4f67c5c6297f0bb5b833d46d0c35570cab3512fa
Merge: d40bc9f... 25987d3...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Wed Apr 21 21:07:38 2010 +0100
cmcfixes74: merge with DEV300 m75
commit 25987d35dd3998ab3d822e22d9f9a905deacd816
Merge: acc189b... 3e572cf...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Apr 16 13:29:10 2010 +0200
DEV300: merge masterfix ea9085d6db4c at DEV300
commit 3e572cf4c554db55c251ae53da996baaa6050a29
Author: Ruediger Timm <rt at openoffice.org>
Date: Thu Apr 15 08:57:00 2010 +0200
masterfix: #i10000# Do not mask checkdeliver's exit code.
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index a98a84f..7f5665e 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,5 +38,5 @@ TARGET=checkdeliver
ALLTAR : $(MISC)$/checkdeliver.done
$(MISC)$/checkdeliver.done .PHONY:
- $(PERL) checkdeliver.pl > $@ || cat $@
+ $(PERL) checkdeliver.pl && $(TOUCH) $@
commit d1024e8e2035ea12a89789d465df89ae23439469
Merge: 55830f7... f2bf513...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Apr 16 10:09:51 2010 +0200
CWS-TOOLING: integrate CWS sb118
commit 85e6189d9b11ad28c7b44690d1cb7a9199115115
Author: Thomas Benisch <tbe at openoffice.org>
Date: Wed Apr 14 17:59:20 2010 +0200
chart45: #i110805# Chartshapes: Toolbarbuttons can't be opened
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index 43202b8..d7a615b 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -89,7 +89,13 @@ uiconfig/modules/dbquery/toolbar/toolbar.xml
uiconfig/modules/dbrelation/toolbar/toolbar.xml
uiconfig/modules/dbtable/toolbar/toolbar.xml
uiconfig/modules/StartModule/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/arrowshapes.xml
+uiconfig/modules/schart/toolbar/basicshapes.xml
+uiconfig/modules/schart/toolbar/calloutshapes.xml
+uiconfig/modules/schart/toolbar/flowchartshapes.xml
uiconfig/modules/schart/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/starshapes.xml
+uiconfig/modules/schart/toolbar/symbolshapes.xml
uiconfig/modules/schart/toolbar/toolbar.xml
uiconfig/modules/scalc/toolbar/alignmentbar.xml
uiconfig/modules/scalc/toolbar/arrowshapes.xml
commit f2bf5132849acf18de0f53bd0698be512b37647e
Merge: 56ee7d0... 85c549e...
Author: sb <sb at openoffice.org>
Date: Wed Apr 14 17:21:13 2010 +0200
sb118: merged in backout
commit 406a53d50da7bc281e1311adcb514d69e761fc55
Merge: b4310f3... acc189b...
Author: sb <sb at openoffice.org>
Date: Tue Apr 13 10:53:17 2010 +0200
sb122: merged in DEV300 masterfix
commit 9cdd3ae38bc25de06513627946a24bdc4161a333
Merge: 0089f8e... 55830f7...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Mon Apr 12 20:04:24 2010 +0200
slidecopy: merge
commit acc189b0aa53e2fe8f6877dc8767dcc6f0a6ec91
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Apr 12 17:58:10 2010 +0200
#100000# fixed typo
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index fe550fd..1f33001 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -470,7 +470,7 @@ MY_FILES_ogltrans = \
.END
.IF "$(GUIBASE)" == "WIN"
-MX_XCDS += $(MISC)/forcedefaultlanguage.xcd
+MY_XCDS += $(MISC)/forcedefaultlanguage.xcd
MY_DEPS_forcedefaultlanguage = main
MY_FILES_forcedefaultlanguage = \
$(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
commit b4310f3985d62535765405a430bdbf17f4b32ea0
Merge: 38362aa... 0b443bd...
Author: sb <sb at openoffice.org>
Date: Mon Apr 12 15:08:01 2010 +0200
sb122: merged in DEV300_m76 via cws/sb121
commit 38362aa7ba8b6401ebe8aebaf61fd1cb26cfb708
Merge: 55830f7... 954a24d...
Author: sb <sb at openoffice.org>
Date: Mon Apr 12 14:22:30 2010 +0200
sb121: merged in DEV300_m76
commit 0b443bdbf0945a98a293422679b9acfc3d553701
Merge: 954a24d... f0bfe02...
Author: sb <sb at openoffice.org>
Date: Mon Apr 12 13:19:57 2010 +0200
sb122: merged in cws/sb121
commit 85c549ef467d83f4a207ab45305c1786ab33f7c9
Merge: 1862c79... 55830f7...
Author: sb <sb at openoffice.org>
Date: Sun Apr 11 17:40:44 2010 +0200
sb118: merged in DEV300_m76
commit d40bc9f1a46cf594fff7c82d60804e603034a43e
Merge: 0efb5cd... 55830f7...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Fri Apr 9 09:31:27 2010 +0100
cmcfixes74: merge with DEV300 m76
commit 6ea2c95d10b19adc812e6c5e010c14d2c140d0e1
Merge: 0efb5cd... 55830f7...
Author: Ingrid Halama <iha at openoffice.org>
Date: Fri Apr 9 10:24:13 2010 +0200
chart45: merge with DEV300_m76
commit 55830f72911597f839c205d5da000d8c3b1428bd
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Thu Apr 8 17:11:45 2010 +0200
#i10000# special handling of Linguistic-ForceDefaultLanguage.xcu (fix by sb)
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 3f3dc26..fe550fd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -316,7 +316,6 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Inet-wnt.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
$(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
- $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
$(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
# Inet-wnt.xcu must come after Inet.xcu
.ELSE
@@ -470,6 +469,13 @@ MY_FILES_ogltrans = \
$(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu
.END
+.IF "$(GUIBASE)" == "WIN"
+MX_XCDS += $(MISC)/forcedefaultlanguage.xcd
+MY_DEPS_forcedefaultlanguage = main
+MY_FILES_forcedefaultlanguage = \
+ $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
+.END
+
.INCLUDE : settings.mk
.INCLUDE : target.mk
commit f0bfe022769c4cb5747f3075d13fd4191a4eff87
Author: sb <sb at openoffice.org>
Date: Thu Apr 8 12:57:40 2010 +0200
sb122: #i110695# avoid absolute paths in *.list files
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index ec7c5c0..8444f22 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -29,9 +29,9 @@ PRJ = ..
PRJNAME = postprocess
TARGET = packregistry
-MY_XCS = $(SOLARXMLDIR)/registry/schema/org/openoffice
-MY_XCU = $(SOLARXMLDIR)/registry/data/org/openoffice
-MY_MOD = $(SOLARXMLDIR)/registry/spool
+MY_XCS = registry/schema/org/openoffice
+MY_XCU = registry/data/org/openoffice
+MY_MOD = registry/spool
MY_XCDS = \
$(MISC)/base.xcd \
@@ -477,25 +477,26 @@ ALLTAR : \
$(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd \
$(MISC)/lang/registry_{$(alllangiso)}.xcd
-{$(MY_XCDS)} : $$(MY_FILES_$$(@:b))
+{$(MY_XCDS)} : $$(MY_FILES_$$(@:b):^"$(SOLARXMLDIR)/")
$(MISC)/%.xcd .ERRREMOVE : $(MISC)/%.list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt $<
+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $<
$(MISC)/%.list : makefile.mk
- $(RM) $@
echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \
$(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@
-$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(MY_MOD)/$$(@:b).xcu
+$(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
- $(RM) $(MISC)/$(@:b).list
- echo '<list><dependency file="main"/>\
- <filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
- $(MISC)/$(@:b).list
+ echo '<list><dependency file="main"/>' \
+ '<filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
$(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
@@ -511,8 +512,8 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
find $(@:b).unzip -name \*.xcu -size +0c -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
- $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
$(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
@@ -530,5 +531,5 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
- $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
- $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
+ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
commit 1862c794c0f8f2228617af86aca9cb154e832e6e
Merge: bc3ca72... 371c131...
Author: sb <sb at openoffice.org>
Date: Wed Apr 7 13:14:23 2010 +0200
sb118: merged in re/DEV300_next towards DEV300_m76
commit e95c09e8078be126d0f6d6f94eff8ea0481997b5
Author: Christian Lohmaier <cloph at openoffice.org>
Date: Sat Mar 27 23:45:40 2010 +0100
cloph14: #i110441# remove obsolete files no longer needed for Aqua version of OOo
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index e025835..f3a50e2 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit c7fde083382d744805c78f2b96a6cfde4670cc61
Merge: 0089f8e... 0efb5cd...
Author: Mihaela Kedikova <misheto at openoffice.org>
Date: Tue Mar 23 15:28:55 2010 +0100
gridcontrol_03: merge with DEV300_m75
commit 371c1319c2ed0e96f5f550cd80ca26b39a27688e
Merge: 0efb5cd... ea9f849...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Tue Mar 23 11:58:14 2010 +0100
CWS-TOOLING: integrate CWS autorecovery
commit 954a24d3efb51a7b4bffd8f705556961fa6c812c
Merge: 9422a91... 0efb5cd...
Author: sb <sb at openoffice.org>
Date: Mon Mar 15 10:14:33 2010 +0100
sb121: merged in DEV300_m75
commit 0efb5cdbb9545da62b00497f4a1520536c42c923
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Mar 11 17:51:37 2010 +0100
masterfix DEV300: #i10000# #i110041# --with-lang=ALL: build failure at postprocess
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 054f982..ec7c5c0 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -499,6 +499,9 @@ $(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
+# It can happen that localized $(SOLARPCKDIR)/fcfg_langpack_*.zip contain
+# zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the
+# find shell command below (see issue 110041):
$(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
rm -rf $(MISC)/$(@:b).unzip
@@ -506,7 +509,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
- $(RM) $(MISC)/$(@:b).list
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
- find $(@:b).unzip -name \*.xcu -print) \
+ find $(@:b).unzip -name \*.xcu -size +0c -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
$(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
$(MISC)/$(@:b).list
commit ea9f849b4b656846cacc47e7671c6c678aae32b2
Merge: 0089f8e... 329d262...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Mar 11 11:26:05 2010 +0100
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
diff --cc postprocess/packregistry/makefile.mk
index 0000000,054f982..19a9813
mode 000000,100644..100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@@ -1,0 -1,531 +1,533 @@@
+ #*************************************************************************
+ #
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # Copyright 2000, 2010 Oracle and/or its affiliates.
+ #
+ # OpenOffice.org - a multi-platform office productivity suite
+ #
+ # This file is part of OpenOffice.org.
+ #
+ # OpenOffice.org is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU Lesser General Public License version 3
+ # only, as published by the Free Software Foundation.
+ #
+ # OpenOffice.org is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU Lesser General Public License version 3 for more details
+ # (a copy is included in the LICENSE file that accompanied this code).
+ #
+ # You should have received a copy of the GNU Lesser General Public License
+ # version 3 along with OpenOffice.org. If not, see
+ # <http://www.openoffice.org/license.html>
+ # for a copy of the LGPLv3 License.
+ #
+ #***********************************************************************/
+
+ PRJ = ..
+ PRJNAME = postprocess
+ TARGET = packregistry
+
+ MY_XCS = $(SOLARXMLDIR)/registry/schema/org/openoffice
+ MY_XCU = $(SOLARXMLDIR)/registry/data/org/openoffice
+ MY_MOD = $(SOLARXMLDIR)/registry/spool
+
+ MY_XCDS = \
+ $(MISC)/base.xcd \
+ $(MISC)/brand.xcd \
+ $(MISC)/calc.xcd \
+ $(MISC)/cjk.xcd \
+ $(MISC)/ctl.xcd \
+ $(MISC)/draw.xcd \
+ $(MISC)/graphicfilter.xcd \
+ $(MISC)/impress.xcd \
+ $(MISC)/korea.xcd \
+ $(MISC)/lingucomponent.xcd \
+ $(MISC)/main.xcd \
+ $(MISC)/math.xcd \
+ $(MISC)/onlineupdate.xcd \
+ $(MISC)/oooimprovement.xcd \
+ $(MISC)/palm.xcd \
+ $(MISC)/pocketexcel.xcd \
+ $(MISC)/pocketword.xcd \
+ $(MISC)/pyuno.xcd \
+ $(MISC)/w4w.xcd \
+ $(MISC)/writer.xcd \
+ $(MISC)/xsltfilter.xcd
+
+ MY_DEPS_base = main
+ MY_FILES_base = \
+ $(MY_MOD)/fcfg_database_filters.xcu \
+ $(MY_MOD)/fcfg_database_others.xcu \
+ $(MY_MOD)/fcfg_database_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-base.xcu \
+ $(MY_MOD)/org/openoffice/Setup-base.xcu
+
+ MY_FILES_brand = \
+ $(MY_XCU)/Office/Compatibility.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
+ $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
+ $(MY_MOD)/org/openoffice/Setup-brand.xcu
+ .IF "$(ENABLE_SVCTAGS)" == "YES"
+ MY_FILES_brand += \
+ $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-registration.xcu
+ .END
+
+ MY_DEPS_calc = main
+ MY_FILES_calc = \
+ $(MY_XCS)/Office/UI/CalcCommands.xcs \
+ $(MY_XCS)/Office/UI/CalcWindowState.xcs \
+ $(MY_XCU)/Office/UI/CalcCommands.xcu \
+ $(MY_XCU)/Office/UI/CalcWindowState.xcu \
+ $(MY_MOD)/DataAccess/calc.xcu \
+ $(MY_MOD)/fcfg_calc_filters.xcu \
+ $(MY_MOD)/fcfg_calc_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-calc.xcu \
+ $(MY_MOD)/org/openoffice/Office/Embedding-calc.xcu \
+ $(MY_MOD)/org/openoffice/Setup-calc.xcu
+
+ MY_FILES_cjk = \
+ $(MY_MOD)/org/openoffice/Office/Common-cjk.xcu \
+ $(MY_MOD)/org/openoffice/Office/Writer-cjk.xcu
+
+ MY_DEPS_ctl = main
+ MY_FILES_ctl = \
+ $(MY_MOD)/org/openoffice/Office/Common-ctl.xcu
+
+ MY_DEPS_draw = main
+ MY_FILES_draw = \
+ $(MY_XCS)/Office/UI/DrawWindowState.xcs \
+ $(MY_XCU)/Office/UI/DrawWindowState.xcu \
+ $(MY_MOD)/fcfg_draw_filters.xcu \
+ $(MY_MOD)/fcfg_draw_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-draw.xcu \
+ $(MY_MOD)/org/openoffice/Office/Embedding-draw.xcu \
+ $(MY_MOD)/org/openoffice/Setup-draw.xcu
+
+ MY_DEPS_graphicfilter = main
+ MY_FILES_graphicfilter = \
+ $(MY_MOD)/fcfg_drawgraphics_filters.xcu \
+ $(MY_MOD)/fcfg_drawgraphics_types.xcu \
+ $(MY_MOD)/fcfg_impressgraphics_filters.xcu \
+ $(MY_MOD)/fcfg_impressgraphics_types.xcu
+
+ MY_DEPS_impress = main
+ MY_FILES_impress = \
+ $(MY_XCS)/Office/UI/Effects.xcs \
+ $(MY_XCS)/Office/UI/ImpressWindowState.xcs \
+ $(MY_XCU)/Office/UI/Effects.xcu \
+ $(MY_XCU)/Office/UI/ImpressWindowState.xcu \
+ $(MY_MOD)/fcfg_impress_filters.xcu \
+ $(MY_MOD)/fcfg_impress_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-impress.xcu \
+ $(MY_MOD)/org/openoffice/Office/Embedding-impress.xcu \
+ $(MY_MOD)/org/openoffice/Setup-impress.xcu
+
+ MY_FILES_korea = \
+ $(MY_MOD)/org/openoffice/Office/Common-korea.xcu
+
+ MY_DEPS_lingucomponent = main
+ MY_FILES_lingucomponent = \
+ $(MY_XCU)/Office/Linguistic-lingucomponent-hyphenator.xcu \
+ $(MY_XCU)/Office/Linguistic-lingucomponent-spellchecker.xcu \
+ $(MY_XCU)/Office/Linguistic-lingucomponent-thesaurus.xcu \
+
+ MY_FILES_main = \
+ $(MY_XCS)/FirstStartWizard.xcs \
+ $(MY_XCS)/Inet.xcs \
++ $(MY_XCS)/Interaction.xcs \
+ $(MY_XCS)/LDAP.xcs \
+ $(MY_XCS)/Office/Accelerators.xcs \
+ $(MY_XCS)/Office/Addons.xcs \
+ $(MY_XCS)/Office/Calc.xcs \
+ $(MY_XCS)/Office/CalcAddIns.xcs \
+ $(MY_XCS)/Office/Canvas.xcs \
+ $(MY_XCS)/Office/Chart.xcs \
+ $(MY_XCS)/Office/Commands.xcs \
+ $(MY_XCS)/Office/Common.xcs \
+ $(MY_XCS)/Office/Compatibility.xcs \
+ $(MY_XCS)/Office/DataAccess/Drivers.xcs \
+ $(MY_XCS)/Office/DataAccess.xcs \
+ $(MY_XCS)/Office/Draw.xcs \
+ $(MY_XCS)/Office/Embedding.xcs \
+ $(MY_XCS)/Office/Events.xcs \
+ $(MY_XCS)/Office/ExtendedColorScheme.xcs \
+ $(MY_XCS)/Office/ExtensionManager.xcs \
+ $(MY_XCS)/Office/FormWizard.xcs \
+ $(MY_XCS)/Office/Histories.xcs \
+ $(MY_XCS)/Office/Impress.xcs \
+ $(MY_XCS)/Office/Java.xcs \
+ $(MY_XCS)/Office/Jobs.xcs \
+ $(MY_XCS)/Office/Labels.xcs \
+ $(MY_XCS)/Office/Linguistic.xcs \
+ $(MY_XCS)/Office/Logging.xcs \
+ $(MY_XCS)/Office/Math.xcs \
+ $(MY_XCS)/Office/OOoImprovement/Settings.xcs \
+ $(MY_XCS)/Office/OptionsDialog.xcs \
+ $(MY_XCS)/Office/Paths.xcs \
+ $(MY_XCS)/Office/ProtocolHandler.xcs \
+ $(MY_XCS)/Office/Recovery.xcs \
+ $(MY_XCS)/Office/SFX.xcs \
+ $(MY_XCS)/Office/Scripting.xcs \
+ $(MY_XCS)/Office/Security.xcs \
+ $(MY_XCS)/Office/Substitution.xcs \
+ $(MY_XCS)/Office/TabBrowse.xcs \
+ $(MY_XCS)/Office/TableWizard.xcs \
+ $(MY_XCS)/Office/TypeDetection.xcs \
+ $(MY_XCS)/Office/UI/BaseWindowState.xcs \
+ $(MY_XCS)/Office/UI/BasicIDECommands.xcs \
+ $(MY_XCS)/Office/UI/BasicIDEWindowState.xcs \
+ $(MY_XCS)/Office/UI/BibliographyCommands.xcs \
+ $(MY_XCS)/Office/UI/BibliographyWindowState.xcs \
+ $(MY_XCS)/Office/UI/Category.xcs \
+ $(MY_XCS)/Office/UI/ChartCommands.xcs \
+ $(MY_XCS)/Office/UI/ChartWindowState.xcs \
+ $(MY_XCS)/Office/UI/Commands.xcs \
+ $(MY_XCS)/Office/UI/Controller.xcs \
+ $(MY_XCS)/Office/UI/DbBrowserWindowState.xcs \
+ $(MY_XCS)/Office/UI/DbQueryWindowState.xcs \
+ $(MY_XCS)/Office/UI/DbRelationWindowState.xcs \
+ $(MY_XCS)/Office/UI/DbTableDataWindowState.xcs \
+ $(MY_XCS)/Office/UI/DbTableWindowState.xcs \
+ $(MY_XCS)/Office/UI/DbuCommands.xcs \
+ $(MY_XCS)/Office/UI/DrawImpressCommands.xcs \
+ $(MY_XCS)/Office/UI/Factories.xcs \
+ $(MY_XCS)/Office/UI/GenericCategories.xcs \
+ $(MY_XCS)/Office/UI/GenericCommands.xcs \
+ $(MY_XCS)/Office/UI/GlobalSettings.xcs \
+ $(MY_XCS)/Office/UI/StartModuleCommands.xcs \
+ $(MY_XCS)/Office/UI/StartModuleWindowState.xcs \
+ $(MY_XCS)/Office/UI/WindowContentFactories.xcs \
+ $(MY_XCS)/Office/UI/WindowState.xcs \
+ $(MY_XCS)/Office/UI.xcs \
+ $(MY_XCS)/Office/Views.xcs \
+ $(MY_XCS)/Office/WebWizard.xcs \
+ $(MY_XCS)/Office/Writer.xcs \
+ $(MY_XCS)/Office/WriterWeb.xcs \
+ $(MY_XCS)/Setup.xcs \
+ $(MY_XCS)/System.xcs \
+ $(MY_XCS)/TypeDetection/Filter.xcs \
+ $(MY_XCS)/TypeDetection/GraphicFilter.xcs \
+ $(MY_XCS)/TypeDetection/Misc.xcs \
+ $(MY_XCS)/TypeDetection/Types.xcs \
+ $(MY_XCS)/TypeDetection/UISort.xcs \
+ $(MY_XCS)/UserProfile.xcs \
+ $(MY_XCS)/VCL.xcs \
+ $(MY_XCS)/ucb/Configuration.xcs \
+ $(MY_XCS)/ucb/Hierarchy.xcs \
+ $(MY_XCS)/ucb/InteractionHandler.xcs \
+ $(MY_XCS)/ucb/Store.xcs \
+ $(MY_XCU)/FirstStartWizard.xcu \
+ $(MY_XCU)/Inet.xcu \
++ $(MY_XCU)/Interaction.xcu \
+ $(MY_XCU)/Office/Accelerators.xcu \
+ $(MY_XCU)/Office/Calc.xcu \
+ $(MY_XCU)/Office/Canvas.xcu \
+ $(MY_XCU)/Office/Common.xcu \
+ $(MY_XCU)/Office/DataAccess.xcu \
+ $(MY_XCU)/Office/Embedding.xcu \
+ $(MY_XCU)/Office/ExtensionManager.xcu \
+ $(MY_XCU)/Office/FormWizard.xcu \
+ $(MY_XCU)/Office/Histories.xcu \
+ $(MY_XCU)/Office/Impress.xcu \
+ $(MY_XCU)/Office/Jobs.xcu \
+ $(MY_XCU)/Office/Labels.xcu \
+ $(MY_XCU)/Office/Logging.xcu \
+ $(MY_XCU)/Office/Math.xcu \
+ $(MY_XCU)/Office/Paths.xcu \
+ $(MY_XCU)/Office/ProtocolHandler.xcu \
+ $(MY_XCU)/Office/SFX.xcu \
+ $(MY_XCU)/Office/Scripting.xcu \
+ $(MY_XCU)/Office/Security.xcu \
+ $(MY_XCU)/Office/TableWizard.xcu \
+ $(MY_XCU)/Office/UI/BaseWindowState.xcu \
+ $(MY_XCU)/Office/UI/BasicIDECommands.xcu \
+ $(MY_XCU)/Office/UI/BasicIDEWindowState.xcu \
+ $(MY_XCU)/Office/UI/BibliographyCommands.xcu \
+ $(MY_XCU)/Office/UI/ChartCommands.xcu \
+ $(MY_XCU)/Office/UI/ChartWindowState.xcu \
+ $(MY_XCU)/Office/UI/Controller.xcu \
+ $(MY_XCU)/Office/UI/DbBrowserWindowState.xcu \
+ $(MY_XCU)/Office/UI/DbQueryWindowState.xcu \
+ $(MY_XCU)/Office/UI/DbRelationWindowState.xcu \
+ $(MY_XCU)/Office/UI/DbTableDataWindowState.xcu \
+ $(MY_XCU)/Office/UI/DbTableWindowState.xcu \
+ $(MY_XCU)/Office/UI/DbuCommands.xcu \
+ $(MY_XCU)/Office/UI/DrawImpressCommands.xcu \
+ $(MY_XCU)/Office/UI/Factories.xcu \
+ $(MY_XCU)/Office/UI/GenericCategories.xcu \
+ $(MY_XCU)/Office/UI/GenericCommands.xcu \
+ $(MY_XCU)/Office/UI/StartModuleCommands.xcu \
+ $(MY_XCU)/Office/UI/StartModuleWindowState.xcu \
+ $(MY_XCU)/Office/UI.xcu \
+ $(MY_XCU)/Office/Views.xcu \
+ $(MY_XCU)/Office/WebWizard.xcu \
+ $(MY_XCU)/Office/Writer.xcu \
+ $(MY_XCU)/Setup.xcu \
+ $(MY_XCU)/System.xcu \
+ $(MY_XCU)/TypeDetection/UISort.xcu \
+ $(MY_XCU)/UserProfile.xcu \
+ $(MY_XCU)/VCL.xcu \
+ $(MY_XCU)/ucb/Configuration.xcu \
+ $(MY_MOD)/DataAccess/dbase.xcu \
+ $(MY_MOD)/DataAccess/flat.xcu \
+ $(MY_MOD)/DataAccess/mysql.xcu \
+ $(MY_MOD)/DataAccess/odbc.xcu \
+ $(MY_MOD)/fcfg_base_filters.xcu \
+ $(MY_MOD)/fcfg_base_others.xcu \
+ $(MY_MOD)/fcfg_base_types.xcu \
+ $(MY_MOD)/fcfg_chart_filters.xcu \
+ $(MY_MOD)/fcfg_chart_others.xcu \
+ $(MY_MOD)/fcfg_chart_types.xcu \
+ $(MY_MOD)/fcfg_internalgraphics_filters.xcu \
+ $(MY_MOD)/fcfg_internalgraphics_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Embedding-chart.xcu \
+ $(MY_MOD)/org/openoffice/Office/Writer-javamail.xcu \
+ $(MY_MOD)/org/openoffice/Setup-start.xcu \
+ $(MY_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \
+ $(MY_MOD)/org/openoffice/TypeDetection/UISort-draw.xcu \
+ $(MY_MOD)/org/openoffice/TypeDetection/UISort-impress.xcu \
+ $(MY_MOD)/org/openoffice/TypeDetection/UISort-math.xcu \
+ $(MY_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu
+ .IF "$(GUIBASE)" == "aqua"
+ MY_FILES_main += \
+ $(MY_MOD)/DataAccess/macab.xcu \
+ $(MY_MOD)/org/openoffice/Inet-macosx.xcu \
+ $(MY_MOD)/org/openoffice/Office/Accelerators-macosx.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-macosx.xcu \
+ $(MY_MOD)/org/openoffice/Office/Paths-macosx.xcu
+ # Inet-macosx.xcu must come after Inet.xcu
+ .ELIF "$(GUIBASE)" == "unx"
+ MY_FILES_main += \
+ $(MY_MOD)/org/openoffice/Inet-unixdesktop.xcu \
+ $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-unixdesktop.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-unx.xcu \
+ $(MY_MOD)/org/openoffice/Office/Paths-unixdesktop.xcu \
+ $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \
+ $(MY_MOD)/org/openoffice/VCL-unixdesktop.xcu
+ # Inet-unixdesktop.xcu must come after Inet.xcu
+ # VCL-unixdesktop.xcu must come after VCL.xcu
+ .ELIF "$(GUIBASE)" == "WIN"
+ MY_FILES_main += \
+ $(MY_MOD)/DataAccess/ado.xcu \
+ $(MY_MOD)/org/openoffice/Inet-wnt.xcu \
+ $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
+ $(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
+ $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
+ # Inet-wnt.xcu must come after Inet.xcu
+ .ELSE
+ ERROR : unknown-GUIBASE
+ .END
+ .IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || \
+ ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD"
+ MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
+ .END
+ .IF "$(ENABLE_EVOAB2)" == "TRUE"
+ MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+ .END
+ .IF "$(SOLAR_JAVA)" == "TRUE"
+ MY_FILES_main += \
+ $(MY_MOD)/DataAccess/hsqldb.xcu \
+ $(MY_MOD)/DataAccess/jdbc.xcu
+ .END
+ .IF "$(ENABLE_KAB)" == "TRUE"
+ MY_FILES_main += $(MY_MOD)/DataAccess/kab.xcu
+ .END
+ .IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
+ "$(OS)" != "MACOSX"
+ .IF "$(OS)" == "WNT"
+ MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
+ .ELSE
+ MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
+ .END
+ .END
+
+ MY_DEPS_math = main
+ MY_FILES_math = \
+ $(MY_XCS)/Office/UI/MathCommands.xcs \
+ $(MY_XCS)/Office/UI/MathWindowState.xcs \
+ $(MY_XCU)/Office/UI/MathCommands.xcu \
+ $(MY_XCU)/Office/UI/MathWindowState.xcu \
+ $(MY_MOD)/fcfg_math_filters.xcu \
+ $(MY_MOD)/fcfg_math_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-math.xcu \
+ $(MY_MOD)/org/openoffice/Office/Embedding-math.xcu \
+ $(MY_MOD)/org/openoffice/Setup-math.xcu
+
+ MY_DEPS_onlineupdate = main
+ MY_FILES_onlineupdate = \
+ $(MY_MOD)/org/openoffice/Office/Addons/Addons-onlineupdate.xcu \
+ $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu
+
+ MY_DEPS_oooimprovement = main
+ MY_FILES_oooimprovement = \
+ $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu \
+ $(MY_MOD)/org/openoffice/Office/Logging/Logging-oooimprovement.xcu
+
+ MY_DEPS_palm = main
+ MY_FILES_palm = \
+ $(MY_MOD)/fcfg_palm_filters.xcu \
+ $(MY_MOD)/fcfg_palm_types.xcu
+
+ MY_DEPS_pocketexcel = main
+ MY_FILES_pocketexcel = \
+ $(MY_MOD)/fcfg_pocketexcel_filters.xcu \
+ $(MY_MOD)/fcfg_pocketexcel_types.xcu
+
+ MY_DEPS_pocketword = main
+ MY_FILES_pocketword = \
+ $(MY_MOD)/fcfg_pocketword_filters.xcu \
+ $(MY_MOD)/fcfg_pocketword_types.xcu
+
+ MY_DEPS_pyuno = main
+ MY_FILES_pyuno = \
+ $(MY_MOD)/org/openoffice/Office/Scripting-python.xcu
+
+ MY_DEPS_w4w = main
+ MY_FILES_w4w = \
+ $(MY_MOD)/fcfg_w4w_filters.xcu \
+ $(MY_MOD)/fcfg_w4w_types.xcu
+
+ MY_DEPS_writer = main
+ MY_FILES_writer = \
+ $(MY_XCS)/Office/UI/WriterCommands.xcs \
+ $(MY_XCS)/Office/UI/WriterFormWindowState.xcs \
+ $(MY_XCS)/Office/UI/WriterGlobalWindowState.xcs \
+ $(MY_XCS)/Office/UI/WriterReportWindowState.xcs \
+ $(MY_XCS)/Office/UI/WriterWebWindowState.xcs \
+ $(MY_XCS)/Office/UI/WriterWindowState.xcs \
+ $(MY_XCS)/Office/UI/XFormsWindowState.xcs \
+ $(MY_XCU)/Office/UI/WriterCommands.xcu \
+ $(MY_XCU)/Office/UI/WriterFormWindowState.xcu \
+ $(MY_XCU)/Office/UI/WriterGlobalWindowState.xcu \
+ $(MY_XCU)/Office/UI/WriterReportWindowState.xcu \
+ $(MY_XCU)/Office/UI/WriterWebWindowState.xcu \
+ $(MY_XCU)/Office/UI/WriterWindowState.xcu \
+ $(MY_XCU)/Office/UI/XFormsWindowState.xcu \
+ $(MY_MOD)/fcfg_global_filters.xcu \
+ $(MY_MOD)/fcfg_global_types.xcu \
+ $(MY_MOD)/fcfg_web_filters.xcu \
+ $(MY_MOD)/fcfg_web_types.xcu \
+ $(MY_MOD)/fcfg_writer_filters.xcu \
+ $(MY_MOD)/fcfg_writer_types.xcu \
+ $(MY_MOD)/org/openoffice/Office/Common-writer.xcu \
+ $(MY_MOD)/org/openoffice/Office/Embedding-writer.xcu \
+ $(MY_MOD)/org/openoffice/Setup-writer.xcu
+
+ MY_DEPS_xsltfilter = main
+ MY_FILES_xsltfilter = \
+ $(MY_MOD)/fcfg_xslt_filters.xcu \
+ $(MY_MOD)/fcfg_xslt_types.xcu
+
+ .IF "$(WITH_BINFILTER)" != "NO"
+ MY_XCDS += $(MISC)/binfilter.xcd
+ MY_DEPS_binfilter = main
+ MY_FILES_binfilter = \
+ $(MY_MOD)/fcfg_chart_bf_filters.xcu \
+ $(MY_MOD)/fcfg_chart_bf_types.xcu \
+ $(MY_MOD)/fcfg_calc_bf_filters.xcu \
+ $(MY_MOD)/fcfg_calc_bf_types.xcu \
+ $(MY_MOD)/fcfg_draw_bf_filters.xcu \
+ $(MY_MOD)/fcfg_draw_bf_types.xcu \
+ $(MY_MOD)/fcfg_global_bf_filters.xcu \
+ $(MY_MOD)/fcfg_global_bf_types.xcu \
+ $(MY_MOD)/fcfg_impress_bf_filters.xcu \
+ $(MY_MOD)/fcfg_impress_bf_types.xcu \
+ $(MY_MOD)/fcfg_math_bf_filters.xcu \
+ $(MY_MOD)/fcfg_math_bf_types.xcu \
+ $(MY_MOD)/fcfg_web_bf_filters.xcu \
+ $(MY_MOD)/fcfg_web_bf_types.xcu \
+ $(MY_MOD)/fcfg_writer_bf_filters.xcu \
+ $(MY_MOD)/fcfg_writer_bf_types.xcu
+ .END
+
+ .IF "$(GUIBASE)" == "unx" && \
+ (("$(ENABLE_GCONF)" == "TRUE" && "$(ENABLE_LOCKDOWN)" == "YES") || \
+ "$(ENABLE_GIO)" == "TRUE")
+ MY_XCDS += $(MISC)/gnome.xcd
+ MY_DEPS_gnome = main
+ .IF "$(ENABLE_GCONF)" == "TRUE" && "$(ENABLE_LOCKDOWN)" == "YES"
+ MY_FILES_gnome += \
+ $(MY_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \
+ $(MY_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \
+ $(MY_MOD)/org/openoffice/UserProfile-gconflockdown.xcu \
+ $(MY_MOD)/org/openoffice/VCL-gconflockdown.xcu
+ .END
+ .IF "$(ENABLE_GIO)" == "TRUE"
+ MY_FILES_gnome += \
+ $(MY_MOD)/org/openoffice/ucb/Configuration-gio.xcu
+ .END
+ .END
+
+ .IF "$(ENABLE_OPENGL)" == "TRUE"
+ MY_XCDS += $(MISC)/ogltrans.xcd
+ MY_DEPS_ogltrans = main
+ MY_FILES_ogltrans = \
+ $(MY_MOD)/org/openoffice/Office/Impress-ogltrans.xcu
+ .END
+
+ .INCLUDE : settings.mk
+ .INCLUDE : target.mk
+
+ ALLTAR : \
+ $(MY_XCDS) \
+ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd \
+ $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd \
+ $(MISC)/lang/registry_{$(alllangiso)}.xcd
+
+ {$(MY_XCDS)} : $$(MY_FILES_$$(@:b))
+
+ $(MISC)/%.xcd .ERRREMOVE : $(MISC)/%.list
+ $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt $<
+
+ $(MISC)/%.list : makefile.mk
+ - $(RM) $@
+ echo '<list>' $(foreach,i,$(MY_DEPS_$(@:b)) '<dependency file="$i"/>') \
+ $(foreach,i,$(MY_FILES_$(@:b)) '<filename>$i</filename>') '</list>' > $@
+
+ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(MY_MOD)/$$(@:b).xcu
+
+ $(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
+ $(MKDIRHIER) $(@:d)
+ - $(RM) $(MISC)/$(@:b).list
+ echo '<list><dependency file="main"/>\
+ <filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
+ $(MISC)/$(@:b).list
+
+ $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
+
+ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
+ $(MKDIRHIER) $(@:d)
+ rm -rf $(MISC)/$(@:b).unzip
+ mkdir $(MISC)/$(@:b).unzip
+ cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
+ - $(RM) $(MISC)/$(@:b).list
+ echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
+ find $(@:b).unzip -name \*.xcu -print) \
+ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
+ $(MISC)/$(@:b).list
+
+ $(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
+ $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
+
+ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
+ $(MKDIRHIER) $(@:d)
+ rm -rf $(MISC)/$(@:b).unzip
+ mkdir $(MISC)/$(@:b).unzip
+ cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
+ rm -rf $(MISC)/fcfg_drivers_$*.unzip
+ mkdir $(MISC)/fcfg_drivers_$*.unzip
+ cd $(MISC)/fcfg_drivers_$*.unzip && \
+ unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
+ - $(RM) $(MISC)/$(@:b).list
+ echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
+ find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
+ $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \
+ $(MISC)/$(@:b).list
commit 9422a9111d33305c9aa2a9963dcaee4b60ea04a4
Author: sb <sb at openoffice.org>
Date: Wed Mar 10 13:38:32 2010 +0100
sb121: #i94456# removed unnecessary Writer-javamail.xcu module
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 054f982..88eb56d 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -281,7 +281,6 @@ MY_FILES_main = \
$(MY_MOD)/fcfg_internalgraphics_filters.xcu \
$(MY_MOD)/fcfg_internalgraphics_types.xcu \
$(MY_MOD)/org/openoffice/Office/Embedding-chart.xcu \
- $(MY_MOD)/org/openoffice/Office/Writer-javamail.xcu \
$(MY_MOD)/org/openoffice/Setup-start.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-calc.xcu \
$(MY_MOD)/org/openoffice/TypeDetection/UISort-draw.xcu \
commit bc3ca728e47746ac82a44685863e5fd36e9f3b7e
Merge: 52e9eaf... 329d262...
Author: sb <sb at openoffice.org>
Date: Tue Mar 9 17:45:16 2010 +0100
sb118: merged in DEV300_m74
commit 329d26237c3aa729238a99416d0d759c30ad2058
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 8 16:36:32 2010 +0100
#i10000# dependency build fix
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index c4b51e7..054f982 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -87,7 +87,6 @@ MY_FILES_calc = \
$(MY_MOD)/org/openoffice/Office/Embedding-calc.xcu \
$(MY_MOD)/org/openoffice/Setup-calc.xcu
-MY_DEPS_cjk = main
MY_FILES_cjk = \
$(MY_MOD)/org/openoffice/Office/Common-cjk.xcu \
$(MY_MOD)/org/openoffice/Office/Writer-cjk.xcu
@@ -125,7 +124,6 @@ MY_FILES_impress = \
$(MY_MOD)/org/openoffice/Office/Embedding-impress.xcu \
$(MY_MOD)/org/openoffice/Setup-impress.xcu
-MY_DEPS_korea = main
MY_FILES_korea = \
$(MY_MOD)/org/openoffice/Office/Common-korea.xcu
commit 52e9eaf5d57c965f40454cb96e3618b2a1d037fd
Merge: 6891695... cc56f6f...
Author: sb <sb at openoffice.org>
Date: Thu Mar 4 23:05:27 2010 +0100
merged in re/DEV300_next towards DEV300_m74
commit cc56f6fb6f5ddb185a22e1a521a76f15886875a6
Merge: 9080973... 51cf860...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 2 18:43:33 2010 +0100
CWS-TOOLING: integrate CWS sb111
commit 51cf8605fadf9e7350da3e912c894eaf14d561ad
Author: sb <sb at openoffice.org>
Date: Thu Feb 25 15:59:15 2010 +0100
sb118: #i109125# change source file copyright notice from Sun Microsystems to Oracle
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index b17c489..c4b51e7 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -1,14 +1,11 @@
#*************************************************************************
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +22,7 @@
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
+#
#***********************************************************************/
PRJ = ..
commit fc7b28a24bed5ea5194d76902fd9da814bfc8ed0
Merge: 64a970a... 9080973...
Author: sb <sb at openoffice.org>
Date: Thu Feb 25 13:53:42 2010 +0100
sb111: merged in DEV300_m72
commit 6891695cbdd31ad3765ef27aa27670ed1056a278
Merge: 56ee7d0... 9080973...
Author: sb <sb at openoffice.org>
Date: Thu Feb 25 12:46:45 2010 +0100
sb118: merged in DEV300_m72
diff --cc postprocess/prj/build.lst
index 0826aae,e025835..45a38d6
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox NULL
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
++po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit 908097370dc9608b6ed24a907321b4d4ed3b5005
Merge: 44fd1f1... e9e8a91...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Wed Feb 17 10:32:35 2010 +0100
CWS-TOOLING: integrate CWS changefileheader2
commit 44fd1f148bdfa9c4bdc32d7fded20d6136a70515
Merge: 0089f8e... 479c01e...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Feb 15 15:27:59 2010 +0100
CWS-TOOLING: integrate CWS mysqlconnector
diff --cc postprocess/prj/build.lst
index 8fd2fe4,85a8c37..e025835
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox NULL
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox MYSQLC:mysqlc NULL
++po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit e9e8a911801944f14563b68c03678ca817d2b75d
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Fri Feb 12 16:56:44 2010 +0100
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 8ffbabc..9098ab2 100755
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -1,350 +1,350 @@
-abpmi.dll 0x0000000067fd0000 0x00020000
-acceptor.uno.dll 0x0000000067fb0000 0x00010000
-accmi.dll 0x0000000067f00000 0x000a0000
-adabasmi.dll 0x0000000067e90000 0x00060000
-adabasuimi.dll 0x0000000067e60000 0x00020000
-ado2.dll 0x0000000067dd0000 0x00080000
-affine_uno_uno.dll 0x0000000067db0000 0x00010000
-aggmi.dll 0x0000000067d70000 0x00030000
-analysismi.dll 0x0000000067d20000 0x00040000
-animcore.dll 0x0000000067cf0000 0x00020000
-avmediami.dll 0x0000000067ca0000 0x00040000
-avmediawin.dll 0x0000000067c70000 0x00020000
-basctlmi.dll 0x0000000067ba0000 0x000c0000
-basebmpmi.dll 0x00000000678a0000 0x002f0000
-basegfxmi.dll 0x0000000067820000 0x00070000
-basprovmi.uno.dll 0x00000000677f0000 0x00020000
-behelper.uno.dll 0x00000000677a0000 0x00010000
-bf_frmmi.dll 0x00000000676b0000 0x000e0000
-bf_gomi.dll 0x0000000067680000 0x00020000
-bf_migratefiltermi.dll 0x0000000067660000 0x00010000
-bf_ofami.dll 0x0000000067640000 0x00010000
-bf_sbmi.dll 0x00000000675b0000 0x00080000
-bf_schmi.dll 0x0000000067500000 0x000a0000
-bf_scmi.dll 0x00000000672a0000 0x00250000
-bf_sdmi.dll 0x00000000671f0000 0x000a0000
-bf_smmi.dll 0x0000000067190000 0x00050000
-bf_somi.dll 0x00000000670f0000 0x00090000
-bf_svtmi.dll 0x0000000066f30000 0x001b0000
-bf_svxmi.dll 0x0000000066b50000 0x003d0000
-bf_swmi.dll 0x00000000668b0000 0x00290000
-bf_wrappermi.dll 0x0000000066880000 0x00020000
-bf_xomi.dll 0x0000000066480000 0x003f0000
-bibmi.dll 0x0000000066430000 0x00040000
-bindetmi.dll 0x0000000066410000 0x00010000
-bootstrap.uno.dll 0x0000000066380000 0x00080000
-bootstrpdtmi.dll 0x0000000066350000 0x00020000
-bridgefac.uno.dll 0x0000000066330000 0x00010000
-cached1.dll 0x00000000662b0000 0x00030000
-calcmi.dll 0x0000000066260000 0x00040000
-canvasfactory.uno.dll 0x0000000066240000 0x00010000
-canvastoolsmi.dll 0x00000000661b0000 0x00080000
-chartcontrollermi.dll 0x0000000066030000 0x00170000
-chartmodelmi.dll 0x0000000065f70000 0x000b0000
-charttoolsmi.dll 0x0000000065dd0000 0x00190000
-chartviewmi.dll 0x0000000065c60000 0x00160000
-cli_uno.dll 0x0000000065c20000 0x00030000
-collator_data.dll 0x0000000065aa0000 0x00170000
-communimi.dll 0x0000000065a80000 0x00010000
-comphelp4msc.dll 0x0000000065980000 0x000f0000
-configmgr2.uno.dll 0x0000000065800000 0x00170000
-connector.uno.dll 0x00000000657e0000 0x00010000
-cppcanvasmi.dll 0x0000000065780000 0x00050000
-cppu3.dll 0x0000000065740000 0x00030000
-cppuhelper3msc.dll 0x00000000656c0000 0x00070000
-ctlmi.dll 0x0000000065680000 0x00030000
-cuimi.dll 0x00000000654a0000 0x001d0000
-datemi.dll 0x0000000065470000 0x00020000
-dbacfgmi.dll 0x0000000065440000 0x00020000
-dbami.dll 0x00000000652e0000 0x00150000
-dbasemi.dll 0x0000000065280000 0x00050000
-dbaxmlmi.dll 0x0000000065230000 0x00040000
-dbmmmi.dll 0x0000000065200000 0x00020000
-dbpmi.dll 0x00000000651c0000 0x00030000
-dbpool2.dll 0x0000000065190000 0x00020000
-dbtoolsmi.dll 0x0000000064f60000 0x00220000
-dbumi.dll 0x0000000064ce0000 0x00270000
-deploymentguimi.uno.dll 0x0000000064c60000 0x00070000
-deploymentmi.uno.dll 0x0000000064be0000 0x00070000
-deploymentmiscmi.dll 0x0000000064bb0000 0x00020000
-dfami.dll 0x0000000064b40000 0x00010000
-dict_ja.dll 0x0000000064a20000 0x00110000
-dict_zh.dll 0x00000000647e0000 0x00230000
-directx5canvas.uno.dll 0x0000000064760000 0x00070000
-directx9canvas.uno.dll 0x00000000646e0000 0x00070000
-dlgprovmi.uno.dll 0x00000000646b0000 0x00020000
-dnd.dll 0x0000000064680000 0x00020000
-doctok.dll 0x00000000645c0000 0x000b0000
-dtrans.dll 0x00000000645a0000 0x00010000
-dynamicloader.uno.dll 0x0000000064570000 0x00020000
-egimi.dll 0x0000000064550000 0x00010000
-embobj.dll 0x00000000644d0000 0x00070000
-emboleobj.dll 0x0000000064480000 0x00040000
-ememi.dll 0x0000000064460000 0x00010000
-empmi.dll 0x0000000064410000 0x00040000
-emsermi.dll 0x00000000643d0000 0x00030000
-epbmi.dll 0x00000000643b0000 0x00010000
-epgmi.dll 0x0000000064390000 0x00010000
-eppmi.dll 0x0000000064370000 0x00010000
-epsmi.dll 0x0000000064340000 0x00020000
-eptmi.dll 0x0000000064320000 0x00010000
-erami.dll 0x0000000064300000 0x00010000
-etimi.dll 0x00000000642e0000 0x00010000
-evtatt.dll 0x00000000642c0000 0x00010000
-expmi.dll 0x0000000064280000 0x00010000
-fastsax.uno.dll 0x0000000064240000 0x00030000
-fileacc.dll 0x0000000064220000 0x00010000
-filemi.dll 0x0000000064140000 0x000d0000
-filterconfig1.dll 0x00000000640f0000 0x00040000
-filtertracermi.dll 0x00000000640d0000 0x00010000
-flashmi.dll 0x0000000064090000 0x00030000
-flatmi.dll 0x0000000064040000 0x00040000
-fop.dll 0x0000000064020000 0x00010000
-fpicker.uno.dll 0x0000000064000000 0x00010000
-fps.dll 0x0000000063fc0000 0x00030000
-fps_office.uno.dll 0x0000000063f70000 0x00040000
-frmmi.dll 0x0000000063dd0000 0x00190000
-fsstorage.uno.dll 0x0000000063da0000 0x00020000
-ftransl.dll 0x0000000063d80000 0x00010000
-fwemi.dll 0x0000000063c90000 0x000e0000
-fwimi.dll 0x0000000063c30000 0x00050000
-fwkmi.dll 0x0000000063a50000 0x001d0000
-fwlmi.dll 0x0000000063a20000 0x00020000
-fwmmi.dll 0x00000000639f0000 0x00020000
-gdipluscanvas.uno.dll 0x0000000063980000 0x00060000
-gomi.dll 0x00000000638b0000 0x00060000
-guesslangmi.dll 0x0000000063890000 0x00010000
-hatchwindowfactory.uno.dll 0x0000000063860000 0x00020000
-helplinkermi.dll 0x0000000063820000 0x00030000
-hsqldb2.dll 0x00000000637d0000 0x00040000
-hwp.dll 0x0000000063740000 0x00080000
-hyphenmi.dll 0x0000000063710000 0x00020000
-i18nisolang1msc.dll 0x00000000636f0000 0x00010000
-i18npool.uno.dll 0x00000000635b0000 0x00130000
-i18nregexpmsc.dll 0x0000000063590000 0x00010000
-i18nsearch.uno.dll 0x0000000063570000 0x00010000
-i18nutilmsc.dll 0x0000000063540000 0x00020000
-icdmi.dll 0x0000000063520000 0x00010000
-icgmi.dll 0x00000000634f0000 0x00020000
-icudt36l.dll 0x0000000062b00000 0x009c0000
-icuin36.dll 0x0000000062a20000 0x000d0000
-icule36.dll 0x00000000629d0000 0x00040000
-icutu36.dll 0x00000000629a0000 0x00020000
-icuuc36.dll 0x00000000628b0000 0x000e0000
-idxmi.dll 0x0000000062880000 0x00020000
-imemi.dll 0x0000000062860000 0x00010000
-index_data.dll 0x00000000627c0000 0x00090000
-instooofiltmsi.dll 0x0000000062790000 0x00020000
-introspection.uno.dll 0x0000000062760000 0x00020000
-invocadapt.uno.dll 0x0000000062740000 0x00010000
-invocation.uno.dll 0x0000000062720000 0x00010000
-ipbmi.dll 0x0000000062700000 0x00010000
-ipdmi.dll 0x00000000626e0000 0x00010000
-ipsmi.dll 0x00000000626c0000 0x00010000
-iptmi.dll 0x00000000626a0000 0x00010000
-ipxmi.dll 0x0000000062680000 0x00010000
-irami.dll 0x0000000062660000 0x00010000
-itgmi.dll 0x0000000062640000 0x00010000
-itimi.dll 0x0000000062620000 0x00010000
-java_uno.dll 0x00000000625f0000 0x00020000
-java_uno_accessbridge.dll 0x00000000625d0000 0x00010000
-javaloader.uno.dll 0x00000000625b0000 0x00010000
-javavm.uno.dll 0x0000000062580000 0x00020000
-jdbc2.dll 0x0000000062510000 0x00060000
-jfregca.dll 0x00000000624d0000 0x00030000
-jmi_g.dll 0x00000000624b0000 0x00010000
-jpipe.dll 0x0000000062490000 0x00010000
-juh.dll 0x00000000623b0000 0x00010000
-juhx.dll 0x0000000062380000 0x00020000
-jvmaccess3msc.dll 0x0000000062360000 0x00010000
-jvmfwk3.dll 0x0000000062330000 0x00020000
-ldapbe2.uno.dll 0x0000000062300000 0x00020000
-legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
-libcurl.dll 0x0000000062290000 0x00030000
-libdb47.dll 0x00000000621f0000 0x00090000
-libeay32.dll 0x00000000620d0000 0x00110000
-libexslt.dll 0x00000000620a0000 0x00020000
-librdf.dll 0x0000000062070000 0x00020000
-libtextcat.dll 0x0000000062050000 0x00010000
-libxml2.dll 0x0000000061f50000 0x000f0000
-libxmlsec-mscrypto.dll 0x0000000061f10000 0x00030000
-libxmlsec.dll 0x0000000061eb0000 0x00050000
-libxslt.dll 0x0000000061e70000 0x00030000
-lngpckinsthlp.dll 0x0000000061cc0000 0x00040000
-lnthmi.dll 0x0000000061c90000 0x00020000
-localebe1.uno.dll 0x0000000061c70000 0x00010000
-localedata_en.dll 0x0000000061c40000 0x00020000
-localedata_es.dll 0x0000000061c10000 0x00020000
-localedata_euro.dll 0x0000000061b60000 0x000a0000
-localedata_others.dll 0x0000000061aa0000 0x000b0000
-logmi.dll 0x0000000061a70000 0x00020000
-lpsolve55.dll 0x0000000061970000 0x00070000
-mcnttype.dll 0x0000000061950000 0x00010000
-mozab2.dll 0x0000000061900000 0x00020000
-mozabdrv2.dll 0x0000000061880000 0x00070000
-msci_uno.dll 0x0000000061860000 0x00010000
-mysql2.dll 0x0000000061820000 0x00030000
-namingservice.uno.dll 0x0000000061800000 0x00010000
-npsoplugin.dll 0x00000000617e0000 0x00010000
-npsoplugin_so.dll 0x00000000617c0000 0x00010000
-nullcanvas.uno.dll 0x0000000061770000 0x00040000
-odbc2.dll 0x0000000061750000 0x00010000
-odbcbase2.dll 0x0000000061690000 0x000b0000
-offaccmi.dll 0x0000000061670000 0x00010000
-officebean.dll 0x0000000061650000 0x00010000
-oleautobridge.uno.dll 0x00000000615f0000 0x00050000
-oleautobridge2.uno.dll 0x0000000061590000 0x00050000
-onlinecheck.dll 0x0000000061570000 0x00010000
-ooofilt.dll 0x0000000061530000 0x00030000
-ooofiltproxy.dll 0x0000000061500000 0x00020000
-oooimprovecoremi.dll 0x00000000614e0000 0x00010000
-ooxmi.dll 0x0000000061190000 0x00340000
-ooxml.dll 0x0000000060f20000 0x00260000
-package2.dll 0x0000000060ec0000 0x00050000
-passwordcontainer.uno.dll 0x0000000060e90000 0x00020000
-patchmsi.dll 0x0000000060e30000 0x00050000
-pcrmi.dll 0x0000000060d40000 0x000e0000
-pdffiltermi.dll 0x0000000060d00000 0x00030000
-pdfimport.uno.dll 0x0000000060bf0000 0x000a0000
-placewaremi.dll 0x0000000060bd0000 0x00010000
-plmi.dll 0x0000000060b90000 0x00030000
-pptimportermi.dll 0x0000000060b70000 0x00010000
-preloadmi.dll 0x0000000060b40000 0x00020000
-productregistration.uno.dll 0x0000000060b20000 0x00010000
-protocolhandlermi.dll 0x0000000060b00000 0x00010000
-proxyfac.uno.dll 0x0000000060ae0000 0x00010000
-purpenvhelper3msc.dll 0x0000000060ac0000 0x00010000
-python23.dll 0x00000000609b0000 0x00100000
-pythonloader.uno.dll 0x0000000060990000 0x00010000
-pyuno.dll 0x0000000060930000 0x00050000
-qslnkmsi.dll 0x00000000608e0000 0x00040000
-raptor.dll 0x0000000060880000 0x00050000
-rasqal.dll 0x0000000060840000 0x00030000
-reflection.uno.dll 0x0000000060810000 0x00020000
-reg3.dll 0x00000000607e0000 0x00020000
-reg4allmsdoc.dll 0x0000000060790000 0x00040000
-regactivex.dll 0x0000000060710000 0x00020000
-regpatchactivex.dll 0x0000000060690000 0x00020000
-relnotes.dll 0x0000000060660000 0x00020000
-remotebridge.uno.dll 0x0000000060640000 0x00010000
-resmi.dll 0x0000000060610000 0x00020000
-resourcemodel.dll 0x0000000060580000 0x00080000
-rmcxt3.dll 0x00000000604f0000 0x00010000
-rotmi.dll 0x00000000604d0000 0x00010000
-rptmi.dll 0x0000000060400000 0x000c0000
-rptuimi.dll 0x0000000060320000 0x000d0000
-rptxmlmi.dll 0x00000000602c0000 0x00050000
-sal3.dll 0x0000000060100000 0x001b0000
-salhelper3msc.dll 0x00000000600e0000 0x00010000
-sax.uno.dll 0x00000000600a0000 0x00030000
-saxmi.dll 0x0000000060080000 0x00010000
-sbmi.dll 0x000000005ff20000 0x00150000
-scdmi.dll 0x000000005ff00000 0x00010000
-scmi.dll 0x000000005f820000 0x006d0000
-scnmi.dll 0x000000005f800000 0x00010000
-scriptframe.dll 0x000000005f7c0000 0x00030000
-scuimi.dll 0x000000005f760000 0x00050000
-sdbc2.dll 0x000000005f730000 0x00020000
-sdbtmi.dll 0x000000005f700000 0x00020000
-sddmi.dll 0x000000005f6e0000 0x00010000
-sdmi.dll 0x000000005f2a0000 0x00430000
-sdqsmsi.dll 0x000000005f250000 0x00040000
-sduimi.dll 0x000000005f1d0000 0x00070000
-sfxmi.dll 0x000000005eed0000 0x002f0000
-shlxthdl.dll 0x000000005ee60000 0x00060000
-shlxtmsi.dll 0x000000005ee00000 0x00050000
-simplecanvas.uno.dll 0x000000005ede0000 0x00010000
-simplecmmi.dll 0x000000005edc0000 0x00010000
-slideshow.uno.dll 0x000000005ec60000 0x00150000
-slideshowtestmi.dll 0x000000005e8b0000 0x003a0000
-smdmi.dll 0x000000005e890000 0x00010000
-smmi.dll 0x000000005e7f0000 0x00090000
-smplmail.uno.dll 0x000000005e7d0000 0x00010000
-sn_tools.dll 0x000000005e7a0000 0x00020000
-so_activex.dll 0x000000005e770000 0x00020000
-socomp.dll 0x000000005e750000 0x00010000
-sofficeapp.dll 0x000000005e6e0000 0x00060000
-soldepmi.dll 0x000000005e6a0000 0x00030000
-solvermi.dll 0x000000005e680000 0x00010000
-sotmi.dll 0x000000005e620000 0x00050000
-spellmi.dll 0x000000005e5e0000 0x00030000
-splmi.dll 0x000000005e5a0000 0x00030000
-srtrs1.dll 0x000000005e570000 0x00020000
-ssleay32.dll 0x000000005e520000 0x00040000
-stlport_vc7145.dll 0x000000005e470000 0x000a0000
-stlport_vc71_stldebug45.dll 0x000000005e340000 0x00120000
-stocservices.uno.dll 0x000000005e310000 0x00020000
-store3.dll 0x000000005e2e0000 0x00020000
-streams.uno.dll 0x000000005e2b0000 0x00020000
-stringresourcemi.uno.dll 0x000000005e280000 0x00020000
-stsmi.dll 0x000000005e1f0000 0x00080000
-sunjavaplugin.dll 0x000000005e1c0000 0x00020000
-svgfiltermi.dll 0x000000005e190000 0x00020000
-svgmi.dll 0x000000005e160000 0x00020000
-svlmi.dll 0x000000005e090000 0x000c0000
-svtmi.dll 0x000000005ddc0000 0x002c0000
-svtmisc.uno.dll 0x000000005dd90000 0x00020000
-svxmi.dll 0x000000005d4c0000 0x008c0000
-swdmi.dll 0x000000005d490000 0x00020000
-swmi.dll 0x000000005cd00000 0x00780000
-swuimi.dll 0x000000005cbc0000 0x00130000
-sysdtrans.dll 0x000000005cb90000 0x00020000
-sysmgr1.uno.dll 0x000000005cb70000 0x00010000
-syssh.uno.dll 0x000000005cb50000 0x00010000
-t602filtermi.dll 0x000000005cb20000 0x00020000
-textconv_dict.dll 0x000000005c9e0000 0x00040000
-textconversiondlgsmi.dll 0x000000005c9b0000 0x00020000
-textinstream.uno.dll 0x000000005c990000 0x00010000
-textoutstream.uno.dll 0x000000005c970000 0x00010000
-tfumi.dll 0x000000005c950000 0x00010000
-tkmi.dll 0x000000005c7c0000 0x00180000
-tlmi.dll 0x000000005c730000 0x00080000
-tvhlp1.dll 0x000000005c6f0000 0x00030000
-ucb1.dll 0x000000005c6a0000 0x00040000
-ucbhelper4msc.dll 0x000000005c630000 0x00060000
-ucpchelp1.dll 0x000000005c5e0000 0x00040000
-ucpdav1.dll 0x000000005c570000 0x00060000
-ucpexpand1.uno.dll 0x000000005c550000 0x00010000
-ucpfile1.dll 0x000000005c500000 0x00040000
-ucpftp1.dll 0x000000005c4c0000 0x00030000
-ucphier1.dll 0x000000005c480000 0x00030000
-ucppkg1.dll 0x000000005c440000 0x00030000
-ucptdoc1.uno.dll 0x000000005c3f0000 0x00040000
-udlgmi.dll 0x000000005c3d0000 0x00010000
-unopkgapp.dll 0x000000005c3a0000 0x00020000
-unordfmi.dll 0x000000005c360000 0x00030000
-unowinreg.dll 0x000000005c340000 0x00010000
-unoxmlmi.dll 0x000000005c2e0000 0x00050000
-unsafe_uno_uno.dll 0x000000005c2c0000 0x00010000
-updatefeed.uno.dll 0x000000005c290000 0x00020000
-updchk.uno.dll 0x000000005c250000 0x00030000
-updchkmi.dll 0x000000005c230000 0x00010000
-urp_uno.dll 0x000000005c200000 0x00020000
-utlmi.dll 0x000000005c170000 0x00080000
-uuimi.dll 0x000000005c130000 0x00030000
-uuresolver.uno.dll 0x000000005c110000 0x00010000
-uwinapi.dll 0x000000005c0e0000 0x00020000
-vbaobjmi.uno.dll 0x000000005bfd0000 0x00100000
-vclcanvas.uno.dll 0x000000005bf50000 0x00070000
-vclmi.dll 0x000000005bc50000 0x002f0000
-vos3msc.dll 0x000000005bc20000 0x00020000
-wininetbe1.uno.dll 0x000000005bc00000 0x00010000
-writerfilter.uno.dll 0x000000005bb30000 0x00010000
-writerfiltermi.dll 0x000000005b760000 0x003c0000
-xcrmi.dll 0x000000005b6c0000 0x00090000
-xmergesync.dll 0x000000005b690000 0x00020000
-xmlfami.dll 0x000000005b670000 0x00010000
-xmlfdmi.dll 0x000000005b650000 0x00010000
-xmlsecurity.dll 0x000000005b600000 0x00040000
-xmxmi.dll 0x000000005b5e0000 0x00010000
-xofmi.dll 0x000000005b580000 0x00050000
-xomi.dll 0x000000005b2b0000 0x002c0000
-xsec_fw.dll 0x000000005b280000 0x00020000
-xsec_xmlsec.dll 0x000000005b250000 0x00020000
-xsltdlgmi.dll 0x000000005b200000 0x00040000
-xsltfiltermi.dll 0x000000005b1e0000 0x00010000
-xstor.dll 0x000000005b190000 0x00040000
-npsoplugin.dll 0x000000005b0b0000 0x00010000
-migrationoo2.uno.dll 0x000000005b080000 0x00020000
-inprocserv.dll 0x000000005b060000 0x00010000
-lngmi.dll 0x000000005af50000 0x00100000
+abpmi.dll 0x0000000067fd0000 0x00020000
+acceptor.uno.dll 0x0000000067fb0000 0x00010000
+accmi.dll 0x0000000067f00000 0x000a0000
+adabasmi.dll 0x0000000067e90000 0x00060000
+adabasuimi.dll 0x0000000067e60000 0x00020000
+ado2.dll 0x0000000067dd0000 0x00080000
+affine_uno_uno.dll 0x0000000067db0000 0x00010000
+aggmi.dll 0x0000000067d70000 0x00030000
+analysismi.dll 0x0000000067d20000 0x00040000
+animcore.dll 0x0000000067cf0000 0x00020000
+avmediami.dll 0x0000000067ca0000 0x00040000
+avmediawin.dll 0x0000000067c70000 0x00020000
+basctlmi.dll 0x0000000067ba0000 0x000c0000
+basebmpmi.dll 0x00000000678a0000 0x002f0000
+basegfxmi.dll 0x0000000067820000 0x00070000
+basprovmi.uno.dll 0x00000000677f0000 0x00020000
+behelper.uno.dll 0x00000000677a0000 0x00010000
+bf_frmmi.dll 0x00000000676b0000 0x000e0000
+bf_gomi.dll 0x0000000067680000 0x00020000
+bf_migratefiltermi.dll 0x0000000067660000 0x00010000
+bf_ofami.dll 0x0000000067640000 0x00010000
+bf_sbmi.dll 0x00000000675b0000 0x00080000
+bf_schmi.dll 0x0000000067500000 0x000a0000
+bf_scmi.dll 0x00000000672a0000 0x00250000
+bf_sdmi.dll 0x00000000671f0000 0x000a0000
+bf_smmi.dll 0x0000000067190000 0x00050000
+bf_somi.dll 0x00000000670f0000 0x00090000
+bf_svtmi.dll 0x0000000066f30000 0x001b0000
+bf_svxmi.dll 0x0000000066b50000 0x003d0000
+bf_swmi.dll 0x00000000668b0000 0x00290000
+bf_wrappermi.dll 0x0000000066880000 0x00020000
+bf_xomi.dll 0x0000000066480000 0x003f0000
+bibmi.dll 0x0000000066430000 0x00040000
+bindetmi.dll 0x0000000066410000 0x00010000
+bootstrap.uno.dll 0x0000000066380000 0x00080000
+bootstrpdtmi.dll 0x0000000066350000 0x00020000
+bridgefac.uno.dll 0x0000000066330000 0x00010000
+cached1.dll 0x00000000662b0000 0x00030000
+calcmi.dll 0x0000000066260000 0x00040000
+canvasfactory.uno.dll 0x0000000066240000 0x00010000
+canvastoolsmi.dll 0x00000000661b0000 0x00080000
+chartcontrollermi.dll 0x0000000066030000 0x00170000
+chartmodelmi.dll 0x0000000065f70000 0x000b0000
+charttoolsmi.dll 0x0000000065dd0000 0x00190000
+chartviewmi.dll 0x0000000065c60000 0x00160000
+cli_uno.dll 0x0000000065c20000 0x00030000
+collator_data.dll 0x0000000065aa0000 0x00170000
+communimi.dll 0x0000000065a80000 0x00010000
+comphelp4msc.dll 0x0000000065980000 0x000f0000
+configmgr2.uno.dll 0x0000000065800000 0x00170000
+connector.uno.dll 0x00000000657e0000 0x00010000
+cppcanvasmi.dll 0x0000000065780000 0x00050000
+cppu3.dll 0x0000000065740000 0x00030000
+cppuhelper3msc.dll 0x00000000656c0000 0x00070000
+ctlmi.dll 0x0000000065680000 0x00030000
+cuimi.dll 0x00000000654a0000 0x001d0000
+datemi.dll 0x0000000065470000 0x00020000
+dbacfgmi.dll 0x0000000065440000 0x00020000
+dbami.dll 0x00000000652e0000 0x00150000
+dbasemi.dll 0x0000000065280000 0x00050000
+dbaxmlmi.dll 0x0000000065230000 0x00040000
+dbmmmi.dll 0x0000000065200000 0x00020000
+dbpmi.dll 0x00000000651c0000 0x00030000
+dbpool2.dll 0x0000000065190000 0x00020000
+dbtoolsmi.dll 0x0000000064f60000 0x00220000
+dbumi.dll 0x0000000064ce0000 0x00270000
+deploymentguimi.uno.dll 0x0000000064c60000 0x00070000
+deploymentmi.uno.dll 0x0000000064be0000 0x00070000
+deploymentmiscmi.dll 0x0000000064bb0000 0x00020000
+dfami.dll 0x0000000064b40000 0x00010000
+dict_ja.dll 0x0000000064a20000 0x00110000
+dict_zh.dll 0x00000000647e0000 0x00230000
+directx5canvas.uno.dll 0x0000000064760000 0x00070000
+directx9canvas.uno.dll 0x00000000646e0000 0x00070000
+dlgprovmi.uno.dll 0x00000000646b0000 0x00020000
+dnd.dll 0x0000000064680000 0x00020000
+doctok.dll 0x00000000645c0000 0x000b0000
+dtrans.dll 0x00000000645a0000 0x00010000
+dynamicloader.uno.dll 0x0000000064570000 0x00020000
+egimi.dll 0x0000000064550000 0x00010000
+embobj.dll 0x00000000644d0000 0x00070000
+emboleobj.dll 0x0000000064480000 0x00040000
+ememi.dll 0x0000000064460000 0x00010000
+empmi.dll 0x0000000064410000 0x00040000
+emsermi.dll 0x00000000643d0000 0x00030000
+epbmi.dll 0x00000000643b0000 0x00010000
+epgmi.dll 0x0000000064390000 0x00010000
+eppmi.dll 0x0000000064370000 0x00010000
+epsmi.dll 0x0000000064340000 0x00020000
+eptmi.dll 0x0000000064320000 0x00010000
+erami.dll 0x0000000064300000 0x00010000
+etimi.dll 0x00000000642e0000 0x00010000
+evtatt.dll 0x00000000642c0000 0x00010000
+expmi.dll 0x0000000064280000 0x00010000
+fastsax.uno.dll 0x0000000064240000 0x00030000
+fileacc.dll 0x0000000064220000 0x00010000
+filemi.dll 0x0000000064140000 0x000d0000
+filterconfig1.dll 0x00000000640f0000 0x00040000
+filtertracermi.dll 0x00000000640d0000 0x00010000
+flashmi.dll 0x0000000064090000 0x00030000
+flatmi.dll 0x0000000064040000 0x00040000
+fop.dll 0x0000000064020000 0x00010000
+fpicker.uno.dll 0x0000000064000000 0x00010000
+fps.dll 0x0000000063fc0000 0x00030000
+fps_office.uno.dll 0x0000000063f70000 0x00040000
+frmmi.dll 0x0000000063dd0000 0x00190000
+fsstorage.uno.dll 0x0000000063da0000 0x00020000
+ftransl.dll 0x0000000063d80000 0x00010000
+fwemi.dll 0x0000000063c90000 0x000e0000
+fwimi.dll 0x0000000063c30000 0x00050000
+fwkmi.dll 0x0000000063a50000 0x001d0000
+fwlmi.dll 0x0000000063a20000 0x00020000
+fwmmi.dll 0x00000000639f0000 0x00020000
+gdipluscanvas.uno.dll 0x0000000063980000 0x00060000
+gomi.dll 0x00000000638b0000 0x00060000
+guesslangmi.dll 0x0000000063890000 0x00010000
+hatchwindowfactory.uno.dll 0x0000000063860000 0x00020000
+helplinkermi.dll 0x0000000063820000 0x00030000
+hsqldb2.dll 0x00000000637d0000 0x00040000
+hwp.dll 0x0000000063740000 0x00080000
+hyphenmi.dll 0x0000000063710000 0x00020000
+i18nisolang1msc.dll 0x00000000636f0000 0x00010000
+i18npool.uno.dll 0x00000000635b0000 0x00130000
+i18nregexpmsc.dll 0x0000000063590000 0x00010000
+i18nsearch.uno.dll 0x0000000063570000 0x00010000
+i18nutilmsc.dll 0x0000000063540000 0x00020000
+icdmi.dll 0x0000000063520000 0x00010000
+icgmi.dll 0x00000000634f0000 0x00020000
+icudt36l.dll 0x0000000062b00000 0x009c0000
+icuin36.dll 0x0000000062a20000 0x000d0000
+icule36.dll 0x00000000629d0000 0x00040000
+icutu36.dll 0x00000000629a0000 0x00020000
+icuuc36.dll 0x00000000628b0000 0x000e0000
+idxmi.dll 0x0000000062880000 0x00020000
+imemi.dll 0x0000000062860000 0x00010000
+index_data.dll 0x00000000627c0000 0x00090000
+instooofiltmsi.dll 0x0000000062790000 0x00020000
+introspection.uno.dll 0x0000000062760000 0x00020000
+invocadapt.uno.dll 0x0000000062740000 0x00010000
+invocation.uno.dll 0x0000000062720000 0x00010000
+ipbmi.dll 0x0000000062700000 0x00010000
+ipdmi.dll 0x00000000626e0000 0x00010000
+ipsmi.dll 0x00000000626c0000 0x00010000
+iptmi.dll 0x00000000626a0000 0x00010000
+ipxmi.dll 0x0000000062680000 0x00010000
+irami.dll 0x0000000062660000 0x00010000
+itgmi.dll 0x0000000062640000 0x00010000
+itimi.dll 0x0000000062620000 0x00010000
+java_uno.dll 0x00000000625f0000 0x00020000
+java_uno_accessbridge.dll 0x00000000625d0000 0x00010000
+javaloader.uno.dll 0x00000000625b0000 0x00010000
+javavm.uno.dll 0x0000000062580000 0x00020000
+jdbc2.dll 0x0000000062510000 0x00060000
+jfregca.dll 0x00000000624d0000 0x00030000
+jmi_g.dll 0x00000000624b0000 0x00010000
+jpipe.dll 0x0000000062490000 0x00010000
+juh.dll 0x00000000623b0000 0x00010000
+juhx.dll 0x0000000062380000 0x00020000
+jvmaccess3msc.dll 0x0000000062360000 0x00010000
+jvmfwk3.dll 0x0000000062330000 0x00020000
+ldapbe2.uno.dll 0x0000000062300000 0x00020000
+legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
+libcurl.dll 0x0000000062290000 0x00030000
+libdb47.dll 0x00000000621f0000 0x00090000
+libeay32.dll 0x00000000620d0000 0x00110000
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list