[Libreoffice-commits] .: 3 commits - lotuswordpro/prj Module_tail_build.mk postprocess/prj solenv/bin tail_build/prj
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Aug 21 03:00:44 PDT 2011
Module_tail_build.mk | 1 +
postprocess/prj/build.lst | 2 +-
solenv/bin/build.pl | 2 +-
solenv/bin/modules/SourceConfig.pm | 4 ++--
tail_build/prj/build.lst | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit e503a7e6cac348e3b57641692085044ade1aa8f9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Aug 21 05:00:14 2011 -0500
bring sccomp into the tail_build fold
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 74e4b0f..2cf5cdb 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
padmin \
reportdesign \
sc \
+ sccomp \
sd \
slideshow \
starmath \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index ac0c6bb..89fb5fd 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 4152e34..c9e74d1 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio MDDS:mdds MESA:Mesa OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl xmloff xmlscript NULL
+tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MESA:Mesa OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure vbahelper vcl xmloff xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 51836d616f8542b65044e2824f0d07248e9abd9f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Aug 21 04:59:39 2011 -0500
remove debugging print
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index eb02f4f..19f5b46 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1821,7 +1821,7 @@ sub run_job {
getcwd();
my $log_file = $jobs_hash{$registered_name}->{LONG_LOG_PATH};
- print "logfile:$log_file\n";
+
my $log_dir = File::Basename::dirname($log_file);
if ( $source_config->is_gbuild($jobs_hash{$registered_name}->{MODULE}) )
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 3880d14..b96cde9 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -149,12 +149,12 @@ sub get_module_build_list {
if (-e $module_path . "/prj/makefile.mk" )
{
- print "module $module -> gbuild\n";
+# print "module $module -> gbuild\n";
${$self->{MODULE_GBUILDIFIED}}{$module} = 1;
}
else
{
- print "module $module -> dmake\n";
+# print "module $module -> dmake\n";
${$self->{MODULE_GBUILDIFIED}}{$module} = 0;
}
return $module_path . "/prj/build.lst";
commit 960e26e8271633e3b807be5c1f8e4b5cfff93e6c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Aug 21 04:37:56 2011 -0500
lotuswordpro is in tail_build, it should not be in postprocess pre-req
diff --git a/lotuswordpro/prj/makefile.mk b/lotuswordpro/prj/makefile.mk
old mode 100755
new mode 100644
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 7a35ac8..ac0c6bb 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility DESKTOP:automation bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
More information about the Libreoffice-commits
mailing list