summaryrefslogtreecommitdiff
path: root/offapi
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2010-09-17 10:26:53 +0200
committerJan Holesovsky <kendy@suse.cz>2010-09-17 12:34:35 +0200
commit2d2ef785745a258659ccb3c262265ae2cd1990a9 (patch)
treef5a094f1daf16da3b8e517493a507af50c5b1c64 /offapi
parentaf2342e4c7de34b0e698b12b226e5195552be35c (diff)
offapi-typecheck-whitelist.diff: Removed blunt instrument from offapi types.
Added whitelist file that contains the typenames which are permitted to change.
Diffstat (limited to 'offapi')
-rw-r--r--offapi/util/makefile.mk9
-rw-r--r--offapi/util/types-whitelist1
2 files changed, 7 insertions, 3 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 016180d7765c..2518876ca4d1 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -176,13 +176,16 @@ $(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
- $(COMMAND_ECHO)$(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
+ $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
&& echo > $(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
$(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@
.INCLUDE : target.mk
diff --git a/offapi/util/types-whitelist b/offapi/util/types-whitelist
new file mode 100644
index 000000000000..343bede08724
--- /dev/null
+++ b/offapi/util/types-whitelist
@@ -0,0 +1 @@
+-x /UCR/com/sun/star/drawing/TextFitToSizeType