From b78a7ae95bac198fb44e0c093061f98dd883a27d Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 24 Sep 2011 21:40:19 -0400 Subject: convert xmerge to gbuild and add to tail_build --- postprocess/packcomponents/makefile.mk | 2 +- postprocess/prj/build.lst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 819d7d518b5b..2da7af8041f2 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -249,7 +249,7 @@ my_components += component/framework/util/lomenubar .IF "$(SOLAR_JAVA)" == "TRUE" my_components += \ LuceneHelpWrapper \ - XMergeBridge \ + component/xmerge/source/bridge/XMergeBridge \ component/filter/source/xsltfilter/XSLTFilter.jar \ component/filter/source/xsltvalidate/XSLTValidate \ component/scripting/java/ScriptFramework \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index a52c918ce8ad..400cc851b1cb 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL +po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext 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 -- cgit