aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Luc Lamadon <jean-luc.lamadon@nokia.com>2010-02-25 15:49:58 +0200
committerJean-Luc Lamadon <jean-luc.lamadon@nokia.com>2010-02-25 15:49:58 +0200
commit41d44c0e711f5fa416755c5fbb4b359ec3fadc39 (patch)
treebb5bae90090ebaa32ff4e23f5cb0a8ebccbc7d27
parent347e4b58f5b86369334a04bf75f17053f8097e69 (diff)
Updated how to provide context properties documentation
Reverted scratchbox sanitization
-rwxr-xr-xdebian/rules9
-rw-r--r--doc/context-providers.txt14
2 files changed, 8 insertions, 15 deletions
diff --git a/debian/rules b/debian/rules
index 581b6e4f..e11e5ec2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,6 @@
ifneq (,$(wildcard /targets))
export SBOX_REDIRECT_TO_DIRS=
export PATH=/scratchbox/compilers/bin:/bin:/usr/bin:/scratchbox/tools/bin
- rc:=$(shell debian/fixup-scratchbox >&2)
- ifneq (,$(FAKEROOTKEY))
- ifneq (/usr/lib/libfakeroot/libfakeroot-sysv.so,$(LD_PRELOAD))
- export FAKEROOTKEY=$(shell /usr/bin/faked-sysv | cut -d: -f1)
- export LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-sysv.so
- endif
- endif
endif
LDFLAGS+=-Wl,--as-needed
@@ -33,7 +26,7 @@ build-stamp: Makefile
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp
[ -f Makefile ] && $(MAKE) distclean || true
dh_clean
diff --git a/doc/context-providers.txt b/doc/context-providers.txt
index 956dc722..46dcb8e6 100644
--- a/doc/context-providers.txt
+++ b/doc/context-providers.txt
@@ -138,20 +138,20 @@ Guidelines for property providers
Names
~~~~~
-Context property names can contain any character except "/".
+Context FW maintains a list of core properties. If you are providing a core property, you need to name it as it is described in the core property list (e.g., Screen.TopEdge).
+Only core property names are allowed to start with a capital ASCII letter ("A" to "Z").
-Only core property names are allowed to start with a capital ASCII
-letter ("A" to "Z").
+If you want to provide a non-core property, its name must be a valid name for a D-Bus object path (e.g., /com/mycompany/screen/topedge). A valid D-Bus object path starts with "/" and contains zero or more elements separated by "/" . Each element must only contain the following characters: [A-Z][a-z][0-9]_
When defining a new non-core property, you need to choose a unique
prefix. Start with a reversed fully qualified domainname that you
-control, such as "com.nokia." or "org.gnome.". Then, if the first
-component is "org" and the second component is not a top-level domain,
+control, such as "/com/nokia/" or "/org/gnome/". Then, if the first
+component is "org" and the second component is not a top-level domain (e.g. fi, com),
drop "org". Then convert the first character of the prefix to
lower-case if it is one of "A" to "Z".
-For example, the GNOME project can use "gnome." as their prefix, KDE
-can use "kde.", and Nokia can use "com.nokia.".
+For example, the GNOME project can use "/gnome/" as their prefix, KDE
+can use "/kde/", and Nokia can use "/com/nokia/".
Providing core properties
-------------------------