diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 16:36:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 16:39:26 +0200 |
| commit | a015cda8f2c5a5c3c897e0933b631b9c0f6afd6b (patch) | |
| tree | 3970084b905d2660baeb2f7a559b534880b927d0 /postprocess | |
| parent | 9132e6ffa7b51375ee90f14226ab3eb08ba5e85c (diff) | |
Undo basis/brand split: moved .rdb files from basis program/ to brand program/ (merging the two services.rdb files).
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 16 | ||||
| -rw-r--r-- | postprocess/prj/d.lst | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index bbea2d116ffa..07d6ccf8f5cf 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -103,6 +103,7 @@ my_components = \ component/scripting/source/basprov/basprov \ component/scripting/source/dlgprov/dlgprov \ component/scripting/source/protocolhandler/protocolhandler \ + component/scripting/source/pyprov/mailmerge \ component/scripting/source/stringresource/stringresource \ component/scripting/source/vbaevents/vbaevents \ component/scripting/util/scriptframe \ @@ -365,11 +366,9 @@ my_components += evoab my_components += component/avmedia/source/gstreamer/avmediagstreamer .END -my_ooo_components = component/scripting/source/pyprov/mailmerge - .INCLUDE: target.mk -ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb +ALLTAR : $(MISC)/services.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component") @@ -380,14 +379,3 @@ $(MISC)/services.input : makefile.mk 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 : makefile.mk - echo '<list>' \ - '$(my_ooo_components:^"<filename>":+".component</filename>")' \ - '</list>' > $@ diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst index 603802446552..171e9db91e33 100644 --- a/postprocess/prj/d.lst +++ b/postprocess/prj/d.lst @@ -2,6 +2,4 @@ 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 |