ooo-build r11641 - in trunk: . patches/test

[michael svn gnome org]

Author: michael
Date: Wed Feb 20 11:53:26 2008
New Revision: 11641
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11641&view=rev

Log:
2008-02-20  Michael Meeks  <michael meeks novell com>

        * patches/test/built-in-unit-test.diff: improve deliver.pl
        patch, add tmp. configmgr hack to ignore non-conforming config
keys.



Modified:
   trunk/ChangeLog
   trunk/patches/test/built-in-unit-test.diff

Modified: trunk/patches/test/built-in-unit-test.diff
==============================================================================
--- trunk/patches/test/built-in-unit-test.diff	(original)
+++ trunk/patches/test/built-in-unit-test.diff	Wed Feb 20 11:53:26 2008
@@ -1,10 +1,51 @@
+Index: configmgr/qa/unit/makefile.mk
+===================================================================
+RCS file: /cvs/util/configmgr/qa/unit/makefile.mk,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 makefile.mk
+--- configmgr/qa/unit/makefile.mk	23 Nov 2007 13:58:12 -0000	1.2
++++ configmgr/qa/unit/makefile.mk	18 Feb 2008 17:06:43 -0000
+@@ -58,11 +58,7 @@ ALLTAR: test
+ 
+ $(MISC)$/$(TARGET).rdb .ERRREMOVE:
+     $(COPY) $(SOLARBINDIR)$/types.rdb $@
+-    regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/configmgr2.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/typeconverter.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/sax.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/simplereg.uno$(DLLPOST))
+-    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/streams.uno$(DLLPOST))
++    regmerge $@ / $(SOLARLIBDIR)$/services.rdb
+ 
+ test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
+     testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET).rdb#$(PWD)$/$(MISC)$/$(TARGET).registry"
+Index: configmgr/source/backend/layermerge.cxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/backend/layermerge.cxx,v
+retrieving revision 1.26
+diff -u -p -u -r1.26 layermerge.cxx
+--- configmgr/source/backend/layermerge.cxx	16 Sep 2006 15:05:04 -0000	1.26
++++ configmgr/source/backend/layermerge.cxx	20 Feb 2008 11:50:31 -0000
+@@ -936,7 +936,12 @@ void SAL_CALL LayerMergeHandler::setProp
+ 	m_pProperty->modifyState( node::isMerged );
+ 	m_aContext.markCurrentMerged();
+ 
+-    applyPropertyValue(aValue);
++    try {
++        applyPropertyValue(aValue);
++    } catch (script::CannotConvertException &ex) {
++        fprintf (stderr, "Foo - killed conversion exception!\n");
++        // the solver's Setup.xcu's "${PRODUCTVERSION}" is not an double eg.
++    } 
+ }
+ // -----------------------------------------------------------------------------
+ 
 Index: solenv/bin/deliver.pl
 ===================================================================
 RCS file: /cvs/tools/solenv/bin/deliver.pl,v
 retrieving revision 1.124
 diff -u -p -u -r1.124 deliver.pl
 --- solenv/bin/deliver.pl	26 Nov 2007 19:00:17 -0000	1.124
-+++ solenv/bin/deliver.pl	18 Feb 2008 16:57:01 -0000
++++ solenv/bin/deliver.pl	20 Feb 2008 11:51:07 -0000
 @@ -40,6 +40,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
  # deliver.pl - copy from module output tree to solver
  #
@@ -24,7 +65,25 @@
  #### script id #####
  
  ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; 
-@@ -757,6 +762,109 @@ sub strip_target {
+@@ -695,12 +700,16 @@ sub glob_and_copy 
+     my $touch = shift;
+ 
+     my @copy_files = @{glob_line($from, $to)};
++    my @register = ();
+     
+     for (my $i = 0; $i <= $#copy_files; $i++) {
+         next if filter_out($copy_files[$i][0]); # apply copy filter
+-        copy_if_newer($copy_files[$i][0], $copy_files[$i][1], $touch) 
++        copy_if_newer($copy_files[$i][0], $copy_files[$i][1], $touch, \ register) 
+                     ? $files_copied++ : $files_unchanged++;
+     }
++    for my $comp (@register) {
++	register_component ($comp);
++    }
+ }
+ 
+ sub is_unstripped {
+@@ -757,6 +766,119 @@ sub strip_target {
      return $rc;
  };
  
@@ -89,12 +148,19 @@
 +    return $searchname;
 +}
 +
-+sub register_component ($)
++sub register_queue ($$)
 +{
++    my $queue = shift;
 +    my $component = shift;
 +
 +    # Try to register all libraries
 +    $component =~ /\.(so|dylib|dll)/ || return;
++    push @$queue, $component;
++}
++
++sub register_component ($)
++{
++    my $component = shift;
 +
 +    my $solarlib = $ENV{SOLARVER}."/".$ENV{INPATH}."/lib";
 +    my $servicesfile = "$solarlib/services.rdb";
@@ -106,9 +172,10 @@
 +    my $systemcall = "$installer::globals::wrapcmd $regcomp " .
 +	"-register -r ".fix_cygwin_path($servicesfile).
 +	" -c " . $installer::globals::quote . $filestring . $installer::globals::quote .
-+	" -wop=" . $installer::globals::quote . $allvariableshashref->{'NATIVESERVICESURLPREFIX'} . $installer::globals::quote .
 +	" 2\>\&1 |";
 +
++#	" -wop=" . $installer::globals::quote . $allvariableshashref->{'NATIVESERVICESURLPREFIX'} . $installer::globals::quote .
++
 +    open (REG, "$systemcall");
 +    while (<REG>) {push(@regcompoutput, $_); }
 +    close (REG);
@@ -119,6 +186,8 @@
 +    if ($returnvalue == 256) {
 +	# has no component_ methods (?)
 +	print "non component: $component\n" if !$opt_silent;
++#	print "command: $systemcall";
++#	print "output: @regcompoutput";
 +	return;
 +    } elsif ($returnvalue == 0) {
 +	print "registered component: $component\n" if !$opt_silent;
@@ -134,19 +203,25 @@
  sub copy_if_newer 
  {
      # return 0 if file is unchanged ( for whatever reason )
-@@ -841,6 +949,11 @@ sub copy_if_newer 
+@@ -764,6 +886,7 @@ sub copy_if_newer 
+     my $from = shift;
+     my $to = shift;
+     my $touch = shift;
++    my $register = shift;
+     my $from_stat_ref;
+     my $rc = 0;
+     
+@@ -841,6 +964,9 @@ sub copy_if_newer 
                  system("macosx-create-bundle", "$to=$from.app") if ( -d "$from.app" );
                  system("ranlib", "$to" ) if ( $to =~ /\.a/ );
              }
 +
 +	    # register each component as it is delivered into a tests .rdb
-+#	    if (defined $ENV{QAREG}) {
-+		register_component ($to);
-+#	    }
++	    register_queue ($register, $to);
              return 1;
          }
          else {
-@@ -854,6 +967,7 @@ sub copy_if_newer 
+@@ -854,6 +980,7 @@ sub copy_if_newer 
              print_error("directory '$destdir' does not exist", 0);
          }
      }
@@ -154,23 +229,3 @@
      unlink($temp_file);
      return 0;
  }
-Index: configmgr/qa/unit/makefile.mk
-===================================================================
-RCS file: /cvs/util/configmgr/qa/unit/makefile.mk,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 makefile.mk
---- configmgr/qa/unit/makefile.mk	23 Nov 2007 13:58:12 -0000	1.2
-+++ configmgr/qa/unit/makefile.mk	18 Feb 2008 17:06:43 -0000
-@@ -58,11 +58,7 @@ ALLTAR: test
- 
- $(MISC)$/$(TARGET).rdb .ERRREMOVE:
-     $(COPY) $(SOLARBINDIR)$/types.rdb $@
--    regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/configmgr2.uno$(DLLPOST))
--    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/typeconverter.uno$(DLLPOST))
--    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/sax.uno$(DLLPOST))
--    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/simplereg.uno$(DLLPOST))
--    regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/streams.uno$(DLLPOST))
-+    regmerge $@ / $(SOLARLIBDIR)$/services.rdb
- 
- test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
-     testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET).rdb#$(PWD)$/$(MISC)$/$(TARGET).registry"