[Libreoffice-commits] .: 5 commits - Module_tail_build.mk oox/Library_oox.mk oox/Package_source.mk postprocess/prj sc/CppunitTest_sc_ucalc.mk sc/Library_scfilt.mk sd/Library_sdfilt.mk sd/Library_sd.mk slideshow/Library_slideshow.mk sw/Library_msword.mk tail_build/prj writerfilter/Package_writerfilter_generated.mk writerfilter/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Thu Aug 11 21:11:53 PDT 2011
Module_tail_build.mk | 3 +++
oox/Library_oox.mk | 7 +++++++
oox/Package_source.mk | 2 +-
postprocess/prj/build.lst | 2 +-
sc/CppunitTest_sc_ucalc.mk | 6 ++++++
sc/Library_scfilt.mk | 1 +
sd/Library_sd.mk | 1 +
sd/Library_sdfilt.mk | 1 +
slideshow/Library_slideshow.mk | 1 +
sw/Library_msword.mk | 1 +
tail_build/prj/build.lst | 2 +-
writerfilter/Package_writerfilter_generated.mk | 4 ++--
writerfilter/source/Makefile | 4 ++--
13 files changed, 28 insertions(+), 7 deletions(-)
New commits:
commit fdb2c9841b8290d98f326857224de32f1fb65ac2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 11 23:11:27 2011 -0500
bring the module writerperfect into tail_build's fold
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 384ebf2..74e4b0f 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
uui \
wizards \
writerfilter \
+ writerperfect \
))
# vim: set noet sw=4 ts=4:
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index a268000..4152e34 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl writerperfect xmlscript NULL
+tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio MDDS:mdds MESA:Mesa OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl xmloff xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 751531df525d50a2a93ed170972766851d8a8d82
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 11 23:10:40 2011 -0500
add the module oox into tail_build's fold
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ad1a60a..384ebf2 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
formula \
hwpfilter \
lotuswordpro \
+ oox \
padmin \
reportdesign \
sc \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f80f670..42f16c9 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -30,6 +30,9 @@ $(eval $(call gb_Library_Library,oox))
$(eval $(call gb_Library_add_package_headers,oox,\
oox_inc \
+ oox_generated \
+ oox_source \
+ oox_tokens \
))
$(eval $(call gb_Library_set_include,oox,\
@@ -340,6 +343,10 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token
$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/namespaces.hxx
$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/properties.hxx
$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/tokens.hxx
+$(call gb_Package_get_target,oox_inc) : $(call gb_Package_get_target,oox_source)
+$(call gb_Package_get_target,oox_inc) : $(call gb_Package_get_target,oox_generated)
+
+
$(call gb_CxxObject_get_target,oox/source/token/tokenmap) : $(oox_INC)/tokenhash.inc
diff --git a/oox/Package_source.mk b/oox/Package_source.mk
index fd27b48..9a4e961 100644
--- a/oox/Package_source.mk
+++ b/oox/Package_source.mk
@@ -27,6 +27,6 @@
#*************************************************************************
$(eval $(call gb_Package_Package,oox_source,$(SRCDIR)/oox/source))
-$(eval $(call gb_Package_add_file,oox_source,inc/oox/token/tokens.txt,token/tokens.txt))
+$(eval $(call gb_Package_add_file,oox_source,inc/oox/tokens.txt,token/tokens.txt))
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4a612ac..7a35ac8 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext 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
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index ce6cee1..e6958f4 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(realpath $(SRCDIR)/sc/inc/pch) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
+ -I$(WORKDIR)/oox/inc/ \
-I$(OUTDIR)/inc \
))
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index cc0701a..9dd3f29 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_set_include,sdfilt,\
-I$(realpath $(SRCDIR)/sd/inc) \
-I$(realpath $(SRCDIR)/sd/inc/pch) \
-I$(OUTDIR)/inc \
+ -I$(WORKDIR)/oox/inc/ \
))
$(eval $(call gb_Library_add_defs,sdfilt,\
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 2f395e1..3266e50 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
+ -I$(WORKDIR)/oox/inc/ \
-I$(OUTDIR)/inc/sw \
))
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index bb40549..a268000 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl writerperfect xmlscript NULL
+tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl writerperfect xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index 3a7b8ce..ec88aff 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -35,8 +35,8 @@ $(eval $(call \
$(eval $(call \
gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
$(gb_XSLTPROCTARGET) \
- $(OUTDIR)/inc$(UPDMINOREXT)/oox/tokens.txt \
- $(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt \
+ $(OUTDIR)/inc/oox/tokens.txt \
+ $(OUTDIR)/inc/oox/namespaces.txt \
))
$(eval $(call \
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index b50ff5d..8b8b962 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -89,8 +89,8 @@ wf_GEN_ooxml_GperfFastToken_hxx=gperffasttoken.hxx
wf_GEN_ooxml_Model_processed=model_preprocessed.xml
wf_GEN_ooxml_Model_analyzed=ooxml/model_analyzed.xml
-$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt
- cat $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc/oox/tokens.txt
+ cat $(OUTDIR)/inc/oox/tokens.txt \
| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
$(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter
commit 662c49c020420a878f8feb488ff9b0dc3c0d8a9f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 11 22:37:16 2011 -0500
sd and slideshow depend on animations' api
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index c00b5e1..b4a667c 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_set_defs,sd,\
endif
$(eval $(call gb_Library_add_api,sd,\
+ animations \
offapi \
udkapi \
))
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 7095e59..cb7a8e0 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_defs,slideshow,\
endif
$(eval $(call gb_Library_add_api,slideshow,\
+ animations \
offapi \
udkapi \
))
commit d0ed4ca4715797d2b9d6455ddee7c7851cd3acd5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 11 22:35:23 2011 -0500
sc_ucalc is missing a dep on AllLangRes/sc and others -> build heisenbug
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index d7a1adf..d6f876c 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -37,6 +37,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
$(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc))
+$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/sc
+$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/frm
+$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/for
+$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/forui
+
+
$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
avmedia \
basegfx \
commit cb125582453e715d805f8a11007ce42356a2efa2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Aug 11 11:17:06 2011 -0500
add the module basctl to the tail_build fold
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 3f0feef..ad1a60a 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
animations \
+ basctl \
chart2 \
cui \
dbaccess \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 77c56cd..4a612ac 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility DESKTOP:automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext 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
More information about the Libreoffice-commits
mailing list