Module_tail_build.mk | 1 -
configmgr/prj/build.lst | 2 ++
postprocess/prj/build.lst | 2 +-
tail_build/prj/build.lst | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit a4c82d571e6bfe035472493448378e36510fe1e2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 16 18:28:35 2011 +0100
Revert "Move configmgr to tail_build."
...it is not yet ready for that.
This reverts commit f3acd83c1c406f6527d05b0a52a2bef03557e2e1.
Conflicts:
tail_build/prj/build.lst
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 592e3fd..9b0dc4c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
basctl \
bean \
chart2 \
- configmgr \
cui \
dbaccess \
desktop \
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index 3abaffe..06d840a 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,2 +1,4 @@
cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi
sal salhelper xmlreader NULL
cg configmgr\prj nmake - all cg_prj NULL
+# migrated to gbuild
+#cg configmgr\qa\unoapi nmake - all cg_qa_unoapi NULL
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 868c0dc..50f4f60 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter
CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm
DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg
ODK:odk officecfg 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 smoketest tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr
CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm
DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg
ODK:odk officecfg 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 smoketest tail_build NULL
po postprocess usr1 - all
po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig
po_checkxml NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 81ed7f4..19d0cc5 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu
DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss
OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon
TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas
comphelper connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper
jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker
readlicense_oo rhino ridljar sal salhelper sax sfx2 solenv soltools sot stoc
svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure
vcl xmlhelp xmloff xmlreader xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu
DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss
OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon
TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas
comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot
stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools
ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
