summaryrefslogtreecommitdiff
path: root/offapi/type_reference
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-24 12:18:54 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-04-24 12:20:31 +0200
commit826e787733d1d5e82b8fcc20de9e569c6a0ae5fd (patch)
tree823f818d43cf532b41dd33f24abc6221807e7517 /offapi/type_reference
parentb3bf16a5c4f863798adca8d322d63e9face64686 (diff)
Split offapi/type_reference/types.rdb in two
...now that UnoApiMerge_types is gone. Change-Id: Ie33aeb09692e3b3d851f2278714b037e183b627c
Diffstat (limited to 'offapi/type_reference')
-rw-r--r--offapi/type_reference/offapi.rdb (renamed from offapi/type_reference/types.rdb)bin7439360 -> 6812672 bytes
-rw-r--r--offapi/type_reference/typelibrary_history.txt2
-rwxr-xr-xoffapi/type_reference/update-rdb.sh16
3 files changed, 10 insertions, 8 deletions
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/offapi.rdb
index 097590fe8c91..d72a454c845d 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/offapi.rdb
Binary files differ
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 1103db8c1bbb..7bc723fb2734 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -184,4 +184,4 @@
Update css.awt.UnoControlDialog to reflect the supported XDialog2 interface
additionally to XDialog
-For later changes, consult the git log of the accompanying types.rdb file.
+For later changes, see offapi/README.
diff --git a/offapi/type_reference/update-rdb.sh b/offapi/type_reference/update-rdb.sh
index 79fd29cac01d..cbe33b639b6e 100755
--- a/offapi/type_reference/update-rdb.sh
+++ b/offapi/type_reference/update-rdb.sh
@@ -10,28 +10,30 @@
set -e
# Basic argument checks
-if [ $# -lt 1 ]
+if [ $# -lt 2 ]
then
echo "usage:"
- echo " make cmd cmd='$0 <idl file list>'"
+ echo " make cmd cmd='$0 <rdb file> <idl file list>'"
echo ""
echo "example:"
echo " make cmd cmd='$0"
+ echo " offapi/type_reference/offapi.rdb"
echo " offapi/com/sun/star/auth/SSOManagerFactory.idl"
echo " offapi/com/sun/star/auth/SSOPasswordCache.idl'"
exit 1
fi
+rdb=${1?}
+shift
mkdir tmp
for i in "$@"; do
"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out1.rdb /UCR \
"${WORKDIR_FOR_BUILD?}"/UnoApiPartTarget/"${i%.idl}".urd
done
-"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / \
- "${SRC_ROOT?}"/offapi/type_reference/types.rdb tmp/out1.rdb
+"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / "${SRC_ROOT?}"/"${rdb?}" \
+ tmp/out1.rdb
echo "sanity check diff:"
-diff <("${OUTDIR_FOR_BUILD?}"/bin/regview \
- "${SRC_ROOT?}"/offapi/type_reference/types.rdb) \
+diff <("${OUTDIR_FOR_BUILD?}"/bin/regview "${SRC_ROOT?}"/"${rdb?}") \
<("${OUTDIR_FOR_BUILD?}"/bin/regview tmp/out2.rdb) && $? -le 1
-mv tmp/out2.rdb "${SRC_ROOT?}"/offapi/type_reference/types.rdb
+mv tmp/out2.rdb "${SRC_ROOT?}"/"${rdb?}"
rm -r tmp