diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2008-03-14 21:03:13 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2008-03-14 21:03:13 (GMT) |
| commit | aae4e7818908387b9f9296e88a4081ac8fa4452d (patch) | |
| tree | 6ad0867642970c29b431e9854383182b12116d35 | |
| parent | 2b03c94d7bd85ff4692e02aafbc9bf2104b46de7 (diff) | |
fixed, this activity was not running on the XO. added support for
* src/connect4-2players-activity/init_path.sh: fixed, this activity was not
running on the XO.
* src/runit.sh: added support for bin/gcompris
svn path=/branches/gcomprixo/; revision=3301
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rwxr-xr-x | src/connect4-2players-activity/init_path.sh | 7 | ||||
| -rwxr-xr-x | src/runit.sh | 3 |
3 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2008-03-14 Bruno coudoin <bruno.coudoin@free.fr> + + * src/connect4-2players-activity/init_path.sh: fixed, this activity was not + running on the XO. + * src/runit.sh: added support for bin/gcompris + 2008-03-14 Bruno coudoin <bruno.coudoin@free.fr> * src/gcompris/dbus.c: (gc_dbus_init): Fixed olpc trac bug#6363 @@ -5,6 +11,12 @@ Added support for gthread initialization in dbus startup if not yet done. +2008-02-14 Bruno coudoin <bruno.coudoin@free.fr> + + Merged from GCompris trunk 3238: + * src/boards/python/mosaic.py: fixed a major bug. this activity was making GCompris + crash one you clicked on the grey target button. + 2007-10-03 Bruno coudoin <bruno.coudoin@free.fr> Made the chess activity to search for gnuchess in usual diff --git a/src/connect4-2players-activity/init_path.sh b/src/connect4-2players-activity/init_path.sh index 3835ec3..bb74551 100755 --- a/src/connect4-2players-activity/init_path.sh +++ b/src/connect4-2players-activity/init_path.sh @@ -2,8 +2,7 @@ # This is sourced by runit.sh path=$1 activity=connect4-2players -pythonplugindir=$path -resourcedir=$path/$resources -resources - ../connect4-activity/resources +plugindir=$path/../boards/.libs +pythonplugindir=$path/../connect4-activity +resourcedir=$path/../connect4-activity/resources section="/strategy" diff --git a/src/runit.sh b/src/runit.sh index 924b2b4..c6e830c 100755 --- a/src/runit.sh +++ b/src/runit.sh @@ -24,6 +24,9 @@ fi gcompris=$1/gcompris.bin if [ ! -f $gcompris ]; then + gcompris=$1/bin/gcompris +fi +if [ ! -f $gcompris ]; then gcompris=$1/../gcompris/gcompris fi |