gcompris r3295 - branches/gcomprixogoo/src

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Mar 10 23:30:19 2008
New Revision: 3295
URL: http://svn.gnome.org/viewvc/gcompris?rev=3295&view=rev

Log:
Merged r3290 from gcomprixo
Chanched our bundleit script to better suit olpc needs.
OLPC Trac #6672 : We now ship the gnuchess and gnucap binary in our bundles bin directory
                  This means that the person runing the bundle script will ship these
                  binaries as found on her system.
OLPC Trac #6484 : Should be no more an issue now since we access gnuchess within our bundle
OLPC Trac #6657 : Now use the gcompris icons instead of our single surarized one.


Modified:
   branches/gcomprixogoo/src/bundleit.sh

Modified: branches/gcomprixogoo/src/bundleit.sh
==============================================================================
--- branches/gcomprixogoo/src/bundleit.sh	(original)
+++ branches/gcomprixogoo/src/bundleit.sh	Mon Mar 10 23:30:19 2008
@@ -34,6 +34,17 @@
   exit 0
 fi
 
+extra_bin=""
+if test "$activitysrc" = "chess_computer-activity" || \
+   test "$activitysrc" = "chess_movelearn-activity" || \
+   test "$activitysrc" = "chess_partyend-activity" ; then
+ extra_bin=`which gnuchess`
+fi
+
+if test "$activitysrc" = "electric-activity" ; then
+ extra_bin=`which gnucap`
+fi
+
 if test -f $activitysrc/init_path.sh; then
   . $activitysrc/init_path.sh
 else
@@ -61,7 +72,7 @@
 cp -a $activitysrc $activity_dir
 mkdir -p $activity_dir/activity
 mkdir -p $activity_dir/bin
-cp activity-gcompris.svg $activity_dir/activity
+mv $activity_dir/*.svg $activity_dir/activity/activity-gcompris.svg
 cp activity.info $activity_dir/activity
 sed -i s/@ACTIVITY_NAME@/$activity/g $activity_dir/activity/activity.info
 cp old-gcompris-instance $activity_dir/
@@ -75,6 +86,10 @@
   mv $activity_dir/.libs/*.so $activity_dir
 fi
 rm -rf $activity_dir/.libs
+rm -rf $activity_dir/*.in
+if [ -f $extra_bin ]; then
+  cp $extra_bin $activity_dir/bin
+fi
 
 # Add the locale translation file
 dir=$activity_dir/locale/$lang/LC_MESSAGES
@@ -87,7 +102,7 @@
 fi
 
 # Add the mandatory sounds of this activity
-mandatory_sound_dir=`grep mandatory_sound_dir $activity_dir/*.xml.in | cut -d= -f2 | sed s/\"//g`
+mandatory_sound_dir=`grep mandatory_sound_dir $activity_dir/*.xml | cut -d= -f2 | sed s/\"//g`
 if test -n "$mandatory_sound_dir"
 then
     echo "This activity defines a mandatory_sound_dir in $mandatory_sound_dir"
@@ -126,6 +141,7 @@
     --exclude ".deps" \
     --exclude "Makefile*" \
     --exclude "*.c" \
+    --exclude "*.h" \
     --exclude "*.la" \
     --exclude "*.lo" \
     --exclude "*.o" \