diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:57:35 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:57:35 +0200 |
| commit | 1e46f2b286b06d86ff26a8b141ad7775f985cf28 (patch) | |
| tree | 3fa5d56dfc1b5fc4ea9ba8fe39422b22ca31ce4c | |
| parent | 8f586ea935b0a67219355bc3e8ce65d15449f8f5 (diff) | |
| parent | b31b80743ae0a20364b171d6f14569f16f812bb5 (diff) | |
resyncing to masterfeature/gnumake4
| -rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 3 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 1 | ||||
| -rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
| -rw-r--r-- | postprocess/rebase/coffbase.txt | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl index fdc23c6..f28a87d 100644 --- a/postprocess/checkdeliver/checkdeliver.pl +++ b/postprocess/checkdeliver/checkdeliver.pl @@ -196,8 +196,7 @@ sub check my $canread = is_moduledirectory( $path ); if ( ! $canread ) { # do not bother about non existing modules in local environment - # or on childworkspaces - if (( $local_env ) || ( $ENV{CWS_WORK_STAMP} )) { + if ( $local_env ) { return $error; } # in a master build it is considered an error to have deliver leftovers diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 2e125f4..96288ba 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -148,7 +148,6 @@ my_components = \ pcr \ pdffilter \ placeware \ - preload \ protocolhandler \ res \ sb \ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index f344e41..ca84711 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls ure xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL +po postprocess :: accessibility DESKTOP:automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n DESKTOP:desktop dtrans embeddedobj embedserv EPM:epm eventattacher DESKTOP:extensions extras filter forms fpicker DESKTOP: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 uui oox 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/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index 199a894..69665f0 100644 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -208,7 +208,6 @@ pdfimport.uno.dll 0x0000000060bf0000 0x000a0000 placewaremi.dll 0x0000000060bd0000 0x00010000 plmi.dll 0x0000000060b90000 0x00030000 pptimportermi.dll 0x0000000060b70000 0x00010000 -preloadmi.dll 0x0000000060b40000 0x00020000 productregistration.uno.dll 0x0000000060b20000 0x00010000 protocolhandlermi.dll 0x0000000060b00000 0x00010000 proxyfac.uno.dll 0x0000000060ae0000 0x00010000 @@ -260,7 +259,6 @@ smmi.dll 0x000000005e7f0000 0x00090000 smplmail.uno.dll 0x000000005e7d0000 0x00010000 sn_tools.dll 0x000000005e7a0000 0x00020000 so_activex.dll 0x000000005e770000 0x00020000 -socomp.dll 0x000000005e750000 0x00010000 sofficeapp.dll 0x000000005e6e0000 0x00060000 soldepmi.dll 0x000000005e6a0000 0x00030000 solvermi.dll 0x000000005e680000 0x00010000 |