diff options
author | Michael Schuldt <michael.schuldt@bmw.de> | 2012-05-03 09:55:43 +0200 |
---|---|---|
committer | Michael Schuldt <michael.schuldt@bmw.de> | 2012-05-03 09:55:43 +0200 |
commit | ec06dda5d1de3723a8694080c19554c73ac346f2 (patch) | |
tree | 47d2f13217c574af796532ff3e04a0def20b27f3 /GeniviDemo.sh | |
parent | 8461c1f2b7ca2a8f01b349c9283b71fae4ed783b (diff) | |
download | layer_management-ec06dda5d1de3723a8694080c19554c73ac346f2.tar.gz |
GeniviDemo.sh: Updating Example Start Script
Diffstat (limited to 'GeniviDemo.sh')
-rwxr-xr-x[-rw-r--r--] | GeniviDemo.sh | 80 |
1 files changed, 30 insertions, 50 deletions
diff --git a/GeniviDemo.sh b/GeniviDemo.sh index f8ca0b0..91f1be6 100644..100755 --- a/GeniviDemo.sh +++ b/GeniviDemo.sh @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -20,76 +20,56 @@ export LD_LIBRARY_PATH=/usr/lib:/usr/local/lib export DISPLAY=:0.0 -export DBUS_SESSION_BUS_ADDRESS=tcp:host=0.0.0.0,port=12434 -PIDSURFACE1=/var/run/surface1.pid -PIDSURFACE2=/var/run/surface2.pid - -init_scene() -{ - LayerManagerClientExample -} - -deinit_scene() -{ - LayerManagerClientExample 2 -} +PIDSURFACE1=/tmp/surface1.pid +PIDSURFACE2=/tmp/surface2.pid start_egl_example_application() { - EGLX11ApplicationExample & - pidofdlt=`ps aux | grep EGLX11ApplicationExample | grep -v grep | awk '{print $2}'` - echo $pidofdlt > $PIDSURFACE1 + EGLX11ApplicationExample & + pidofdlt=`ps aux | grep EGLX11ApplicationExample | grep -v grep | awk '{print $2}'` + echo $pidofdlt > $PIDSURFACE1 } -start_glx_example_application() +start_mock_example_application() { - GLX11ApplicationExample & - pidofdlt=`ps aux | GLX11ApplicationExample | grep -v grep | awk '{print $2}'` - echo $pidofdlt > $PIDSURFACE2 + EGLX11MockNavigation -layer 3000 -surface 20 & + pidofdlt=`ps aux | grep EGLX11MockNavigation | grep -v grep | awk '{print $2}'` + echo $pidofdlt > $PIDSURFACE2 } killprocess() { - if [ -f $1 ]; then - kill -9 `cat $1` - rm -f $1 - fi + if [ -f $1 ]; then + kill -9 `cat $1` + rm -f $1 + fi } stop() { - killprocess $PIDSURFACE1 - killprocess $PIDSURFACE2 - deinit_scene + killprocess $PIDSURFACE1 + killprocess $PIDSURFACE2 } - - start() { - init_scene - sleep 1 - start_egl_example_application - sleep 2 - start_glx_example_application + start_egl_example_application + start_mock_example_application } case "$1" in - start) - start - ;; - init_scene) - init_scene - ;; - start_example_application) - start_example_application - ;; - stop) - stop - ;; + start) + start + ;; + start_example_application) + start_example_application + ;; + stop) + stop + ;; - *) - echo "Usage: $0 {init_scene|start|start_example_application|stop" - ;; + *) + echo "Usage: $0 {start|start_example_application|stop}" + ;; esac exit 0 |