diff options
| author | sb <sb@openoffice.org> | 2010-09-14 17:10:47 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-14 17:10:47 +0200 |
| commit | 9980c566801c8a784ef7f2ad10aa224757afca3a (patch) | |
| tree | 8feb2a2dc03e46986a5dd45fe3f9cd987e55b1e0 /postprocess | |
| parent | c085c1bfbf61fddd1410e9f9910f3f4a8909a229 (diff) | |
sb129: #i113189# move mailmerge to brand specific services.rdb
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 16 | ||||
| -rw-r--r-- | postprocess/prj/d.lst | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index ab3797c792e2..6f02d10c0c5c 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -354,11 +354,11 @@ my_components += avmediagst my_components += avmedia.jar .END -my_components += mailmerge #TODO: OOo mailmerge vs. OOO email +my_ooo_components = mailmerge .INCLUDE: target.mk -ALLTAR : $(MISC)/services.rdb +ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component") @@ -370,3 +370,15 @@ $(MISC)/services.input .ERRREMOVE : echo \ '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \ > $@ + +$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ + $(MISC)/ooo-services.input \ + $(my_ooo_components:^"$(SOLARXMLDIR)/":+".component") + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ + $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input + +$(MISC)/ooo-services.input .ERRREMOVE : + - $(RM) $@ + echo '<list>' \ + '$(my_ooo_components:^"<filename>":+".component</filename>")' \ + '</list>' > $@ diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst index 27f2b9cc12ae..28c0a7e3fd9a 100644 --- a/postprocess/prj/d.lst +++ b/postprocess/prj/d.lst @@ -1,4 +1,6 @@ +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.rdb %_DEST%\xml%_EXT%\services.rdb |