gcompris r3552 - in branches/gcomprixogoo: src tools

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Sep 28 15:22:22 2008
New Revision: 3552
URL: http://svn.gnome.org/viewvc/gcompris?rev=3552&view=rev

Log:
resynced XO bundling with gcomprixxo branch


Added:
   branches/gcomprixogoo/tools/full-xo-bundle-add-on.tzf   (contents, props changed)
   branches/gcomprixogoo/tools/full_xo_bundle.sh
      - copied unchanged from r3551, /branches/gcomprixo/tools/full_xo_bundle.sh
Modified:
   branches/gcomprixogoo/src/activity.info
   branches/gcomprixogoo/src/bundleit.sh

Modified: branches/gcomprixogoo/src/activity.info
==============================================================================
--- branches/gcomprixogoo/src/activity.info	(original)
+++ branches/gcomprixogoo/src/activity.info	Sun Sep 28 15:22:22 2008
@@ -1,8 +1,10 @@
 [Activity]
 name = @ACTIVITY_NAME@
-activity_version = 6
+activity_version = 10
 host_version = 1
 service_name = net gcompris  ACTIVITY_NAME@Activity
+bundle_id = net gcompris  ACTIVITY_NAME@Activity
 icon = activity-gcompris
 exec = gcompris-activity
 show_launcher = yes
+license = GPLv3+

Modified: branches/gcomprixogoo/src/bundleit.sh
==============================================================================
--- branches/gcomprixogoo/src/bundleit.sh	(original)
+++ branches/gcomprixogoo/src/bundleit.sh	Sun Sep 28 15:22:22 2008
@@ -28,10 +28,13 @@
 fi
 
 if test "$activitysrc" = "administration-activity" || \
+   test "$activitysrc" = "chat-activity" || \
    test "$activitysrc" = "tuxpaint-activity" || \
    test "$activitysrc" = "melody-activity" || \
-   test "$activitysrc" = "gcompris-activity" ; then
-  echo "Skipping $activitysrc"
+   test "$activitysrc" = "login-activity" || \
+   test "$activitysrc" = "gcompris-activity" || \
+   test "$activitysrc" = "old-gcompris-activity" ; then
+  echo "  Skipping it, not relevant for xo or not ready for it."
   exit 0
 fi
 
@@ -53,14 +56,10 @@
   exit 1
 fi
 
-with_clock="--exclude resources/skins/gartoon/timers"
-for act in `grep timers/clock */*.c | cut -d/ -f1 | sort -u | xargs`
-do
-  if test "$activitysrc" = $act; then
-    echo "Adding timers/clock files"
-    with_clock=""
-  fi
-done
+# Bundle names must be formated without underscores
+# This translate chess_computer in chessComputer
+bundle_id=`echo $activity | sed 's/_\([a-z]\)/\U\1/g'`
+echo $bundle_id
 
 # Create the Sugar specific startup scripts
 activity_dir=${activity}.activity
@@ -75,7 +74,7 @@
 mkdir -p $activity_dir/bin
 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
+sed -i s/@ACTIVITY_NAME@/$bundle_id/g $activity_dir/activity/activity.info
 cp old-gcompris-instance $activity_dir/
 cp old-gcompris-factory $activity_dir/
 cp old-gcompris-activity $activity_dir/
@@ -137,6 +136,16 @@
   ln -s ../boards/python/gcompris -t $activity_dir
 fi
 
+# Add the timers skin if needed (python activity don't use it)
+with_clock="--exclude resources/skins/gartoon/timers"
+if [ "$haspyfile" = "" ]; then
+  has_timer=`egrep "gc_timer_display|timers/clock" $plugindir/../*.c`
+  if test "$has_timer" != ""; then
+    echo "  Adding timers/clock files"
+    with_clock=""
+  fi
+fi
+
 # Add the runit.sh script
 cp $activity_dir/../runit.sh $activity_dir
 
@@ -161,4 +170,4 @@
 
 # Sugar cleanup
 rm -rf $activity_dir
-rm $activity_dir.tar.bz2
\ No newline at end of file
+rm $activity_dir.tar.bz2

Added: branches/gcomprixogoo/tools/full-xo-bundle-add-on.tzf
==============================================================================
Binary file. No diff available.