[Libreoffice-commits] .: 38 commits - basegfx/Library_basegfx.mk cross_tail_build/prj i18npool/CustomTarget_localedata.mk i18npool/Package_inc.mk i18npool/version.mk Module_cross_tail_build.mk Module_tail_build.mk postprocess/prj scp2/InstallModule_ooo.mk scp2/source solenv/bin solenv/gbuild solenv/inc tail_build/prj

David Tardon dtardon at kemper.freedesktop.org
Tue May 29 05:38:18 PDT 2012


 Module_cross_tail_build.mk           |   17 +++++++
 Module_tail_build.mk                 |   27 +++++++++++
 basegfx/Library_basegfx.mk           |    5 +-
 cross_tail_build/prj/build.lst       |    2 
 i18npool/CustomTarget_localedata.mk  |    2 
 i18npool/Package_inc.mk              |    2 
 i18npool/version.mk                  |   40 -----------------
 postprocess/prj/build.lst            |    2 
 scp2/InstallModule_ooo.mk            |    3 -
 scp2/source/ooo/file_library_ooo.scp |    4 -
 solenv/bin/build.pl                  |   81 ++++++++++++++++++++++++++++++++++-
 solenv/gbuild/Library.mk             |    3 -
 solenv/gbuild/StaticLibrary.mk       |    3 -
 solenv/gbuild/tail_build_modules.mk  |   48 ++++++++++++++++++++
 solenv/inc/libs.mk                   |    7 ---
 tail_build/prj/build.lst             |    2 
 16 files changed, 187 insertions(+), 61 deletions(-)

New commits:
commit ea22c4fc2570d484dd6a05f3b98204c75895329a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 13:48:00 2012 +0200

    make sure that $(OUTDIR)/lib exists before delivering libs
    
    Change-Id: I8a4b11c14c615ba47c8e58b5f30145f5e8d77f0d

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index cd49b27..cb043d0 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,8 @@ $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_Library_DEFS) \
 )
 $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
+	| $(dir $(call gb_Library_get_target,$(1))).dir
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
 $$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 7315258..672478e 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -66,7 +66,8 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_StaticLibrary_DEFS) \
 )
-$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
+	| $(dir $(call gb_StaticLibrary_get_target,$(1))).dir
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
commit d22fc948ae429da8bd934c3468f787fbea19009c
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 10:23:08 2012 +0200

    move remotebridges to cross_tail_build
    
    Change-Id: I0159b655e8e5f65dbc1fca29a13715043493c985

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index a471f16..cc27ed1 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 		qadevOOo \
 	) \
 	regexp \
+	remotebridges \
 	rsc \
 	sax \
 	shell \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index d783109..8145080 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 39b6c227432261d79a59b8f4b6b13e6bbc296091
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 10:22:16 2012 +0200

    move io to cross_tail_build
    
    Change-Id: I1145b8d5b6944f05919c7813c4378573dfe53316

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index c0510fc..a471f16 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	i18npool \
 	i18nutil \
 	idl \
+	io \
 	javaunohelper \
 	o3tl \
 	oovbaapi \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index a6b6acb..d783109 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 643157ae2b3bf60500d6f5ddc834bf4a796c5fe3
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 10:14:22 2012 +0200

    move unoil to cross_tail_build
    
    Change-Id: I8343d01c138eb2f92c086b7a30782fca876d16d7

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index e2fc5a9..c0510fc 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	shell \
 	tools \
 	unodevtools \
+	unoil \
 	unotest \
 	unotools \
 	ure \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 24bd7ec..a6b6acb 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 9c03f8872bc477c8904b0194cc928ce19c297696
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 10:03:43 2012 +0200

    move javaunohelper to cross_tail_build
    
    Change-Id: Ic3dc2dddef9c44703a583dcb2c3f7f4823487af3

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 92e95c2..e2fc5a9 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	i18npool \
 	i18nutil \
 	idl \
+	javaunohelper \
 	o3tl \
 	oovbaapi \
 	$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index cf11728..24bd7ec 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 353da8152b8af1141c35f724702e1625f2a3616b
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 10:02:35 2012 +0200

    move binaryurp to cross_tail_build
    
    Change-Id: I4315512877f67ace2abbad103299cd2d988cf6c0

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 8194ec4..92e95c2 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,cross_tail_build))
 
 $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	basegfx \
+	binaryurp \
 	i18npool \
 	i18nutil \
 	idl \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index eb38829..cf11728 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb binaryurp BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal solenv stoc TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal salhelper solenv stoc TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 13b01c8cdc52bba447a552ed9b1f8b3d277aac22
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 10:01:32 2012 +0200

    move ure to cross_tail_build
    
    Change-Id: I0871c25d6999fbfbb4c88918994cf852a45f834a

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 876c43d..8194ec4 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	unodevtools \
 	unotest \
 	unotools \
+	ure \
 	xmlhelp \
 ))
 
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index e5c639f..eb38829 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb binaryurp BOOST:boost bridges cli_ure DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu io javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker remotebridges ridljar sal solenv stoc TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 1537030838dbb418b3dcb1c4e1f5a5f0850aa630
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:59:44 2012 +0200

    move sax to cross_tail_build
    
    Change-Id: I62507b0976a870f85d6d265c601c9639e829f8e6

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 48716b2..876c43d 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	) \
 	regexp \
 	rsc \
+	sax \
 	shell \
 	tools \
 	unodevtools \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 1039a1b..e5c639f 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 2edb69f15a9d2b0ab81fdee827f8eff1cb6d7ade
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:59:04 2012 +0200

    move qadevOOo to cross_tail_build
    
    Change-Id: If61e6e9d1d8a9bdc939d8b5137d03c210b8820e3

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 700e5c5..48716b2 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -34,6 +34,9 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	idl \
 	o3tl \
 	oovbaapi \
+	$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
+		qadevOOo \
+	) \
 	regexp \
 	rsc \
 	shell \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 900b740..1039a1b 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi QADEVOOO:qadevOOo DESKTOP:rdbmaker ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu javaunohelper jurt DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 4e5fb227664686b999c17cf7c1f6f91dcd3a03f6
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:57:11 2012 +0200

    move i18nutil to cross_tail_build
    
    Change-Id: I01e86316b0619ec8676cdf70240b8fc6d166bca9

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index fee2602..700e5c5 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,cross_tail_build))
 $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	basegfx \
 	i18npool \
+	i18nutil \
 	idl \
 	o3tl \
 	oovbaapi \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 3350937..900b740 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18nutil ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi QADEVOOO:qadevOOo DESKTOP:rdbmaker ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi QADEVOOO:qadevOOo DESKTOP:rdbmaker ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit f415bd59e1e6bff16c00d34ee3b6243cc0bcd768
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:56:38 2012 +0200

    move regexp to cross_tail_build
    
    Change-Id: Ib9873dc37ea136ed065d6145fe113a031a12eb7a

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 15c3318..fee2602 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	idl \
 	o3tl \
 	oovbaapi \
+	regexp \
 	rsc \
 	shell \
 	tools \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index bbb29ce..3350937 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18nutil ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi QADEVOOO:qadevOOo DESKTOP:rdbmaker regexp ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18nutil ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi QADEVOOO:qadevOOo DESKTOP:rdbmaker ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit f953f2b6656ef168fcf2d539628371bab1fc4fae
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:55:49 2012 +0200

    move unotest to cross_tail_build
    
    Change-Id: I2d9700ce31505ed50861460ce0dc1d407e7c8b33

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index d08f693..15c3318 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	shell \
 	tools \
 	unodevtools \
+	unotest \
 	unotools \
 	xmlhelp \
 ))
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 3ab14d5..bbb29ce 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18nutil ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker regexp sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil unotest ure ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18nutil ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi QADEVOOO:qadevOOo DESKTOP:rdbmaker regexp ridljar sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil ure ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 68d1c58274caf406515644ee550a11bfa389bbe2
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:54:31 2012 +0200

    move i18npool to cross_tail_build
    
    Change-Id: I335c6a0e3442ef443fafb74fe4ef3fa8241bdbc7

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 537813d..d08f693 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,cross_tail_build))
 
 $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	basegfx \
+	i18npool \
 	idl \
 	o3tl \
 	oovbaapi \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index fc11b66..3ab14d5 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18npool javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker sal solenv TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb bridges DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18nutil ICU:icu javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker regexp sal sax solenv TRANSLATIONS:translations ucbhelper udkapi unoil unotest ure ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 7a1096929b2d26f3f804af4ddf9bf24a2ae9cf51
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:52:42 2012 +0200

    move basegfx and o3tl to cross_tail_build
    
    Change-Id: Id3a691d7fd168665647c9c86928ba6e33d13e570

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 3223c16..537813d 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -28,7 +28,9 @@
 $(eval $(call gb_Module_Module,cross_tail_build))
 
 $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
+	basegfx \
 	idl \
+	o3tl \
 	oovbaapi \
 	rsc \
 	shell \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index a8dda99..fc11b66 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	basegfx BERKELEYDB:berkeleydb DESKTOP:codemaker comphelper cppu cppuhelper EXPAT:expat external i18npool javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker sal solenv TRANSLATIONS:translations ucbhelper unoil ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb DESKTOP:codemaker comphelper cppu cppuhelper CPPUNIT:cppunit EXPAT:expat external i18npool javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker sal solenv TRANSLATIONS:translations ucbhelper udkapi unoil ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit 913d0b320fd21fb880af5e114d7223c00d24297b
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 29 09:50:57 2012 +0200

    move tools to cross_tail_build
    
    Change-Id: Iab14cc960c74f2e1355752fe57731d69b443b8b8

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index 7516b1b..3223c16 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
 	oovbaapi \
 	rsc \
 	shell \
+	tools \
 	unodevtools \
 	unotools \
 	xmlhelp \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 302e52f..a8dda99 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb DESKTOP:codemaker comphelper cppuhelper EXPAT:expat javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker sal solenv tools TRANSLATIONS:translations ucbhelper unoil NULL
+ctb	cross_tail_build	::	basegfx BERKELEYDB:berkeleydb DESKTOP:codemaker comphelper cppu cppuhelper EXPAT:expat external i18npool javaunohelper DESKTOP:l10ntools LIBXSLT:libxslt offapi DESKTOP:rdbmaker sal solenv TRANSLATIONS:translations ucbhelper unoil ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
commit e767cc7724710b1ddcaf0f51514bbbec9b6d76aa
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:21:14 2012 +0200

    move embedserv to tail_build
    
    Change-Id: Ieea814347e3c895c39a3dfc3312d6b1a735f4d68

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index f96d15f..02a7d43 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     drawinglayer \
     editeng \
     embeddedobj \
+	embedserv \
     eventattacher \
     extensions \
     fileaccess \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4b30dc3..a967514 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport 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
commit 786f855f7643d7c10c5bf744bcae5c9cb43a1ba5
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:18:28 2012 +0200

    move nlpsolver to tail_build
    
    Change-Id: Ib1af41063f2062efc9392c81f94d95b99060cc82

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index b515388..f96d15f 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -67,6 +67,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     lotuswordpro \
     MathMLDTD \
     Mesa \
+	$(if $(filter NLPSOLVER,$(BUILD_TYPE)),\
+		nlpsolver \
+	) \
     np_sdk \
 	o3tl \
     oovbaapi \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 618168b..4b30dc3 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk testtools MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno LANGUAGETOOL:languagetool MYSQLC:mysqlc STLPORT:stlport 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
commit 1d5c70b00566f7cfc69b9bfb45e7fbde312f753d
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:17:24 2012 +0200

    move unoil to tail_build
    
    Change-Id: I0a4ee1c1bf9acbcb83a02d2ae6ab383fd8f4c5e2

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 8bd7fe1..b515388 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     unixODBC \
     UnoControls \
     unodevtools \
+	unoil \
 	unotest \
     unotools \
     unoxml \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 628e1e2..6b4b8e5 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external icc jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil xmlreader xsltml
  NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external icc jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 87e0c60f6b09965f383cfeb6eb749e56fb8f6a3b
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:15:38 2012 +0200

    move javaunohelper to tail_build
    
    Change-Id: I549395fc5686bac70616b7344c4b32737ae14289

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 87a2c23..8bd7fe1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	i18nutil \
     idl \
 	io \
+	javaunohelper \
     lingucomponent \
     linguistic \
     lotuswordpro \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 15f6844..628e1e2 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil xm
 lreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external icc jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil xmlreader xsltml
  NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit abcab9df5f002ffd1a2862c03471fc4587fdefbc
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:13:37 2012 +0200

    move cpputools to tail_build
    
    Change-Id: Ia4048ec901a4bedc00b3a6f43059cfb82202d340

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ed87602..87a2c23 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     configmgr \
     connectivity \
     cppcanvas \
+	cpputools \
     cui \
     dbaccess \
     desktop \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index d1aa64c..15f6844 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper cpputools external icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkap
 i unoil xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil xm
 lreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 3018f4f02136e84e0933ce70170912fac9932a51
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:12:43 2012 +0200

    move io to tail_build
    
    Change-Id: I6ceab6d3b27530f44ecd5977837655d7b38eb7fd

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index d4db998..ed87602 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	i18npool \
 	i18nutil \
     idl \
+	io \
     lingucomponent \
     linguistic \
     lotuswordpro \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 3fddf92..d1aa64c 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper cpputools external icc io javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper ud
 kapi unoil xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper cpputools external icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkap
 i unoil xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit fa87191c91b06320453db016ca6fa5765df018fc
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:11:58 2012 +0200

    move binaryurp to tail_build
    
    Change-Id: I0e5ad225498a48d1bf1a5b2fc34a518abf7f1a72

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 0696b2c..d4db998 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	basegfx \
     basic \
     bean \
+	binaryurp \
     canvas \
     chart2 \
     configmgr \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5dd58f6..3fddf92 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib binaryurp bridges cli_ure comphelper cppu cppuhelper cpputools external icc io javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui uc
 bhelper udkapi unoil xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper cpputools external icc io javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper ud
 kapi unoil xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 6b78dd3eac100718b383471014de1fcee407ef8c
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:10:14 2012 +0200

    move ure to tail_build
    
    Change-Id: I3dbc3ee8e7117476dbf5d7bae363d7a4c55bbea6

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 2feba2a..0696b2c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	unotest \
     unotools \
     unoxml \
+	ure \
     uui \
     vbahelper \
     vcl \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2a05bde..5dd58f6 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil ure xmlreader 
 xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib binaryurp bridges cli_ure comphelper cppu cppuhelper cpputools external icc io javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo remotebridges RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui uc
 bhelper udkapi unoil xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit ee28c18eab8f4ae67c4faf0dda516097022defb5
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:08:45 2012 +0200

    move i18nutil to tail_build
    
    Change-Id: I813f6ecd26c79607f0c19a28ef921aff5f0b82b6

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index aa5df01..2feba2a 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     framework \
     hwpfilter \
 	i18npool \
+	i18nutil \
     idl \
     lingucomponent \
     linguistic \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 879eb26..2a05bde 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil ure x
 mlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil ure xmlreader 
 xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 01c25e23a27adc17b98c059e44bcb10426ca56c9
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:08:03 2012 +0200

    move regexp to tail_build
    
    Change-Id: I517727b528b08b6284ccd0805ce8836d171b8df7

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 698780d..aa5df01 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
 		qadevOOo \
 	) \
+	regexp \
     reportbuilder \
     reportdesign \
     rsc \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2c6a6b2..879eb26 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoi
 l ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoil ure x
 mlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 9e1e86605f7d987e7193aa30dc5f3d96fadcb5a9
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:07:10 2012 +0200

    move twain to tail_build
    
    Change-Id: I8d749eeb4229d0c7ef616aabab0e33bdfb8ea773

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index b8f4961..698780d 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -102,6 +102,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     test \
     toolkit \
 	tools \
+	$(if $(filter TWAIN,$(BUILD_TYPE)),\
+		twain \
+	) \
     ucb \
     unixODBC \
     UnoControls \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 24d4de7..2c6a6b2 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper
  udkapi unoil ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper udkapi unoi
 l ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit b431c9eb160500549df3d4751d5ab26b564897c9
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:06:04 2012 +0200

    move sane to tail_build
    
    Change-Id: I605ee6700d5d51eb6e06e97482ccd482ebb13e22

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 3d76765..b8f4961 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -75,6 +75,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     reportbuilder \
     reportdesign \
     rsc \
+	$(if $(filter SANE,$(BUILD_TYPE)),\
+		sane \
+	) \
 	sax \
     sc \
     scaddins \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 86c0ae9..24d4de7 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui
  ucbhelper udkapi unoil ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui ucbhelper
  udkapi unoil ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 0799823e87583cdeeabe85433e9acb00bd06e8f6
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:05:01 2012 +0200

    move sax to tail_build
    
    Change-Id: If269e6b011714766818ce4b1f56c7006ab8020c3

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 77c3e57..3d76765 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     reportbuilder \
     reportdesign \
     rsc \
+	sax \
     sc \
     scaddins \
     sccomp \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index bfe9846..86c0ae9 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper sax solenv soltools stoc s
 ysui ucbhelper udkapi unoil ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper solenv soltools stoc sysui
  ucbhelper udkapi unoil ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 6c876b7e32707e42b423f48838e9588b03959645
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:03:48 2012 +0200

    move qadevOOo to tail_build
    
    Change-Id: Ice1555795632831117283ba180b88bd2734f55c2

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 0f51738..77c3e57 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -69,6 +69,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     package \
     padmin \
     psprint_config \
+	$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
+		qadevOOo \
+	) \
     reportbuilder \
     reportdesign \
     rsc \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index d7bd86f..bfe9846 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper sax sole
 nv soltools stoc sysui ucbhelper udkapi unoil ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper sax solenv soltools stoc s
 ysui ucbhelper udkapi unoil ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 77fa4ee51bc34aafd9ab4b1071df1a42f07bd390
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:02:36 2012 +0200

    move unotest to tail_build
    
    Change-Id: I9dd5fbfc82e01a04e90fc249964412778f728d0e

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 9c968d3..0f51738 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     unixODBC \
     UnoControls \
     unodevtools \
+	unotest \
     unotools \
     unoxml \
     uui \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 0aefb74..d7bd86f 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper sax sole
 nv soltools stoc sysui ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper sax sole
 nv soltools stoc sysui ucbhelper udkapi unoil ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 5e4eee13d0a0aedcc9f96560e0913945111e2c97
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 12:00:51 2012 +0200

    move basegfx and o3tl to tail_build
    
    Change-Id: Idaf053adc621035ebc3b7a124bdffde869ce5def

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index eb9c057..9c968d3 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     avmedia \
     basctl \
     basebmp \
+	basegfx \
     basic \
     bean \
     canvas \
@@ -62,6 +63,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     MathMLDTD \
     Mesa \
     np_sdk \
+	o3tl \
     oovbaapi \
     oox \
     package \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8ea600e..0aefb74 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper 
 sax solenv soltools stoc sysui ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper sax sole
 nv soltools stoc sysui ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit d2f23a2c8bc46b714ab7ecf003fd30f5a8886d4e
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 11:59:16 2012 +0200

    move i18npool to tail_build
    
    Change-Id: I2854abb5b5bffb029259195cfdabb4722f00bc84

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 1c4664c..eb9c057 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     fpicker \
     framework \
     hwpfilter \
+	i18npool \
     idl \
     lingucomponent \
     linguistic \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 81b5950..8ea600e 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools external i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper sax solenv sol
 tools stoc sysui ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools external i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo regexp RHINO:rhino ridljar sal salhelper 
 sax solenv soltools stoc sysui ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit d7767f6a8464b917c99d37dfd63882058cdf63b4
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 11:56:50 2012 +0200

    move tools to tail_build
    
    Change-Id: I4e8ccd71b178d24b95fffe10bb22f075df83a8c9

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 86d236b..1c4664c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     swext \
     test \
     toolkit \
+	tools \
     ucb \
     unixODBC \
     UnoControls \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8f3aba8..81b5950 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper sax solenv soltools sto
 c sysui tools ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon DESKTOP:setup_native TRANSLATIONS:translations TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools external i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper sax solenv sol
 tools stoc sysui ucbhelper udkapi unoil unotest ure xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 8d62893e7a4f38af2872a0c80d9ebed5f7bacf76
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 21:09:14 2012 +0200

    basegfx needs o3tl headers
    
    Change-Id: Icdd490639de136ea866d6ef43016befefeb06604

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 64e5a10..6646eb1 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -28,7 +28,10 @@
 
 $(eval $(call gb_Library_Library,basegfx))
 
-$(eval $(call gb_Library_use_package,basegfx,basegfx_inc))
+$(eval $(call gb_Library_use_packages,basegfx,\
+	basegfx_inc \
+	o3tl_inc \
+))
 
 $(eval $(call gb_Library_set_include,basegfx,\
 	-I$(SRCDIR)/basegfx/inc \
commit dddf205a610467c885e38180ade0c7d5e0755c33
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 19:51:31 2012 +0200

    add missing dependency
    
    Change-Id: Iadd19f68ee4ed49842d6669354de6c1dca515cfc

diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index d63d3e4..37c9474 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -54,7 +54,7 @@ $(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \
 		$(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
 			-o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
 
-$(i18npool_LDDIR)/saxparser.input :| $(i18npool_LDDIR)/.dir
+$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@
 
commit 5a555e86108239be90ab173c90cb7dae845f8e7d
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 13:22:39 2012 +0200

    these makefiles are not created anymore
    
    Change-Id: I430fcca0df44966e05a57d1cafd16d18bebdca81

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 92f9e22..9d2dd1e 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -26,10 +26,6 @@
 #*************************************************************************
 LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
-.INCLUDE .IGNORE : comphelper/version.mk
-.INCLUDE .IGNORE : ucbhelper/version.mk
-.INCLUDE .IGNORE : connectivity/version.mk
-
 .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 # workaround for MinGW to get the same DLL names as with MSC
commit 9eed485db35b14f4c4bf0a5849b4baf0039e4293
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 13:17:40 2012 +0200

    bin i18npool/version.mk, hardcode the version
    
    This makefile must be included from other makefiles, which means it must
    be delivered first, which does not play so well with gbuild's
    all-in-one-process build. Because the version has not changed once since
    the library was introduced in 2006, I consider this just an unecessary
    complication of already complex build process.
    
    Change-Id: I8304f0e8ef9e59a046b10f423dbe61d75e3fc5c2

diff --git a/i18npool/Package_inc.mk b/i18npool/Package_inc.mk
index 9fd2f20..69eaf0c 100644
--- a/i18npool/Package_inc.mk
+++ b/i18npool/Package_inc.mk
@@ -28,8 +28,6 @@
 
 $(eval $(call gb_Package_Package,i18npool_inc,$(SRCDIR)/i18npool/inc))
 
-$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/version.mk,../version.mk))
-
 $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/i18npooldllapi.h,i18npool/i18npooldllapi.h))
 $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/lang.h,i18npool/lang.h))
 $(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/mslangid.hxx,i18npool/mslangid.hxx))
diff --git a/i18npool/version.mk b/i18npool/version.mk
deleted file mode 100644
index ebd5134..0000000
--- a/i18npool/version.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# target
-ISOLANG_TARGET=i18nisolang
-
-# major 
-ISOLANG_MAJOR=1
-# minor 
-ISOLANG_MINOR=0
-# micro 
-ISOLANG_MICRO=0
-
-# this is a c++ library 
-ISOLANG_CPP=0
-
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 927c4e1..928edad 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -134,10 +134,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_ZLIB_DLL \
 ))
 
-include $(OUTDIR)/inc/i18npool/version.mk
-
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	-DISOLANG_MAJOR=$(ISOLANG_MAJOR) \
 	$(if $(filter MACOSX,$(OS)),\
 		-DENABLE_CAIROCANVAS \
 	) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0b4a78e..b2a6cbb 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -706,9 +706,9 @@ End
 
 File gid_File_Lib_I18nisolang
   #ifdef UNX
-    Name = STRING(CONCAT4(libi18nisolang,ISOLANG_MAJOR,COMID,UNXSUFFIX));
+    Name = STRING(CONCAT3(libi18nisolang1,COMID,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(i18nisolang,ISOLANG_MAJOR,COMID,.dll));
+    Name = STRING(CONCAT3(i18nisolang1,COMID,.dll));
   #endif
     PACKED_LIB_FILE_BODY;
 End
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index c8259bd..92f9e22 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
-.INCLUDE .IGNORE : i18npool/version.mk
 .INCLUDE .IGNORE : comphelper/version.mk
 .INCLUDE .IGNORE : ucbhelper/version.mk
 .INCLUDE .IGNORE : connectivity/version.mk
@@ -67,7 +66,7 @@ ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
 .ENDIF
 I18NUTILLIB=-li18nutil$(COMID)
-I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
+I18NISOLANGLIB=-li18nisolang1$(COMID)
 I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
 SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION)
 XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
commit 2b3fc45d256b1969cd0bbd4601eb70d03801d07f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 24 17:13:03 2012 +0200

    do not build tail_build modules outside of tail_build
    
    There are several modules in tail_build now that are depended on by
    other modules from postprocess (e.g., pyuno depends on 18npool). That
    means that build.pl actually schedules i18npool (and its parents) for
    build. This is fine for build.pl -P1, but it could be a problem for
    build.pl -P2. It is also wasteful, because we are not actually using
    tail_build to the full extent.
    
    This gross hack schedules all modules that depend on any tail_build
    module _after_ tail_build, so all modules that are in tail_build are
    only build in tail_build.
    
    Change-Id: I39840c1cbbfc5024f0009296416c628be028657a

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index fbdffcd..74d0f32 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -188,6 +188,12 @@
     my $new_line = "\n";
     my $incompatible = 0;
     my $local_host_ip = 'localhost';
+    my $tail_build_modules_mk = "$ENV{SOLARENV}/gbuild/tail_build_modules.mk";
+    my $tail_build_module_dir = $ENV{"SRCDIR"};
+    my $tail_build_prj = "tail_build";
+    my $cross_tail_build_prj = "cross_tail_build";
+    my $total_modules = 0;
+
 ### main ###
 
     get_options();
@@ -545,6 +551,76 @@ sub expand_dependencies {
 };
 
 #
+# Gets list of tail_build modules.
+#
+sub get_tail_build_modules {
+    my $tail_build_prj = shift;
+    my $make = $ENV{'GNUMAKE'};
+
+    my $tail_build_mk = "$tail_build_module_dir/Module_$tail_build_prj.mk";
+    my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk`;
+    chomp $modules_str;
+
+    my %modules = ();
+    foreach my $module (split /\s+/, $modules_str) {
+        $modules{$module} = 1;
+    }
+    return %modules;
+}
+
+sub _filter_tail_build_dependencies {
+    my $deps_hash = shift;
+    my $tail_build_prj = shift;
+
+    if (!defined $$deps_hash{$tail_build_prj}) {
+        # nothing to do
+        return;
+    }
+
+    my %tail_build_modules = get_tail_build_modules($tail_build_prj);
+
+    # first remove tail_build modules from deps.
+    foreach my $prj (keys %tail_build_modules) {
+        if (defined $$deps_hash{$prj}) {
+            delete $$deps_hash{$prj};
+        }
+    }
+
+    # do the actual replacement
+    foreach my $prj (keys %$deps_hash) {
+        my @tail_build_deps = ();
+        my $deps = $$deps_hash{$prj};
+
+        # remove deps. that are in tail_build
+        foreach my $dep (keys %$deps) {
+            if (defined $tail_build_modules{$dep}) {
+                print "$prj depends on $tail_build_prj\[$dep\]\n";
+                push @tail_build_deps, $dep;
+                delete $$deps{$dep};
+            }
+        }
+
+        # insert dep. on tail_build, if necessary
+        if (@tail_build_deps && !defined $$deps{$tail_build_prj}) {
+            $$deps{$tail_build_prj} = 1;
+        }
+    }
+}
+
+#
+# Replaces all deps on modules from tail_build by dep on tail_build
+# itself. I.e., if a module foo depends on (sal, sfx2, svx) and (sfx2,
+# svx) are in tail_build, foo will be depending on (sal, tail_build).
+#
+# Works on cross_tail_build too, in case of cross-compilation.
+#
+sub filter_tail_build_dependencies {
+    my $deps_hash = shift;
+    _filter_tail_build_dependencies($deps_hash, $tail_build_prj);
+    _filter_tail_build_dependencies($deps_hash, $cross_tail_build_prj);
+}
+
+#
 # This procedure fills the second hash with reversed dependencies,
 # ie, with info about modules "waiting" for the module
 #
@@ -569,6 +645,7 @@ sub build_all {
     if ($build_all_parents) {
         my ($prj, $prj_dir, $orig_prj);
         get_parent_deps( $initial_module, \%global_deps_hash);
+        filter_tail_build_dependencies(\%global_deps_hash);
         if (scalar keys %active_modules) {
             $active_modules{$initial_module}++;
             $modules_types{$initial_module} = 'mod';
@@ -1916,7 +1993,9 @@ sub print_announce {
         $text = "Building module $prj\n";
     };
 
-    my $total_modules = scalar(keys %build_lists_hash);
+    if (!$total_modules) {
+        $total_modules = scalar(keys %global_deps_hash) + 1;
+    }
     my $modules_started = scalar(keys %module_announced) + 1;
     $text = "($modules_started/$total_modules) $text";
 
diff --git a/solenv/gbuild/tail_build_modules.mk b/solenv/gbuild/tail_build_modules.mk
new file mode 100644
index 0000000..e5301f4
--- /dev/null
+++ b/solenv/gbuild/tail_build_modules.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+TAIL_BUILD_MODULES :=
+
+gb_Module_Module :=
+
+define gb_Module_add_moduledirs
+TAIL_BUILD_MODULES += $(2)
+
+endef
+
+ifneq ($(value TAIL_BUILD_MK),)
+include $(TAIL_BUILD_MK)
+else
+$(error TAIL_BUILD_MK must be set to path to Module_tail_build.mk)
+endif
+
+.PHONY : get_modules
+
+get_modules :
+	@echo $(TAIL_BUILD_MODULES)
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:


More information about the Libreoffice-commits mailing list