[Libreoffice-commits] .: Branch 'feature/gnumake4' - 122 commits - .gitignore packimages/pack packimages/prj postprocess/checkdeliver postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/rebase
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Jun 20 01:22:42 PDT 2011
.gitignore | 17 +++++
packimages/pack/image-sort.lst | 1
packimages/pack/makefile.mk | 49 +---------------
packimages/prj/d.lst | 4 -
postprocess/checkdeliver/checkdeliver.pl | 2
postprocess/checkdeliver/makefile.mk | 5 +
postprocess/packcomponents/makefile.mk | 90 ++++++++++++++++---------------
postprocess/packregistry/makefile.mk | 8 --
postprocess/prj/build.lst | 2
postprocess/prj/d.lst | 14 ++--
postprocess/rebase/coffbase.txt | 1
postprocess/rebase/makefile.mk | 6 +-
12 files changed, 89 insertions(+), 110 deletions(-)
New commits:
commit 8a124d2e43e6fe8733f24d635724c4880dc43b44
Merge: 1d371bb... 32e816d...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 10:22:22 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
postprocess/packcomponents/makefile.mk
diff --cc postprocess/packcomponents/makefile.mk
index 26da9dc,9a4eeae..619e335
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -48,20 -48,22 +48,24 @@@ my_components =
bib \
cached1 \
calc \
- chartcontroller \
- chartmodel \
- charttools \
- chartview \
- canvasfactory \
+ component/chart2/source/controller/chartcontroller \
+ component/chart2/source/model/chartmodel \
+ component/chart2/source/tools/charttools \
+ component/chart2/source/view/chartview \
+ component/canvas/source/factory/canvasfactory \
+ component/canvas/source/simplecanvas/simplecanvas \
+ component/canvas/source/vcl/vclcanvas \
component/comphelper/util/comphelp \
- component/dbaccess/source/ext/adabas/adabasui \
- component/dbaccess/source/ext/macromigration/dbmm \
- component/dbaccess/source/filter/xml/dbaxml \
- component/dbaccess/util/dba \
- component/dbaccess/util/dbu \
- component/dbaccess/util/sdbt \
+ component/cui/util/cui \
+ component/dbaccess/source/ext/adabas/adabasui \
+ component/dbaccess/source/ext/macromigration/dbmm \
+ component/dbaccess/source/filter/xml/dbaxml \
+ component/dbaccess/util/dba \
+ component/dbaccess/util/dbu \
+ component/dbaccess/util/sdbt \
+ component/fileaccess/source/fileacc \
+ component/forms/util/frm \
+ component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@@ -90,10 -98,12 +100,13 @@@
component/sw/util/sw \
component/sw/util/swd \
component/sw/util/vbaswobj \
+ component/unotools/util/utl \
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 \
@@@ -110,7 -119,7 +123,6 @@@
dlgprov \
embobj \
evtatt \
- fileacc \
- fastsax \
filterconfig1 \
flash \
flat \
@@@ -139,18 -149,13 +151,11 @@@
placeware \
preload \
protocolhandler \
- pythonloader \
- pythonscript \
res \
- sax \
sb \
- sc \
- scd \
scn \
scriptframe \
- sd \
sdbc2 \
- sdd \
- slideshow \
- simplecanvas \
solver \
spell \
spl \
@@@ -174,8 -179,11 +179,9 @@@
updchk.uno \
uui \
vbaevents \
- vbaobj \
- vclcanvas \
+ visiofilter \
wpft \
+ wpgfilter \
- xcr \
xmlfa \
xmlfd \
xmx \
commit 32e816d2f82270a88eaa813b98360368f10e7b90
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Jun 14 12:14:31 2011 +0200
Some more w4w mentions gone
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 4c060bc..50a5097 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -53,7 +53,6 @@ MY_XCDS = \
$(MISC)/pocketexcel.xcd \
$(MISC)/pocketword.xcd \
$(MISC)/pyuno.xcd \
- $(MISC)/w4w.xcd \
$(MISC)/writer.xcd \
$(MISC)/xsltfilter.xcd
@@ -392,11 +391,6 @@ 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 \
commit 9e3ede08de8af404d250d232be0d134925a2a1d8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jun 14 00:15:40 2011 +0100
gbuildize hwpfilter
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 746aea0..9a4eeae 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -67,6 +67,7 @@ my_components = \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
+ component/hwpfilter/source/hwp \
component/lotuswordpro/util/lwpfilter \
component/oox/util/oox \
component/reportdesign/util/rpt \
@@ -125,7 +126,6 @@ my_components = \
fpicker \
fps_office \
guesslang \
- hwp \
hyphen \
i18npool \
i18nsearch \
commit 2271d6ccf9f33c6031f5e903fc2bd84e8c6d7ad6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 13 22:01:28 2011 +0100
move lotuswordpro requirement from sw to postprocess
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 0d0a009..b17851c 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 LIBRSVG:librsvg 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 configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io LIBRSVG:librsvg lingucomponent lotuswordpro 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 usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit 138a73110a701c9e990fa9aa53e3c982822fcbbc
Author: Radek Doulik <rodo at novell.com>
Date: Fri Jun 10 11:59:27 2011 +0200
added mtfrenderer to the components list
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 68becb8..746aea0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -135,6 +135,7 @@ my_components = \
log \
mcnttype \
migrationoo2 \
+ mtfrenderer \
msfilter \
msworksfilter \
mysql \
commit 486ad8962f2dccca28411c559a2bfdfe3d4e35a8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon Jun 6 21:21:31 2011 +0200
Trying to finally get the visio filter registration right
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0a43937..68becb8 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -179,6 +179,7 @@ my_components = \
uui \
vbaevents \
vclcanvas \
+ visiofilter \
wpft \
wpgfilter \
xcr \
commit 4236a3f14f6b314ce1a7658f623281ce78eb44d4
Merge: d8ab6e8... e6be5b9...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 14:07:02 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
postprocess/packcomponents/makefile.mk
commit d8ab6e8fe57aa0293c3b5e645ed1f41eefb6d4b2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 3 13:27:53 2011 +0300
Drop %_EXT% which was always empty
diff --git a/packimages/prj/d.lst b/packimages/prj/d.lst
index 1f4473e..074a73c 100644
--- a/packimages/prj/d.lst
+++ b/packimages/prj/d.lst
@@ -1,2 +1,2 @@
-mkdir: %COMMON_DEST%\bin%_EXT%
-..\%__SRC%\bin\*.zip %COMMON_DEST%\bin%_EXT%
+mkdir: %COMMON_DEST%\bin
+..\%__SRC%\bin\*.zip %COMMON_DEST%\bin
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 9bfe12b..6038024 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -1,7 +1,7 @@
-mkdir: %_DEST%\xml%_EXT%\ooo
-..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
-..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
-..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
-..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml%_EXT%\ooo\services.rdb
-..\%__SRC%\misc\services.input %_DEST%\xml%_EXT%\services.input
-..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
+mkdir: %_DEST%\xml\ooo
+..\%__SRC%\bin\uiconfig.zip %_DEST%\bin\uiconfig.zip
+..\%__SRC%\misc\*.xcd %_DEST%\xml\
+..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\
+..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml\ooo\services.rdb
+..\%__SRC%\misc\services.input %_DEST%\xml\services.input
+..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb
commit e710e1fb51415b44c7c79499c50a9826c049a8e7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 3 09:30:48 2011 +0100
seperate .xcd for sequence checking languages
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 71ee36d..4c060bc 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -39,6 +39,7 @@ MY_XCDS = \
$(MISC)/calc.xcd \
$(MISC)/cjk.xcd \
$(MISC)/ctl.xcd \
+ $(MISC)/ctlseqcheck.xcd \
$(MISC)/draw.xcd \
$(MISC)/graphicfilter.xcd \
$(MISC)/impress.xcd \
commit 03430475fd920276dde1ea7ceb069c732c7221fe
Merge: 69c410c... 894f121...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 31 14:31:47 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
postprocess/packcomponents/makefile.mk
commit 69c410cca22aaf1ce27d61b1ae17de7d951c0966
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon May 30 13:01:28 2011 -0500
mismerge: do not re-include tail_build's module in postprocess dep list
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index a360dad..0d0a009 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 LIBRSVG: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 :: 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:librsvg 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 usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit bc36a95062876651b4ed7839a0f5a19044ed2ca1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat May 28 05:29:34 2011 -0500
make librsvg a conditional
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index f249876..a360dad 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 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 :: 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: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 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 894f121eef4a9b5403c9b9b2c5f9a0a07fbf9d87
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:14 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
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 cf66ba08752e5f8d3fcc341b9ef43d9ed09d7454
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Fri May 20 19:14:16 2011 +0200
pack commandimages from cmd/
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index 9198aef..ba0c6f4 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -54,7 +54,7 @@ $(SORTED_LIST) : image-sort.lst
$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
@@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH)
- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
+ $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
$(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
commit 90ea94c87639055e8a77b970d3b047f8136a9750
Author: Radek Doulik <rodo at novell.com>
Date: Fri May 20 10:37:50 2011 +0200
add sdfilt component
Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Fridrich Strba <fstrba at novell.com>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1a60d20..82ff84d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -152,6 +152,7 @@ my_components = \
sdbc2 \
sdbt \
sdd \
+ sdfilt \
simplecanvas \
slideshow \
$(SM_COMPONENTS)\
commit e6be5b9a5b025f534b9c4680989128c01d3cee93
Author: Radek Doulik <rodo at novell.com>
Date: Fri May 20 10:37:50 2011 +0200
add sdfilt component
Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Fridrich Strba <fstrba at novell.com>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1a60d20..82ff84d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -152,6 +152,7 @@ my_components = \
sdbc2 \
sdbt \
sdd \
+ sdfilt \
simplecanvas \
slideshow \
$(SM_COMPONENTS)\
commit 469fac8a93c5f49ba135a2a0067fab972ec77fb5
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:39:03 2011 +0300
Add the wntgcc directories
diff --git a/.gitignore b/.gitignore
index 7f27edf..8e2bbde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
/*/unxmac??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/wntgcc?
+/*/wntgcc?.pro
/*/unxios?
/*/unxios?.pro
/*/unxand?
commit da509737534ec2fb4985e934e5bd3a00d26fbc31
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu May 19 00:34:11 2011 +0300
Add the unxios and unxand directories
diff --git a/.gitignore b/.gitignore
index e4b1459..7f27edf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,7 @@
/*/unxmac??.pro
/*/wntmsc???
/*/wntmsc???.pro
+/*/unxios?
+/*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
commit 2f9df7fd356014ff30ff0db20c7f211ef2299258
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:48 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 2fe327299620ccc65ccf1c11a62c4e39a330a47f
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:37 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit 0b1e3f6ada3d155efc8028e86cebf595ba44399e
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:44 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit b41282404c41f2dda6059d9e086fe22c8c1df148
Author: Christian Lippka <cl at lippka.com>
Date: Fri May 6 16:11:59 2011 +0200
New color picker dialog for all applications.
Replaces the old color picker with a new one.
Demo: http://www.youtube.com/watch?v=rPu6EmIxkIM
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 961f24b..0cef8d0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -54,6 +54,7 @@ my_components = \
component/chart2/source/tools/charttools \
component/chart2/source/view/chartview \
component/comphelper/util/comphelp \
+ component/cui/util/cui \
component/dbaccess/source/ext/adabas/adabasui \
component/dbaccess/source/ext/macromigration/dbmm \
component/dbaccess/source/filter/xml/dbaxml \
commit f3de22e2b4df1114aaed7ca8fa33af968bb893ea
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:38 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit cad9f047f89e8c81972b554fe404ed0580f36bc4
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Apr 30 07:57:29 2011 -0700
Ignore .gitattributes
diff --git a/.gitignore b/.gitignore
index c95eec7..e4b1459 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# backup and temporary files
*~
.*.sw[op]
+.gitattributes
# the build directories
/*/unxlng??
commit 4798ebf0f7eb0ae8ca881d5faa752f23288f87be
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Apr 28 01:51:13 2011 +0200
Revert "add gbuild component files from dbaccess"
This reverts commit d93cc6749507b6c33307a77ba9939145d8008dca.
(botched rebase of feature branch)
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f44a5f2..961f24b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -38,14 +38,7 @@ PKGCONFIG_MODULES=gtk+-2.0
GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
-.IF "$(USE_GMAKE)" != "1"
-SM_COMPONENTS:=sm smd
-.ELSE
-SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
-.END
-
my_components = \
- $(SM_COMPONENTS)\
abp \
analysis \
animcore \
@@ -69,17 +62,27 @@ my_components = \
component/dbaccess/util/sdbt \
component/fileaccess/source/fileacc \
component/forms/util/frm \
+ component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
component/lotuswordpro/util/lwpfilter \
component/oox/util/oox \
+ component/reportdesign/util/rpt \
+ component/reportdesign/util/rptui \
+ component/reportdesign/util/rptxml \
component/sc/util/sc \
component/sc/util/scd \
component/sc/util/scfilt \
component/sc/util/vbaobj \
+ component/sd/util/sd \
+ component/sd/util/sdd \
+ component/sd/util/sdfilt \
component/sfx2/util/sfx \
+ component/slideshow/util/slideshow \
component/sot/util/sot \
+ component/starmath/util/sm \
+ component/starmath/util/smd \
component/svl/source/fsstor/fsstorage \
component/svl/source/passwordcontainer/passwordcontainer \
component/svl/util/svl \
@@ -117,7 +120,6 @@ my_components = \
filterconfig1 \
flash \
flat \
- for \
fpicker \
fps_office \
guesslang \
@@ -144,21 +146,13 @@ my_components = \
placeware \
preload \
protocolhandler \
- pythonloader \
res \
sax \
sb \
scn \
scriptframe \
- sd \
sdbc2 \
-<<<<<<< HEAD
simplecanvas \
-=======
- sdd \
- simplecanvas \
- slideshow \
->>>>>>> add gbuild component files from dbaccess
solver \
spell \
spl \
@@ -194,6 +188,10 @@ my_components = \
xsltfilter \
xstor
+.IF "$(DISABLE_PYTHON)" != "TRUE"
+my_components += pythonloader
+.ENDIF
+
.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
my_components += splash
.ENDIF
@@ -239,7 +237,7 @@ my_components += kde4be1
.END
.IF "$(ENABLE_OGL)" == "TRUE"
-my_components += ogltrans
+my_components += component/slideshow/source/engine/OGLTrans/ogltrans
.END
.IF "$(ENABLE_SVCTAGS)" == "YES"
commit d93cc6749507b6c33307a77ba9939145d8008dca
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Apr 27 16:18:43 2011 +0200
add gbuild component files from dbaccess
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 961f24b..f44a5f2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -38,7 +38,14 @@ PKGCONFIG_MODULES=gtk+-2.0
GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
+.IF "$(USE_GMAKE)" != "1"
+SM_COMPONENTS:=sm smd
+.ELSE
+SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
+.END
+
my_components = \
+ $(SM_COMPONENTS)\
abp \
analysis \
animcore \
@@ -62,27 +69,17 @@ my_components = \
component/dbaccess/util/sdbt \
component/fileaccess/source/fileacc \
component/forms/util/frm \
- component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
component/lotuswordpro/util/lwpfilter \
component/oox/util/oox \
- component/reportdesign/util/rpt \
- component/reportdesign/util/rptui \
- component/reportdesign/util/rptxml \
component/sc/util/sc \
component/sc/util/scd \
component/sc/util/scfilt \
component/sc/util/vbaobj \
- component/sd/util/sd \
- component/sd/util/sdd \
- component/sd/util/sdfilt \
component/sfx2/util/sfx \
- component/slideshow/util/slideshow \
component/sot/util/sot \
- component/starmath/util/sm \
- component/starmath/util/smd \
component/svl/source/fsstor/fsstorage \
component/svl/source/passwordcontainer/passwordcontainer \
component/svl/util/svl \
@@ -120,6 +117,7 @@ my_components = \
filterconfig1 \
flash \
flat \
+ for \
fpicker \
fps_office \
guesslang \
@@ -146,13 +144,21 @@ my_components = \
placeware \
preload \
protocolhandler \
+ pythonloader \
res \
sax \
sb \
scn \
scriptframe \
+ sd \
sdbc2 \
+<<<<<<< HEAD
simplecanvas \
+=======
+ sdd \
+ simplecanvas \
+ slideshow \
+>>>>>>> add gbuild component files from dbaccess
solver \
spell \
spl \
@@ -188,10 +194,6 @@ my_components = \
xsltfilter \
xstor
-.IF "$(DISABLE_PYTHON)" != "TRUE"
-my_components += pythonloader
-.ENDIF
-
.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
my_components += splash
.ENDIF
@@ -237,7 +239,7 @@ my_components += kde4be1
.END
.IF "$(ENABLE_OGL)" == "TRUE"
-my_components += component/slideshow/source/engine/OGLTrans/ogltrans
+my_components += ogltrans
.END
.IF "$(ENABLE_SVCTAGS)" == "YES"
commit ebc60a110fb0522fd2295063ef6417df1237be68
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 27 08:06:52 2011 +0200
add fileaccess to tail build
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 2cbfe27..48dc474 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 fileaccess 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 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 usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit 9417743e7a64cb7dd088f541debe0c7b62eefcb0
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 27 08:04:33 2011 +0200
add padmin to tail build
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 66f1176..2cbfe27 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin 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 configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess 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 usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit 69a40f8fa4a10a2da6d29568d1ae5caaca14ca7f
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 27 08:00:54 2011 +0200
add unoxml to tail build
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 46e51e4..66f1176 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls unoxml 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 configmgr CRASHREP:crashrep CT2N:ct2n 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 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 usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit c18afa1df03e001bd70e73762cd742ffd00b37be
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:16 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
commit e9e01f3bb18eefe011df3a1c14a62e55bec055a8
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Mon Apr 25 22:05:31 2011 +0200
Update '--disable-python' to disable only Python UNO API.
* postprocess/packcomponents/makefile.mk:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0f97b77..1a60d20 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -140,7 +140,6 @@ my_components = \
placeware \
preload \
protocolhandler \
- pythonloader \
res \
rpt \
rptui \
@@ -193,6 +192,10 @@ my_components = \
xsltfilter \
xstor
+.IF "$(DISABLE_PYTHON)" != "TRUE"
+my_components += pythonloader
+.ENDIF
+
.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
my_components += splash
.ENDIF
commit 2bea93918424924dd609b0be85b31902e44324aa
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Mon Apr 25 21:51:49 2011 +0200
Update '--disable-python' to disable only Python UNO API.
* postprocess/packcomponents/makefile.mk:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f8cdc75..961f24b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -146,7 +146,6 @@ my_components = \
placeware \
preload \
protocolhandler \
- pythonloader \
res \
sax \
sb \
@@ -189,6 +188,10 @@ my_components = \
xsltfilter \
xstor
+.IF "$(DISABLE_PYTHON)" != "TRUE"
+my_components += pythonloader
+.ENDIF
+
.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
my_components += splash
.ENDIF
commit 66d93fe8fa96a0d4392b52246828fc68d1eaa1f7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Apr 24 16:10:25 2011 -0500
reportdesign is included in tail_build, remove it from postprocess dep
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 28486f0..46e51e4 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -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 fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges scaddins sccomp scp2 scripting setup_native 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 oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n 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 scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls unoxml 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 7a8589ec6ae6712487be97d84b0d29a2526e6867
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Apr 23 20:56:45 2011 -0500
use tail_build to build 'late' gbuild enabled modules
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 2079073..28486f0 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 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 configmgr CRASHREP:crashrep CT2N:ct2n 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 scaddins sccomp scp2 scripting setup_native 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 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 7dfca23a3a360cbdfc76a3abff57cfac5f0dd0ce
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Apr 23 20:54:40 2011 -0500
ignore mac local build files
diff --git a/.gitignore b/.gitignore
index 4890e11..c95eec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
# the build directories
/*/unxlng??
/*/unxlng??.pro
+/*/unxmac??.pro
/*/wntmsc???
/*/wntmsc???.pro
commit 8e49f7537697981bd4f35071d6566343315cfeb5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Apr 23 20:52:35 2011 -0500
starmath is built by gbuild now
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9e8966f..f8cdc75 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -38,12 +38,6 @@ PKGCONFIG_MODULES=gtk+-2.0
GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
-.IF "$(USE_GMAKE)" != "1"
-SM_COMPONENTS:=sm smd
-.ELSE
-SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
-.END
-
my_components = \
abp \
analysis \
@@ -87,6 +81,8 @@ my_components = \
component/sfx2/util/sfx \
component/slideshow/util/slideshow \
component/sot/util/sot \
+ component/starmath/util/sm \
+ component/starmath/util/smd \
component/svl/source/fsstor/fsstorage \
component/svl/source/passwordcontainer/passwordcontainer \
component/svl/util/svl \
@@ -158,7 +154,6 @@ my_components = \
scriptframe \
sdbc2 \
simplecanvas \
- $(SM_COMPONENTS)\
solver \
spell \
spl \
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 b0ff8d5b8333b705ed39fa321e7b7887714fed3e
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 14:50:19 2011 +0200
gbuildize reportdesign
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index b8dd55a..9e8966f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -74,6 +74,9 @@ my_components = \
component/framework/util/fwm \
component/lotuswordpro/util/lwpfilter \
component/oox/util/oox \
+ component/reportdesign/util/rpt \
+ component/reportdesign/util/rptui \
+ component/reportdesign/util/rptxml \
component/sc/util/sc \
component/sc/util/scd \
component/sc/util/scfilt \
@@ -149,9 +152,6 @@ my_components = \
protocolhandler \
pythonloader \
res \
- rpt \
- rptui \
- rptxml \
sax \
sb \
scn \
commit a31798e8b9c0e879449fe5c098ccaf059dcf7840
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 12:29:08 2011 +0200
gbuildize formula
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6a0cb28..b8dd55a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -68,6 +68,7 @@ my_components = \
component/dbaccess/util/sdbt \
component/fileaccess/source/fileacc \
component/forms/util/frm \
+ component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -120,7 +121,6 @@ my_components = \
filterconfig1 \
flash \
flat \
- for \
fpicker \
fps_office \
guesslang \
commit a79e7c9adff5233a692e49cb0815809054dfc918
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 10:35:46 2011 +0200
gbuildize slideshow
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 59a8a92..6a0cb28 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -81,6 +81,7 @@ my_components = \
component/sd/util/sdd \
component/sd/util/sdfilt \
component/sfx2/util/sfx \
+ component/slideshow/util/slideshow \
component/sot/util/sot \
component/svl/source/fsstor/fsstorage \
component/svl/source/passwordcontainer/passwordcontainer \
@@ -157,7 +158,6 @@ my_components = \
scriptframe \
sdbc2 \
simplecanvas \
- slideshow \
$(SM_COMPONENTS)\
solver \
spell \
@@ -239,7 +239,7 @@ my_components += kde4be1
.END
.IF "$(ENABLE_OGL)" == "TRUE"
-my_components += ogltrans
+my_components += component/slideshow/source/engine/OGLTrans/ogltrans
.END
.IF "$(ENABLE_SVCTAGS)" == "YES"
commit 6523545d170dd0e40537d955c53e21a40dbb2f7c
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 09:01:24 2011 +0200
gbuildize sd
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6d092b9..59a8a92 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -77,6 +77,9 @@ my_components = \
component/sc/util/scd \
component/sc/util/scfilt \
component/sc/util/vbaobj \
+ component/sd/util/sd \
+ component/sd/util/sdd \
+ component/sd/util/sdfilt \
component/sfx2/util/sfx \
component/sot/util/sot \
component/svl/source/fsstor/fsstorage \
@@ -152,9 +155,7 @@ my_components = \
sb \
scn \
scriptframe \
- sd \
sdbc2 \
- sdd \
simplecanvas \
slideshow \
$(SM_COMPONENTS)\
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 5ca2e40f70b5af0d9e9c0833010c63a342ba8f40
Author: David Tardon <dtardon at redhat.com>
Date: Mon Apr 18 14:49:38 2011 +0200
sort the components
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index b718923..6d092b9 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -61,9 +61,9 @@ my_components = \
component/chart2/source/view/chartview \
component/comphelper/util/comphelp \
component/dbaccess/source/ext/adabas/adabasui \
- component/dbaccess/util/dba \
- component/dbaccess/source/filter/xml/dbaxml \
component/dbaccess/source/ext/macromigration/dbmm \
+ component/dbaccess/source/filter/xml/dbaxml \
+ component/dbaccess/util/dba \
component/dbaccess/util/dbu \
component/dbaccess/util/sdbt \
component/fileaccess/source/fileacc \
@@ -71,7 +71,8 @@ my_components = \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
- component/vbahelper/util/msforms \
+ component/lotuswordpro/util/lwpfilter \
+ component/oox/util/oox \
component/sc/util/sc \
component/sc/util/scd \
component/sc/util/scfilt \
@@ -95,6 +96,8 @@ my_components = \
component/unotools/util/utl \
component/unoxml/source/rdf/unordf \
component/unoxml/source/service/unoxml \
+ component/vbahelper/util/msforms \
+ component/writerfilter/util/writerfilter \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
configmgr \
@@ -125,7 +128,6 @@ my_components = \
lnth \
localebe1 \
log \
- component/lotuswordpro/util/lwpfilter \
mcnttype \
migrationoo2 \
msfilter \
@@ -135,7 +137,6 @@ my_components = \
odfflatxml \
offacc \
oooimprovecore \
- component/oox/util/oox \
package2 \
pcr \
pdffilter \
@@ -184,7 +185,6 @@ my_components = \
vclcanvas \
wpft \
wpgfilter \
- component/writerfilter/util/writerfilter \
xcr \
xmlfa \
xmlfd \
commit 9f0309d5240383c0dcb02c6d20c1f88156b38059
Author: David Tardon <dtardon at redhat.com>
Date: Mon Apr 18 14:47:48 2011 +0200
gbuildize dbaccess
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 5d41be7..b718923 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -46,7 +46,6 @@ SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
my_components = \
abp \
- adabasui \
analysis \
animcore \
avmedia \
@@ -61,6 +60,12 @@ my_components = \
component/chart2/source/tools/charttools \
component/chart2/source/view/chartview \
component/comphelper/util/comphelp \
+ component/dbaccess/source/ext/adabas/adabasui \
+ component/dbaccess/util/dba \
+ component/dbaccess/source/filter/xml/dbaxml \
+ component/dbaccess/source/ext/macromigration/dbmm \
+ component/dbaccess/util/dbu \
+ component/dbaccess/util/sdbt \
component/fileaccess/source/fileacc \
component/forms/util/frm \
component/framework/util/fwk \
@@ -95,14 +100,10 @@ my_components = \
configmgr \
ctl \
date \
- dba \
dbase \
- dbaxml \
- dbmm \
dbp \
dbpool2 \
dbtools \
- dbu \
deployment \
deploymentgui \
dlgprov \
@@ -152,7 +153,6 @@ my_components = \
scriptframe \
sd \
sdbc2 \
- sdbt \
sdd \
simplecanvas \
slideshow \
commit 3cc38011914bcc42a2ae253b0759fd3cc6774ebd
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 15 10:42:27 2011 +0200
gbuildize chart2
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index d78028b..5d41be7 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -56,10 +56,10 @@ my_components = \
cached1 \
calc \
canvasfactory \
- chartcontroller \
- chartmodel \
- charttools \
- chartview \
+ component/chart2/source/controller/chartcontroller \
+ component/chart2/source/model/chartmodel \
+ component/chart2/source/tools/charttools \
+ component/chart2/source/view/chartview \
component/comphelper/util/comphelp \
component/fileaccess/source/fileacc \
component/forms/util/frm \
commit 478086ed318bee8919e77aadbb43a57f3af5182b
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 14 15:49:19 2011 +0200
gbuildize oox
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 369b3e8..d78028b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -134,7 +134,7 @@ my_components = \
odfflatxml \
offacc \
oooimprovecore \
- oox \
+ component/oox/util/oox \
package2 \
pcr \
pdffilter \
commit be6a0b33eaff2a0e2070c3014e0916aa008728ff
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 14 12:36:23 2011 +0200
gbuildize writerfilter
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 2c9cb78..369b3e8 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -184,7 +184,7 @@ my_components = \
vclcanvas \
wpft \
wpgfilter \
- writerfilter \
+ component/writerfilter/util/writerfilter \
xcr \
xmlfa \
xmlfd \
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 ff02ade47658e30cac9c07a20080697f35a73a98
Author: David Tardon <dtardon at redhat.com>
Date: Mon Apr 11 10:08:33 2011 +0200
gbuildize lotuswordpro
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c9ebe57..2c9cb78 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -124,7 +124,7 @@ my_components = \
lnth \
localebe1 \
log \
- lwpfilter \
+ component/lotuswordpro/util/lwpfilter \
mcnttype \
migrationoo2 \
msfilter \
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 d78bafbfc31fca433108342ac5daa6c017cddb28
Merge: d0a158c... 07398df...
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 6 19:25:25 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 07398dfb67961667b1441c12660984d28801f8e4
Merge: e4ce96e... cea99ea...
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 5 17:34:48 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
commit d0a158c7d2273783e86651742a4fe9e84814d684
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Apr 1 19:40:34 2011 +0200
packing lomenubar component file
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fa3bd65..dc4df86 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -242,6 +242,10 @@ my_components += ogltrans
my_components += productregistration.jar
.END
+.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
+my_components += component/framework/util/lomenubar
+.END
+
.IF "$(SOLAR_JAVA)" == "TRUE"
my_components += \
LuceneHelpWrapper \
commit c5771441520387e614e2f54e79ce6102e514b9d5
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 3 17:55:32 2011 +0200
gbuildize forms
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 8c49228..fa3bd65 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -62,6 +62,7 @@ my_components = \
chartview \
component/comphelper/util/comphelp \
component/fileaccess/source/fileacc \
+ component/forms/util/frm \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -114,7 +115,6 @@ my_components = \
for \
fpicker \
fps_office \
- frm \
guesslang \
hwp \
hyphen \
commit 14cff0ae63e8c29bf3b7323970c96934ca4ad37c
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Sun Apr 3 11:23:09 2011 +0200
Move utl component registration file to new location
gbuild places component registration files into a different path.
Adapted postprocess packcomponents accordingly.
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6d5116b..8c49228 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -86,6 +86,7 @@ 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/xmloff/source/transform/xof \
@@ -175,7 +176,6 @@ my_components = \
updatefeed \
updchk \
updchk.uno \
- utl \
uui \
vbaevents \
vcl \
commit b7e1b0cb6e46ab92ac6b64e8c97b62efc265adcf
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Sun Apr 3 09:07:29 2011 +0200
Move component reg file for fileaccess in postprocess
Fix changed path for fileacc.component - gmake puts those into
a different place.
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 59652cc..6d5116b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -61,6 +61,7 @@ my_components = \
charttools \
chartview \
component/comphelper/util/comphelp \
+ component/fileaccess/source/fileacc \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -106,7 +107,6 @@ my_components = \
embobj \
evtatt \
fastsax \
- fileacc \
filterconfig1 \
flash \
flat \
commit e4ce96ef9fe339be870a070ee7a074f1e83c5f37
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 22:32:41 2011 +0100
register lwp / wpg / msworks filter components
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 59652cc..0f97b77 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -123,9 +123,11 @@ my_components = \
lnth \
localebe1 \
log \
+ lwpfilter \
mcnttype \
migrationoo2 \
msfilter \
+ msworksfilter \
mysql \
odbc \
odfflatxml \
@@ -181,6 +183,7 @@ my_components = \
vcl \
vclcanvas \
wpft \
+ wpgfilter \
writerfilter \
xcr \
xmlfa \
commit bd7ea13d97a5bbfc523e0129df30ee073e239d5f
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:26:10 2011 +0200
LibreOffice-3.5 development started in master
Branch "libreoffice-3-4" has been created. Further changes in master
will be used for LibreOffice-3.5 release.
commit a61e8bbdff667d0f8d8efbdf5e144be6a457d2a3
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 1 15:13:16 2011 +0200
Branch libreoffice-3-4
This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases
+ only bug fixes are allowed
+ no approval needed during beta phase (two weeks after branch)
+ 1 approval needed during rc phase and for bugfix releases
+ 2 approvals with different/no affiliation needed for late features
+ regularly merged into master by a selected person when living
Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice at lists.freedesktop.org
If you want to build something cool, unstable, and risky, use master.
commit 886a2ef919d6b7d78fcf79f4b0f9fb2bfbca853f
Author: Muthu Subramanian <sumuthu at novell.com>
Date: Thu Mar 31 18:12:03 2011 +0530
Adding scfilt component entries.
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3ba50bb..59652cc 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -67,6 +67,7 @@ my_components = \
component/vbahelper/util/msforms \
component/sc/util/sc \
component/sc/util/scd \
+ component/sc/util/scfilt \
component/sc/util/vbaobj \
component/sfx2/util/sfx \
component/sot/util/sot \
commit 1132d981a5254ec39e7a52a24d27f5251fab011d
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 31 08:44:58 2011 +0200
we ship these script providers as extensions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 79d27c4..3ba50bb 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -245,9 +245,7 @@ my_components += productregistration.jar
my_components += \
LuceneHelpWrapper \
ScriptFramework \
- ScriptProviderForBeanShell \
ScriptProviderForJava \
- ScriptProviderForJavaScript \
XMergeBridge \
XSLTFilter.jar \
XSLTValidate \
commit ffe6bba519ff7283345eb8ac14739744cb2f4997
Author: David Tardon <dtardon at redhat.com>
Date: Thu Mar 31 08:40:46 2011 +0200
we ship pythonscript as extension
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c56410e..79d27c4 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -138,7 +138,6 @@ my_components = \
preload \
protocolhandler \
pythonloader \
- pythonscript \
res \
rpt \
rptui \
commit 1ee948789cfcbb7a17abfbd600004d8da2f4732c
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 30 21:17:45 2011 +0200
add optional build dependency for ct2n extension
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index c2c5b06..2079073 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 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 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 usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
commit 3946f9f4452544395957ab2ffa7e0b3ad86e3fd7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 29 19:12:02 2011 -0500
fix an unfortunate mishap in the previous component packaging adjustment
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fe664e1..c56410e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -39,7 +39,7 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
.IF "$(USE_GMAKE)" != "1"
-SM_COMPONENTS:=sm smd vbaobj
+SM_COMPONENTS:=sm smd
.ELSE
SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
.END
commit aa850ba6cda28696ab9e56e1336e8150fe1ef762
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Mar 29 17:32:58 2011 -0500
sc is now under gbuild, no more hack to find the *.component are needed
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index dfdfd7c..fe664e1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -39,10 +39,8 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
.IF "$(USE_GMAKE)" != "1"
-SC_COMPONENTS:=sc scd
SM_COMPONENTS:=sm smd vbaobj
.ELSE
-SC_COMPONENTS:= component/sc/util/sc component/sc/util/scd component/sc/util/vbaobj
SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
.END
@@ -67,6 +65,9 @@ my_components = \
component/framework/util/fwl \
component/framework/util/fwm \
component/vbahelper/util/msforms \
+ component/sc/util/sc \
+ component/sc/util/scd \
+ component/sc/util/vbaobj \
component/sfx2/util/sfx \
component/sot/util/sot \
component/svl/source/fsstor/fsstorage \
@@ -144,7 +145,6 @@ my_components = \
rptxml \
sax \
sb \
- $(SC_COMPONENTS)\
scn \
scriptframe \
sd \
commit a5ee936db98487a46edf396d0a23157e7cae0280
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Mar 29 18:02:49 2011 +0200
Fixed the writer navigation toolbar after DEV300 merge
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index d7a615b..5339b55 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -309,6 +309,7 @@ uiconfig/modules/swriter/toolbar/graphicobjectbar.xml
uiconfig/modules/swriter/toolbar/insertbar.xml
uiconfig/modules/swriter/toolbar/mediaobjectbar.xml
uiconfig/modules/swriter/toolbar/moreformcontrols.xml
+uiconfig/modules/swriter/toolbar/navigationobjectbar.xml
uiconfig/modules/swriter/toolbar/numobjectbar.xml
uiconfig/modules/swriter/toolbar/oleobjectbar.xml
uiconfig/modules/swriter/toolbar/optimizetablebar.xml
commit 8a9e1f669f78314022b31918de1dc497e6485827
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 26 15:24:42 2011 -0500
gbuild deliver the component files at different place than old build
in order to support gbuild.lst target in // with build.lst
we need a bit of define-foo here to point to the correct
location of the .component xml registration files
this should be removed when the modules are definitively migrated to
gnumake (i.e when the old build.lst is removed and replaced by gbuild.lst)
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0136aa8..dfdfd7c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -38,6 +38,14 @@ PKGCONFIG_MODULES=gtk+-2.0
GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
+.IF "$(USE_GMAKE)" != "1"
+SC_COMPONENTS:=sc scd
+SM_COMPONENTS:=sm smd vbaobj
+.ELSE
+SC_COMPONENTS:= component/sc/util/sc component/sc/util/scd component/sc/util/vbaobj
+SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
+.END
+
my_components = \
abp \
adabasui \
@@ -136,8 +144,7 @@ my_components = \
rptxml \
sax \
sb \
- sc \
- scd \
+ $(SC_COMPONENTS)\
scn \
scriptframe \
sd \
@@ -146,8 +153,7 @@ my_components = \
sdd \
simplecanvas \
slideshow \
- sm \
- smd \
+ $(SM_COMPONENTS)\
solver \
spell \
spl \
@@ -171,7 +177,6 @@ my_components = \
updchk.uno \
utl \
uui \
- vbaobj \
vbaevents \
vcl \
vclcanvas \
commit dc3573565603586a50b43475073c409371a946fd
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Mar 25 22:29:24 2011 +0000
enable odfflatxml component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 4ba0d5e..0136aa8 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -118,6 +118,7 @@ my_components = \
msfilter \
mysql \
odbc \
+ odfflatxml \
offacc \
oooimprovecore \
oox \
commit c2041753a190310040287281d73642d2311dfdef
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Mar 24 18:06:21 2011 +0000
don't package splash component for windows or mac
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 106d096..4ba0d5e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -184,9 +184,9 @@ my_components = \
xsltfilter \
xstor
-.IF "$(OS)" != "MACOSX"
+.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
my_components += splash
-.END
+.ENDIF
.IF "$(BUILD_SPECIAL)" != ""
my_components += oooimprovement
commit 259021767341b5074d8a2c55d47031130e16ff25
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Mar 24 15:29:26 2011 +0100
Align postprocess with recent quickstarter changes in desktop
This aligns the mac build with the
151e325d9adc2e073835665bf2b3c004444b0726 changes in desktop, which
is now disabled for mac.
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f20151c..106d096 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -150,7 +150,6 @@ my_components = \
solver \
spell \
spl \
- splash \
srtrs1 \
stringresource \
svgfilter \
@@ -185,6 +184,10 @@ my_components = \
xsltfilter \
xstor
+.IF "$(OS)" != "MACOSX"
+my_components += splash
+.END
+
.IF "$(BUILD_SPECIAL)" != ""
my_components += oooimprovement
.END
commit c1d0331751b35257495c2a8abdf4de60689d8461
Merge: 482ced9... 1b7a264...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Mar 22 09:26:28 2011 +0100
Merge commit 'ooo/DEV300_m103'
commit 482ced95900bf491a90a59239f492c9630a0b20d
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Mar 21 21:17:45 2011 +0000
enable unxsplash component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 80a0a05..3549215 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -148,6 +148,7 @@ my_components = \
solver \
spell \
spl \
+ splash \
srtrs1 \
stringresource \
svgfilter \
commit 923b4b825a32694e3f2e190376ae60f19133d33c
Merge: 544269f... 6506119...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 18 15:56:00 2011 +0100
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
postprocess/prj/build.lst
diff --cc postprocess/prj/build.lst
index 9457f66,8cdb8a5..c2c5b06
--- 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 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 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 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 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 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 65061190fc22bbc9b3d25a1f4324046e2ea53c0c
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 15 12:43:00 2011 +0000
more merge fixes
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index 5339b55..d7a615b 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -309,7 +309,6 @@ uiconfig/modules/swriter/toolbar/graphicobjectbar.xml
uiconfig/modules/swriter/toolbar/insertbar.xml
uiconfig/modules/swriter/toolbar/mediaobjectbar.xml
uiconfig/modules/swriter/toolbar/moreformcontrols.xml
-uiconfig/modules/swriter/toolbar/navigationobjectbar.xml
uiconfig/modules/swriter/toolbar/numobjectbar.xml
uiconfig/modules/swriter/toolbar/oleobjectbar.xml
uiconfig/modules/swriter/toolbar/optimizetablebar.xml
commit 60384b1344e156e3ece91ca846e21ae399a9407a
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 15 11:22:52 2011 +0000
cleanup gstreamer component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 49fa9e1..80a0a05 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -345,7 +345,7 @@ my_components += evoab
.END
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
-my_components += avmediagst
+my_components += avmediagstreamer
.END
.IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
commit 544269feeb6be20080ef82a65d6a1e40d1534b83
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Sun Mar 13 16:15:32 2011 +0100
Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years. Noone cares, therefore rest in peace.
Python2 is going to be ditched at some point. Simply do not fail then.
Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
interesting for Linux Distributions. Enforce the user to place JVMs in one
base directory.
5. Fix build for libxml-2.7.8 with ICU support.
* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 6ed189d..9457f66 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 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 readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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 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 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 e2afea507a23108d8e22a663e890ec127c7910bb
Author: Andras Timar <timar at fsf.hu>
Date: Sat Mar 12 09:29:55 2011 +0100
remove legacy SOURCE_ROOT_DIR variable
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index b68b8ee..ca3e468 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -77,7 +77,7 @@ sub get_globals
# set global variables according to environnment
$platform = $ENV{INPATH};
- $srcrootdir = "$ENV{SOURCE_ROOT_DIR}/clone";
+ $srcrootdir = "$ENV{SRC_ROOT}/clone";
$solverdir = $ENV{SOLARVERSION};
$milestoneext = $ENV{UPDMINOREXT};
commit 50b5b44a86c95f6f553da48c2b4f13a29e324cc3
Merge: 5cb9d4d... 2c63b5a...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Mar 9 16:25:45 2011 -0600
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (27 commits)
masterfix DEV300: #i10000# buildtype removed
mav59: #i116806# remove syntax that is not supported on solaris
gnumake3: remove comphelper version; fix including extract.hxx
CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal
ause129: #i116325# don't process .<basename>.xcu, created on mac
dr77: post rebase fixes
#i10000# workaround strange out of memory error on mac
#i10000# reenable checkdeliver
#i10000# create some dependencies...
#i10000# add dependency to trigger rebuild
gnumake2: removing duplicate msword entry in postprocess/packcomponents caused by resync to DEV300_m95
gnumake2: fixing msword component file location in postprocess
#i115608# msword component registration
gnumake2: disabling postprocess/checkdeliver as it consistently fails on unxmacxi
gnumake2: fixed component file location in outdir
gnumake2: added component registration
dba34b: #i110409# remove DataSourceMigration
sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
#i114970#
DEV300 masterfix: #i10000#: wrong regexp
...
Conflicts:
postprocess/prj/build.lst
diff --cc postprocess/prj/build.lst
index 6ed189d,20de2ed..8cdb8a5
--- 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 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 readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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 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 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 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 cea99eac8bb9d21db96ffc0889659fb46cf4bd54
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Mar 8 15:31:13 2011 +0100
Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit 5cb9d4d7d6812aedd65656d477a06426281fe0b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 22 12:07:44 2011 +0000
remove javainstaller2
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 471eb6b..6ed189d 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 pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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 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 readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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 fa18ed39a8d3ee7eb9b49af7b3c1488d070671bb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Feb 9 04:27:03 2011 +0100
Make stlport only optional dependency of postprocess
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index cfef0b3..471eb6b 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 pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver 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 pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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 160fb2ecb53c9df4319e4a536038c97f25f24a69
Merge: 99474dc... cc61189...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 8 00:20:50 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
commit 99474dc694fbebde14c69ae48e972e22b98f0941
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Jan 27 01:42:34 2011 +0200
Do rebasing on 32-bit Windows only for now
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index d9d6d10..0ccfa6b 100755
--- a/postprocess/rebase/makefile.mk
+++ b/postprocess/rebase/makefile.mk
@@ -44,14 +44,14 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll
ALLTAR : REBASE
REBASE .PHONY : $(BASEADDRESSES)
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)$(CPU)"=="WNTI"
.IF "$(product)"=="full"
$(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
.ELSE # "$(product)"=="full"
@echo Doing nothing on non product builds ...
.ENDIF # "$(product)"=="full"
-.ELSE # "$(GUI)"=="WNT"
- @echo Nothing to do, 'rebase' is windows only.
+.ELSE # "$(GUI)"=="WNTI"
+ @echo We do rebasing on 32-bit Windows only.
.ENDIF
$(BASEADDRESSES) : coffbase.txt
commit fe2b8de85ac7bd196debf8b4e215efe9cbbe7dfc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jan 24 13:56:20 2011 +0200
Include the wntmscx build directories
diff --git a/.gitignore b/.gitignore
index 50784a4..4890e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@
# the build directories
/*/unxlng??
/*/unxlng??.pro
-/*/wntmsci??
-/*/wntmsci??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
commit cc61189c518e1a943d4568d43a8a4d37e2a358fd
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 23:05:58 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 94a54c7ff4f2424e0b7a29919bf9eb0b150133c5
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 22:39:09 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit ad7e08c5eeb70a5be07d28f272a9dca53664b629
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jan 10 19:47:11 2011 +0100
Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)
commit 4662f33dcf88c1fd6d5e5de87071edc2283f73a8
Author: Maja Djordjevic <ovcica at gmail.com>
Date: Thu Jan 6 11:57:17 2011 +0100
fdo#32869: Added navigation buttons to writer
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index d7a615b..5339b55 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -309,6 +309,7 @@ uiconfig/modules/swriter/toolbar/graphicobjectbar.xml
uiconfig/modules/swriter/toolbar/insertbar.xml
uiconfig/modules/swriter/toolbar/mediaobjectbar.xml
uiconfig/modules/swriter/toolbar/moreformcontrols.xml
+uiconfig/modules/swriter/toolbar/navigationobjectbar.xml
uiconfig/modules/swriter/toolbar/numobjectbar.xml
uiconfig/modules/swriter/toolbar/oleobjectbar.xml
uiconfig/modules/swriter/toolbar/optimizetablebar.xml
commit 6fe2dcd3b6628dbc39bec1d7ddec41efb86d3b63
Merge: 0e84c28... 3aa594f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 01:41:44 2010 +0100
Merge commit 'libreoffice-3.3.0.2'
commit 3aa594f13b4406dae9ce902a33fee5d5720953ab
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Dec 18 20:35:17 2010 +0100
Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
commit 0e84c28e84778b25b342a843d5f557eafb949b85
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Dec 10 10:07:11 2010 +0000
use WITH_THEMES here not ENABLE_THEMES
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index b21737c..9198aef 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -38,7 +38,7 @@ IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
# (Tango fallbacks to Industrial for the missing icons)
-CUSTOM_IMAGE_SETS=$(ENABLE_THEMES)
+CUSTOM_IMAGE_SETS=$(WITH_THEMES)
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
commit fdf9a873af71df8ed92b48ea329eb7494ea65852
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Thu Dec 9 12:32:32 2010 +0100
Don't harcode list of themes to process
Don't use a hardcoded list of themes to process but use the
ENABLE_THEMES environment variable which is defined during configure
time and set in set_soenv.
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index d8d75df..b21737c 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -38,7 +38,7 @@ IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
# (Tango fallbacks to Industrial for the missing icons)
-CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango
+CUSTOM_IMAGE_SETS=$(ENABLE_THEMES)
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
commit 80a7125d0c0aa9343711c3c79f895432c8378a0c
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Dec 3 18:16:55 2010 +0100
crystal icon set no longer comes as a tarball
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index 69b813a..d8d75df 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -43,8 +43,6 @@ CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-
ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
$(IMAGES) $(CUSTOM_IMAGES) : $(SORTED_LIST)
@@ -68,14 +66,3 @@ images_% : $(RES)$/img$/commandimagelist.ilst
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip:
@$(TOUCH) $@
-
-# unpack the Crystal icon set
-$(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
- cd $(MISC) && gzip -d -c $(CRYSTAL_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
- chmod -R g+w $(MISC)$/crystal
-.ENDIF
- @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
-
-# dependencies
-images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
commit 1455bbc171f158965a4ab30a32ec5d13382bb889
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Dec 3 18:07:53 2010 +0100
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list