[Libreoffice-commits] .: 31 commits - postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/rebase
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri May 27 12:20:01 PDT 2011
postprocess/packcomponents/makefile.mk | 4 ++--
postprocess/packregistry/makefile.mk | 7 +++++--
postprocess/prj/build.lst | 2 +-
postprocess/rebase/coffbase.txt | 1 -
4 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 40723c4361fd3e64075c888e6536d176b453bf58
Merge: cf66ba0... ffd56d2...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:47:36 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
postprocess/prj/build.lst
diff --cc postprocess/packcomponents/makefile.mk
index 0cef8d0,6b58179..0a43937
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -98,11 -85,8 +98,12 @@@ my_components =
component/sw/util/swd \
component/sw/util/vbaswobj \
component/toolkit/util/tk \
+ component/unotools/util/utl \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
+ component/vbahelper/util/msforms \
++ component/vcl/vcl \
+ component/writerfilter/util/writerfilter \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
configmgr \
@@@ -175,9 -177,9 +176,8 @@@
updatefeed \
updchk \
updchk.uno \
- utl \
uui \
vbaevents \
- vcl \
vclcanvas \
wpft \
wpgfilter \
@@@ -196,7 -195,17 +196,7 @@@ my_components += pythonloade
.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
my_components += splash
.ENDIF
-
+
-.IF "$(OS)" == "MACOSX"
-my_components += component/vcl/vcl.macosx
-.ELSE
-.IF "$(OS)" == "WNT"
-my_components += component/vcl/vcl.windows
-.ELSE
-my_components += component/vcl/vcl.unx
-.ENDIF
-.ENDIF
-
.IF "$(BUILD_SPECIAL)" != ""
my_components += oooimprovement
.END
diff --cc postprocess/prj/build.lst
index 48dc474,015b1da..f249876
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep CT2N:ct2n cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io librsvg 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 PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt NULL
++po postprocess :: accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native slideshow starmath sw sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build 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 ffd56d259a626afbebf462e6cd39ab76f7eafad9
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue May 24 09:11:26 2011 +0200
Post-merge fix - remove dupe vbaobj entry
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6611ac4..6b58179 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -180,7 +180,6 @@ my_components = \
utl \
uui \
vbaevents \
- vbaobj \
vclcanvas \
wpft \
wpgfilter \
commit f0b0fb447e9b19db19ccad1982af11e9571f3ebc
Merge: 8a18762... 0ba16aa...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 22 15:09:57 2011 +0200
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
postprocess/packcomponents/makefile.mk
postprocess/prj/build.lst
diff --cc postprocess/packcomponents/makefile.mk
index 0f97b77,e6bd27b..6611ac4
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -180,10 -171,9 +180,10 @@@ my_components =
utl \
uui \
vbaevents \
- vcl \
+ vbaobj \
vclcanvas \
wpft \
+ wpgfilter \
writerfilter \
xcr \
xmlfa \
@@@ -193,9 -183,15 +193,19 @@@
xsltfilter \
xstor
+.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
+my_components += splash
+.ENDIF
++
+ .IF "$(OS)" == "MACOSX"
+ my_components += component/vcl/vcl.macosx
+ .ELSE
+ .IF "$(OS)" == "WNT"
+ my_components += component/vcl/vcl.windows
+ .ELSE
+ my_components += component/vcl/vcl.unx
+ .ENDIF
+ .ENDIF
.IF "$(BUILD_SPECIAL)" != ""
my_components += oooimprovement
diff --cc postprocess/prj/build.lst
index 2079073,555ae33..015b1da
--- 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 CT2N:ct2n cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io 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 PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt 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 librsvg 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 smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
++po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep CT2N:ct2n cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io librsvg 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 PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt 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 8a1876226fd15b0761054960807fbed6ccf9ea73
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 19 18:58:54 2011 +0200
Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit 1742cc3f4b781757ebe9ec698162632544eebb2a
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 11 17:53:05 2011 +0200
Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)
commit e8cbac53b3437ee6b77ff55bd30836cb5b2a8f10
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Apr 8 11:16:13 2011 +0300
chmod -x
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
old mode 100755
new mode 100644
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
old mode 100755
new mode 100644
commit 1f038f261fac0c275a54e0c100169aa192d98aac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Apr 8 11:15:42 2011 +0300
Drop relnotes.dll from here, too, fdo#31023
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 27999d2..199a894 100755
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -224,7 +224,6 @@ 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
commit 0ba16aab92d45223bffd857403e95dcd94be952e
Merge: 715aa8b... 1393c98...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 29 19:12:02 2011 +0200
CWS-TOOLING: integrate CWS ause127
commit 715aa8b390fe6c71feae2eeec3e56a9ee7b264e1
Merge: 751be04... 1996213...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 29 18:14:38 2011 +0200
CWS-TOOLING: integrate CWS rsvglibs
diff --cc postprocess/prj/build.lst
index a3db120,54e0657..555ae33
--- 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 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 smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt 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 librsvg 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 LIBXSLT:libxslt 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 librsvg 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 smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt 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 751be040f6f26b870bed8e3dec3197e1af6abe9a
Merge: c1fd3d4... eabb4a6...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 29 16:29:12 2011 +0200
CWS-TOOLING: integrate CWS vcl2gnumake
diff --cc postprocess/packcomponents/makefile.mk
index 5a5a20a,a0e8d4e..e6bd27b
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -170,9 -170,8 +170,8 @@@ my_components =
updchk.uno \
utl \
uui \
- vbaobj \
vbaevents \
+ vbaobj \
- vcl \
vclcanvas \
wpft \
writerfilter \
commit 199621387ab4ecb212e6824b82309c07dde31fb7
Merge: 1b7a264... 64586ab...
Author: ka <kai.ahrens at oracle.com>
Date: Tue Mar 29 02:04:27 2011 +0200
rsvglibs: rebased to DEV300_m104
commit c1fd3d4ca2d3485ec6de74d4f4f924a7024e4af8
Merge: 1b7a264... d3a137d...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 28 15:37:38 2011 +0200
CWS-TOOLING: integrate CWS dba34d
commit eabb4a605c96d5ff182d9503d840804342e8a9c6
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Fri Mar 25 10:42:31 2011 +0100
vcl2gnumake: add build dependency smoketestdoc
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 20de2ed..a3db120 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 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 LIBXSLT:libxslt 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 smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt 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 8aa2662cf06078fe4665d975e35f790f0a10197f
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Thu Mar 24 16:10:32 2011 +0100
vcl2gnumake: solve a merge problem
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f1626c6..a0e8d4e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -172,7 +172,6 @@ my_components = \
uui \
vbaobj \
vbaevents \
- vcl \
vclcanvas \
wpft \
writerfilter \
commit 7835fc22f4968464039a7c9292143738d117eb83
Merge: 283e1a5... 1b7a264...
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Mar 23 18:06:39 2011 +0100
vcl2gnumake: rebase to DEV300m103
commit 1393c989f05a245485718b4441530b5e2d2925b8
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Wed Mar 23 11:30:01 2011 +0100
ause127: #i117376# filter out files starting with '.' - now quoted
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index a688178..60bb9f3 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -515,14 +515,16 @@ $(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
mkdir $(MISC)/$(@:b).unzip
cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
- $(RM) $(MISC)/$(@:b).list
+ # filter out filenames starting with "."
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
- find $(@:b).unzip -name \*.xcu -size +0c -print) \
+ find $(@:b).unzip -name \[!.\]\*.xcu -size +0c -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
$(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
@@ -540,8 +542,9 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
cd $(MISC)/fcfg_drivers_$*.unzip && \
unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
- $(RM) $(MISC)/$(@:b).list
+ # filter out filenames starting with "."
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
- find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+ find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
$(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
commit d3a137dfad63214512bed06c3d7392682d97b6c5
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 22:47:46 2011 +0100
dba34d: removed a duplicate 'vbaevents' entry
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3dd513c..5a5a20a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -172,7 +172,6 @@ my_components = \
uui \
vbaevents \
vbaobj \
- vbaevents \
vcl \
vclcanvas \
wpft \
commit 7406424200e66db6028a7d14791837d3cfbce20a
Merge: 782a10a... 1b7a264...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 10:01:15 2011 +0100
dba34d: pulled and merged DEV300.m102
commit 782a10a9cea147d24113089179c21e579a8efc22
Merge: 2c63b5a... 7ed3886...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Mar 10 11:12:57 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34c
commit 64586ab15cddd93ec0e58d3404e23105074cf032
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Mar 9 11:59:37 2011 +0100
rsvglibs: updated build dependencies
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 20de2ed..54e0657 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 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 LIBXSLT:libxslt 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 librsvg 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 LIBXSLT:libxslt 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 7ed3886f0020fbee1f56882b6fdec0b49daf86dd
Merge: e948a51... 2c63b5a...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Mar 8 09:56:56 2011 +0100
dba34d: pulled and merged latest changes from CWS dba34c
diff --cc postprocess/packcomponents/makefile.mk
index a156ddb,49fa9e1..c1f9bfd
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -170,8 -170,8 +170,9 @@@ my_components =
updchk.uno \
utl \
uui \
+ vbaevents \
vbaobj \
+ vbaevents \
vcl \
vclcanvas \
wpft \
commit e948a51b2f12ddb38a53c8fd89eb5bc5f43ae627
Merge: 31c2ae8... dd6471e...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Tue Mar 1 08:33:49 2011 +0100
Automated merge with file:///cws/so-cwsserv03/dba34c/DEV300/ooo
commit dd6471e08f25d047554f61921a899bdbe6bfe3e2
Merge: 31c2ae8... 3fe7ec2...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Feb 22 12:02:37 2011 +0100
dba34d: merge
commit 3fe7ec244c138ec0e3b27d292b055e76b31bc212
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 21 09:23:19 2011 +0100
dba34d: #i116995# re-enabled vbaevents lib
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9fbfc70..a156ddb 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -170,6 +170,7 @@ my_components = \
updchk.uno \
utl \
uui \
+ vbaevents \
vbaobj \
vcl \
vclcanvas \
@@ -231,10 +232,6 @@ my_components += ogltrans
my_components += productregistration.jar
.END
-.IF "$(ENABLE_VBA)" == "YES"
-my_components += vbaevents
-.END
-
.IF "$(SOLAR_JAVA)" == "TRUE"
my_components += \
LuceneHelpWrapper \
commit e6ea4d30b1f89eea27b5b041227f29281d7f4cf3
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Sun Feb 20 21:02:38 2011 +0100
dba34d: reverted the previous change. Lib vbaevents is already included in registration when ENABLE_VBA is set, which simply is not the case any more in Oracle-provided builds, since m100.
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 5cd14eb..9fbfc70 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -171,7 +171,6 @@ my_components = \
utl \
uui \
vbaobj \
- vbaevents \
vcl \
vclcanvas \
wpft \
commit 0a32ced9a889a5ca26352742eaf4b0220f472330
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Thu Feb 17 23:46:23 2011 +0100
dba34d: #i116995# also register the vbaevents library
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9fbfc70..5cd14eb 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -171,6 +171,7 @@ my_components = \
utl \
uui \
vbaobj \
+ vbaevents \
vcl \
vclcanvas \
wpft \
commit 959c97d515e216def10095c036cfdca28adccb9a
Merge: d8c970e... 31c2ae8...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Feb 15 10:31:10 2011 +0100
dba34d: pulled and merged CWS dba34c, thus implicitly rebasing to m100
commit 31c2ae80b688a38611f6616f24f5ddc18eab2500
Merge: ac9793c... a4a6e2b...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 14 22:22:46 2011 +0100
dba34c: pulled and merged DEV300.m100
commit 283e1a5f59794dbfde02bb94840168b7b74c9823
Merge: 6973afc... a4a6e2b...
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Mon Feb 14 18:20:23 2011 +0100
rebase to DEV300_m100
commit ac9793cdfe5ff57444cb113bf459519dcaa0996b
Merge: d8c970e... 16abc90...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Feb 3 12:19:25 2011 +0100
merge from master
commit 6973afc0b31605484001d1942ae7e3eff79b5cb7
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Jan 26 19:18:52 2011 +0100
vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos)
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3ca8a15..1a7c314 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -172,7 +172,6 @@ my_components = \
utl \
uui \
vbaobj \
- vcl \
vclcanvas \
wpft \
writerfilter \
@@ -184,6 +183,16 @@ my_components = \
xsltfilter \
xstor
+.IF "$(OS)" == "MACOSX"
+my_components += component/vcl/vcl.macosx
+.ELSE
+.IF "$(OS)" == "WNT"
+my_components += component/vcl/vcl.windows
+.ELSE
+my_components += component/vcl/vcl.unx
+.ENDIF
+.ENDIF
+
.IF "$(BUILD_SPECIAL)" != ""
my_components += oooimprovement
.END
More information about the Libreoffice-commits
mailing list