summaryrefslogtreecommitdiff
path: root/postprocess
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2011-09-24 21:40:19 -0400
committerPeter Foley <pefoley2@verizon.net>2011-10-07 23:03:36 +0000
commitb78a7ae95bac198fb44e0c093061f98dd883a27d (patch)
tree334481b502287e25064a03f69b4822b52e68127a /postprocess
parente7a1e17c4fdea4103e7f921e8cd9c315c1dbe612 (diff)
convert xmerge to gbuild and add to tail_build
Diffstat (limited to 'postprocess')
-rw-r--r--postprocess/packcomponents/makefile.mk2
-rw-r--r--postprocess/prj/build.lst2
2 files changed, 2 insertions, 2 deletions
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