CWS rtspare01: #i107135# Re-activate postprocess/checkdeliver

2 files changed, 24 insertions, 24 deletions

diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index e840da33b7cf..2baec9d0ef36 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -46,13 +46,18 @@ use SourceConfig;
 
 #### globals #####
 
-my $err       = 0;
-my $srcrootdir    = '';
-my $solverdir = '';
-my $platform  = '';
-my $milestoneext = '';
-my $local_env = 0;
-my @exceptionmodlist = ("postprocess", "instset.*native"); # modules not yet delivered
+my $err              = 0;
+my $srcrootdir       = '';
+my $solverdir        = '';
+my $platform         = '';
+my $milestoneext     = '';
+my $local_env        = 0;
+my $source_config    = SourceConfig -> new();
+my @exceptionmodlist = (
+                        "postprocess",
+                        "instset.*native",
+                        "smoketest.*native"
+                       ); # modules not yet delivered
 
 #### main #####
 
@@ -147,7 +152,6 @@ sub check
     my $error = 0;
     my %delivered;
     my $module;
-    my $islinked = 0;
     STDOUT->autoflush(1);
     # which module are we checking?
     if ( $listname =~ /\/([\w-]+?)\/deliver\.log$/o) {
@@ -156,31 +160,29 @@ sub check
         print "Error: cannot determine module name from \'$listname\'\n";
         return 1;
     }
-    # where do we have to loog for modules?
-    my $source_config = SourceConfig -> new();
+    # where do we have to look for modules?
     my $repository = $source_config->get_module_repository($module);
     my $path = $source_config->get_module_path($module);
     # is module physically accessible?
+    # there are valid use cases where we build against a prebuild solver whithout having
+    # all modules at disk
     my $canread = is_moduledirectory( $path );
     if ( ! $canread ) {
         # do not bother about non existing modules in local environment
-        if ( $local_env ) {
-            # print STDERR "Warning: local environment, module '$module' not found. Skipping.\n";
-            return $error;
-        }
-        # on CWS modules not added can exist as links. For windows it may happen that these
-        # links cannot be resolved (when working with nfs mounts). This prevents checking,
-        # but is not an error.
-        if ( $ENV{CWS_WORK_STAMP} ) {
+        # or on childworkspaces
+        if (( $local_env ) || ( $ENV{CWS_WORK_STAMP} )) {
             # print STDERR "Warning: module '$module' not found. Skipping.\n";
             return $error;
         }
+        # in a master build it is considered an error to have deliver leftovers
+        # from non exising (removed) modules
         print "Error: module '$module' not found.\n";
         $error++;
         return $error;
     }
     if ( $canread == 2 ) {
         # module is linked and not built, no need for checking
+        # should not happen any more nowadays ...
         return $error;
     }
 
@@ -206,10 +208,6 @@ sub check
     foreach my $file ( sort keys %delivered ) {
         my $ofile = "$srcrootdir/$repository/$file";
         my $sfile = "$solverdir/$delivered{$file}";
-        # on CWS modules may exist as link only, named <module>.link
-        if ( $islinked ) {
-            $ofile =~ s/\/$module\//\/$module.link\//;
-        }
         if ( $milestoneext ) {
             # deliver log files do not contain milestone extension on solver
             $sfile =~ s/\/$platform\/(...)\//\/$platform\/$1$milestoneext\//;
@@ -217,6 +215,7 @@ sub check
         my $orgfile_stats = stat($ofile);
         next if ( -d _ );  # compare files, not directories
         my $delivered_stats = lstat($sfile);
+        next if ( -d _ );  # compare files, not directories
         if ( $^O !~ /^MSWin/ ) {
             # windows does not know about links.
             # Therefore lstat() is not a lstat, and the following check would break
@@ -288,7 +287,7 @@ sub usage
 {
     my $retval = shift;
     print STDERR "Usage: checkdeliver.pl [-h] [-p <platform>]\n";
-    print STDERR "Compares delivered files on solver with original ones on SRC_ROOT\n";
+    print STDERR "Compares delivered files on solver with original ones in build tree\n";
     print STDERR "Options:\n";
     print STDERR "    -h              print this usage message\n";
     print STDERR "    -p platform     specify platform\n";
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4064e4b04b93..af79cb297a5a 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,6 +1,7 @@
 po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
+po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
-po	postprocess\rebase	    	nmake	-	w	po_rebase NULL
+po	postprocess\rebase	    	nmake	-	w	po_rebase po_checkdlv NULL
 po	postprocess\signing	    	nmake	-	w,sign	po_signing po_rebase.w NULL