diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 16:25:45 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 16:25:45 -0600 |
commit | 6fe5c3611f3bb03b8aa98d0af8bee9f7cede81d0 (patch) | |
tree | 15cabb3a1967c520554e7384722684ba3019cbaf /postprocess/prj/build.lst | |
parent | e4f65851e5d9318516efe09ca5c6ad8442326f42 (diff) | |
parent | 27a1028245e94de4b11567a5adb60cfb6b10e914 (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (27 commits)
masterfix DEV300: #i10000# buildtype removed
mav59: #i116806# remove syntax that is not supported on solaris
gnumake3: remove comphelper version; fix including extract.hxx
CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal
ause129: #i116325# don't process .<basename>.xcu, created on mac
dr77: post rebase fixes
#i10000# workaround strange out of memory error on mac
#i10000# reenable checkdeliver
#i10000# create some dependencies...
#i10000# add dependency to trigger rebuild
gnumake2: removing duplicate msword entry in postprocess/packcomponents caused by resync to DEV300_m95
gnumake2: fixing msword component file location in postprocess
#i115608# msword component registration
gnumake2: disabling postprocess/checkdeliver as it consistently fails on unxmacxi
gnumake2: fixed component file location in outdir
gnumake2: added component registration
dba34b: #i110409# remove DataSourceMigration
sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
#i114970#
DEV300 masterfix: #i10000#: wrong regexp
...
Conflicts:
postprocess/prj/build.lst
Diffstat (limited to 'postprocess/prj/build.lst')
-rw-r--r-- | postprocess/prj/build.lst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 6ed189dc3887..8cdb8a5ed50c 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,8 +1,9 @@ -po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport NULL +po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL po postprocess\packregistry nmake - all po_packregistry NULL +po postprocess\packcomponents nmake - all po_packcomponents NULL po postprocess\rebase nmake - w po_rebase NULL po postprocess\signing nmake - w,sign po_signing po_rebase.w NULL |