Fri, 16 Jan 2009 10:58:21 +0100
Correct and improve code logic, buildconf, and packaging. In particular:
1. Use descriptive variable names <var>libs instead of just <var>.
2. Although Nokia states in all Qt builds that 'NOTE: When linking
against OpenSSL, you can override the default library names
through OPENSSL_LIBS.' and even gives an example, their own
configuration logic rejects such an attempt. Correct this by
hard coding the OpenSSL library string in the configure script.
3. Consistently use the whitespace substitution [\t ] throughout.
4. Patch the buggy INCPATH of SQL plugin Qmake project files.
5. Add the 'x11' configuration variable to the qtconfig Qmake
project using the src/gui/gui.pro file as a model. This is
needed for qtconfig although not in other tools, because
the qtconfig buildconf indirectly includes qt_x11_p.h which
is dependent on X11 headers.
6. Avoid 'ld.so: fatal: hardware capability unsupported: SSE2 AMD_3DNow'
on platforms for which the config.tests/unix/[3dnow|sse2] succeed
although unsopported at run time by testing for the x86-64
instruction set at build time and regulating hardware capabilities.
7. Correctly install the desinger plugin by explicitly building it.
8. Remove custom plugin installation logic which is unnecessary.
9. Correct removal of temporary paths from shared object files.
1 #!@l_prefix@/bin/openpkg rc
2 ##
3 ## rc.mico -- Run-Commands
4 ##
6 %config
7 mico_enable="$openpkg_rc_def"
8 mico_micod="no"
9 mico_nsd="no"
10 mico_ip_micod="127.0.0.1"
11 mico_ip_nsd="127.0.0.1"
12 mico_micod_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr inet:${mico_ip_micod}:8912"
13 mico_nsd_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr inet:${mico_ip_nsd}:8914"
15 %common
16 mico_micod_pidfile="@l_prefix@/var/mico/micod.pid"
17 mico_nsd_pidfile="@l_prefix@/var/mico/nsd.pid"
18 mico_signal () {
19 local rc_micod=0
20 local rc_nsd=0
21 if rcVarIsYes mico_micod; then
22 [ -f $mico_micod_pidfile ] \
23 && kill -$1 `cat $mico_micod_pidfile`
24 rc_micod=$?
25 fi
26 if rcVarIsYes mico_nsd; then
27 [ -f $mico_nsd_pidfile ] \
28 && kill -$1 `cat $mico_nsd_pidfile`
29 rc_nsd=$?
30 fi
31 [ $rc_micod -eq 0 -a $rc_nsd -eq 0 ]
32 }
34 %status -u @l_rusr@ -o
35 mico_usable="unknown"
36 mico_active="no"
37 rcService mico enable yes && \
38 ( rcVarIsYes mico_micod || rcVarIsYes mico_nsd ) && \
39 mico_signal 0 && mico_active="yes"
40 echo "mico_enable=\"$mico_enable\""
41 echo "mico_usable=\"$mico_usable\""
42 echo "mico_active=\"$mico_active\""
44 %start -u @l_rusr@
45 rcService mico enable yes || exit 0
46 rcService mico active yes && exit 0
47 # run the object adapter daemon for dynamic object activation
48 if rcVarIsYes mico_micod; then
49 @l_prefix@/bin/micod ${mico_micod_args} &
50 echo $! >$mico_micod_pidfile
51 fi
52 # run the name service daemon for flexible object indexing
53 if rcVarIsYes mico_nsd; then
54 @l_prefix@/bin/nsd ${mico_nsd_args} &
55 echo $! >$mico_nsd_pidfile
56 fi
58 %stop -u @l_rusr@
59 rcService mico enable yes || exit 0
60 rcService mico active no && exit 0
61 mico_signal TERM
62 rm -f $mico_micod_pidfile 2>/dev/null || true
63 rm -f $mico_nsd_pidfile 2>/dev/null || true
65 %restart -u @l_rusr@
66 rcService mico enable yes || exit 0
67 rcService mico active no && exit 0
68 rc mico stop
69 sleep 2
70 rc mico start