[Libreoffice-commits] .: 2 commits - binaryurp/prj cairo/prj configmgr/prj curl/prj Module_tail_build.mk postprocess/prj tail_build/prj xmlreader/prj

Stephan Bergmann sbergmann at kemper.freedesktop.org
Fri Dec 16 08:45:50 PST 2011


 Module_tail_build.mk      |    1 +
 binaryurp/prj/build.lst   |    2 +-
 cairo/prj/build.lst       |    2 +-
 configmgr/prj/build.lst   |    4 +---
 curl/prj/build.lst        |    2 +-
 postprocess/prj/build.lst |    2 +-
 tail_build/prj/build.lst  |    2 +-
 xmlreader/prj/build.lst   |    2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit c4e52039994b9c0011e1ba64e1223ee89d5d970a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 17:44:39 2011 +0100

    Code modules no longer depend on stlport.

diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst
index 413b430..eba5c27 100644
--- a/binaryurp/prj/build.lst
+++ b/binaryurp/prj/build.lst
@@ -1,2 +1,2 @@
-bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL
+bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper NULL
 bu binaryurp\prj nmake - all bu_prj NULL
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index a4d0da4..5827e76 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo	cairo	: ZLIB:zlib libpng soltools stlport NULL
+lcairo	cairo	: ZLIB:zlib libpng soltools NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
diff --git a/configmgr/prj/build.lst b/configmgr/prj/build.lst
index f88cd2c..3abaffe 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,2 +1,2 @@
-cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi sal salhelper stlport xmlreader NULL
+cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi sal salhelper xmlreader NULL
 cg configmgr\prj nmake - all cg_prj NULL
diff --git a/curl/prj/build.lst b/curl/prj/build.lst
index d3aab47..96e092d 100644
--- a/curl/prj/build.lst
+++ b/curl/prj/build.lst
@@ -1,3 +1,3 @@
-xc	curl	:	stlport external NULL
+xc	curl	: external NULL
 xc	curl	usr1	-	all	xc_mkout NULL
 xc	curl	nmake	-	all	xc_curl NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 78462ed..81ed7f4 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 stlport 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 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\prj nmake - all tb_prj   NULL
diff --git a/xmlreader/prj/build.lst b/xmlreader/prj/build.lst
index 59b71b8..b8bd509 100644
--- a/xmlreader/prj/build.lst
+++ b/xmlreader/prj/build.lst
@@ -1,2 +1,2 @@
-xr xmlreader : BOOST:boost cppu offapi sal stlport NULL
+xr xmlreader : BOOST:boost cppu offapi sal NULL
 xr xmlreader\prj nmake - all xr_prj NULL
commit f3acd83c1c406f6527d05b0a52a2bef03557e2e1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 17:40:04 2011 +0100

    Move configmgr to tail_build.

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 9b0dc4c..592e3fd 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -29,6 +29,7 @@ $(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 9e8d45c..f88cd2c 100644
--- a/configmgr/prj/build.lst
+++ b/configmgr/prj/build.lst
@@ -1,4 +1,2 @@
 cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi sal salhelper stlport 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 50f4f60..868c0dc 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 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 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 19d0cc5..78462ed 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 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 : 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 stlport stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlreader xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL


More information about the Libreoffice-commits mailing list