ooo-build r13331 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jul 21 19:18:56 2008
New Revision: 13331
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13331&view=rev

Log:
	* patches/dev300/apply:
	* patches/dev300/offapi-typecheck-whitelist.diff: removed blunt
	instrument from offapi types.rdb compat check, added whitelist
	file that contains the typenames which are permitted to change.



Added:
   trunk/patches/dev300/offapi-typecheck-whitelist.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/fit-list-to-size.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 21 19:18:56 2008
@@ -406,6 +406,7 @@
 
 [ FixesNotForUpstream ]
 presenterscreen-no-license.diff
+offapi-typecheck-whitelist.diff, thorsten
 
 # ensure macros are imported ( not as comments ) for calc
 vba-default-enable-calcmacros.diff

Modified: trunk/patches/dev300/fit-list-to-size.diff
==============================================================================
--- trunk/patches/dev300/fit-list-to-size.diff	(original)
+++ trunk/patches/dev300/fit-list-to-size.diff	Mon Jul 21 19:18:56 2008
@@ -16,29 +16,6 @@
   
  }; 
   
-diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
-index 1451ec9..1f3c33c 100644
---- offapi/util/makefile.mk
-+++ offapi/util/makefile.mk
-@@ -175,12 +175,13 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udk
- #JSC: i have removed the doc rdb because all type information is already in the
- #     types.rdb, even the service and singleton type info. IDL docu isn't checked.
- $(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
--    $(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db \
--        && echo > $(REGISTRYCHECKFLAG)
-+#    $(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db \
-+#        && echo > $(REGISTRYCHECKFLAG)
-+	$(TOUCH) $(REGISTRYCHECKFLAG)
- 
- #JSC: new target to prepare some UNO type statistics, the ouput will be later used
- #     for versioning of UNO cli type libraries
--$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
-+$(UNOTYPE_STATISTICS) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
-     $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
- 
- .INCLUDE :  target.mk
-diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java
-index 2df70f7..76e70f6 100644
 --- qadevOOo/runner/util/ValueChanger.java
 +++ qadevOOo/runner/util/ValueChanger.java
 @@ -389,7 +389,7 @@ public class ValueChanger {

Added: trunk/patches/dev300/offapi-typecheck-whitelist.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/offapi-typecheck-whitelist.diff	Mon Jul 21 19:18:56 2008
@@ -0,0 +1,27 @@
+--- offapi/util/makefile.mk	1 Jul 2008 16:26:45 -0000	1.109
++++ offapi/util/makefile.mk	21 Jul 2008 15:05:38 -0000
+@@ -174,13 +176,17 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/u
+ #
+ #JSC: i have removed the doc rdb because all type information is already in the
+ #     types.rdb, even the service and singleton type info. IDL docu isn't checked.
+-$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
+-    $(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db \
++#
++#Use the types-whitelist to exclude published API from signalling incompatibility. 
++#Handle with care.
++$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db types-whitelist
++    $(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
+         && echo > $(REGISTRYCHECKFLAG)
++	$(TOUCH) $(REGISTRYCHECKFLAG)
+ 
+ #JSC: new target to prepare some UNO type statistics, the ouput will be later used
+ #     for versioning of UNO cli type libraries
+-$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
++$(UNOTYPE_STATISTICS) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
+     $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+ 
+ .INCLUDE :  target.mk
+--- /dev/null	2007-09-21 21:12:45.000000000 +0200
++++ offapi/util/types-whitelist	2008-07-21 17:03:10.000000000 +0200
+@@ -0,0 +1 @@
++-x /UCR/com/sun/star/drawing/TextFitToSizeType