gcompris r3301 - in branches/gcomprixo: . src src/anim-activity/resources/anim src/babyshapes-activity/resources/babyshapes src/babyshapes-activity/resources/babyshapes/dog1 src/babyshapes-activity/resources/babyshapes/dog2 src/babyshapes-activity/resources/babyshapes/dog3 src/babyshapes-activity/resources/babyshapes/food src/connect4-2players-activity src/hexagon-activity/resources/hexagon

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Fri Mar 14 21:03:13 2008
New Revision: 3301
URL: http://svn.gnome.org/viewvc/gcompris?rev=3301&view=rev

Log:
	* src/connect4-2players-activity/init_path.sh: fixed, this activity was not
	  running on the XO.
	* src/runit.sh: added support for bin/gcompris



Modified:
   branches/gcomprixo/ChangeLog
   branches/gcomprixo/src/anim-activity/resources/anim/   (props changed)
   branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/   (props changed)
   branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/dog1/   (props changed)
   branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/dog2/   (props changed)
   branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/dog3/   (props changed)
   branches/gcomprixo/src/babyshapes-activity/resources/babyshapes/food/   (props changed)
   branches/gcomprixo/src/connect4-2players-activity/init_path.sh
   branches/gcomprixo/src/hexagon-activity/resources/hexagon/   (props changed)
   branches/gcomprixo/src/runit.sh

Modified: branches/gcomprixo/src/connect4-2players-activity/init_path.sh
==============================================================================
--- branches/gcomprixo/src/connect4-2players-activity/init_path.sh	(original)
+++ branches/gcomprixo/src/connect4-2players-activity/init_path.sh	Fri Mar 14 21:03:13 2008
@@ -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"

Modified: branches/gcomprixo/src/runit.sh
==============================================================================
--- branches/gcomprixo/src/runit.sh	(original)
+++ branches/gcomprixo/src/runit.sh	Fri Mar 14 21:03:13 2008
@@ -24,6 +24,9 @@
 
 gcompris=$1/gcompris.bin
 if [ ! -f $gcompris ]; then
+  gcompris=$1/bin/gcompris
+fi
+if [ ! -f $gcompris ]; then
   gcompris=$1/../gcompris/gcompris
 fi