ooo-build r11651 - trunk/patches/src680

[michael svn gnome org]

Author: michael
Date: Wed Feb 20 18:33:19 2008
New Revision: 11651
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11651&view=rev

Log:
remember to register hard-linked libraries ...


Modified:
   trunk/patches/src680/apply
   trunk/patches/src680/unit-deliver.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Feb 20 18:33:19 2008
@@ -2021,6 +2021,9 @@
 unittesting-xmlscript.diff
 unittesting-xmlsecurity.diff
 
+# experimental hacks !
+unit-deliver.diff
+unit-comphelper.diff
 
 [ ReducedDefaults ]
 SectionOwner => jholesov

Modified: trunk/patches/src680/unit-deliver.diff
==============================================================================
--- trunk/patches/src680/unit-deliver.diff	(original)
+++ trunk/patches/src680/unit-deliver.diff	Wed Feb 20 18:33:19 2008
@@ -1,31 +1,10 @@
-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	20 Feb 2008 11:51:07 -0000
++++ solenv/bin/deliver.pl	20 Feb 2008 18:32:16 -0000
 @@ -40,6 +40,8 @@ eval 'exec perl -wS $0 ${1+"$@"}'
  # deliver.pl - copy from module output tree to solver
  #
@@ -191,7 +170,15 @@
      my $from_stat_ref;
      my $rc = 0;
      
-@@ -841,6 +964,9 @@ sub copy_if_newer 
+@@ -788,6 +911,7 @@ sub copy_if_newer 
+         # hard link if possible
+         if( link($from, $to) ){
+             print "LINK: $from -> $to\n" if !$opt_silent;
++	    register_queue ($register, $to);
+             return 1;
+         }
+     }
+@@ -841,6 +965,9 @@ sub copy_if_newer 
                  system("macosx-create-bundle", "$to=$from.app") if ( -d "$from.app" );
                  system("ranlib", "$to" ) if ( $to =~ /\.a/ );
              }
@@ -201,7 +188,7 @@
              return 1;
          }
          else {
-@@ -854,6 +980,7 @@ sub copy_if_newer 
+@@ -854,6 +981,7 @@ sub copy_if_newer 
              print_error("directory '$destdir' does not exist", 0);
          }
      }