[Roadmap-commit] roadmap/sugar mk_activity,1.1,1.2

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/sugar
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29684

Modified Files:
	mk_activity 
Log Message:
include MA maps in base activity, and add automatically version
number to bundle name


Index: mk_activity
===================================================================
RCS file: /cvsroot/roadmap/roadmap/sugar/mk_activity,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mk_activity	4 Sep 2008 18:48:19 -0000	1.1
--- mk_activity	4 Sep 2008 20:59:51 -0000	1.2
***************
*** 52,56 ****
  mv $RMROOT/usr/share/activities/$ACT/share/pixmaps	$ACT/pixmaps
  mv $RMROOT/usr/share/activities/$ACT/share/roadmap	$ACT/config
! cp $STUFF/config/*					$ACT/config
  
  # disable the toolbar by default, but provide an example
--- 52,56 ----
  mv $RMROOT/usr/share/activities/$ACT/share/pixmaps	$ACT/pixmaps
  mv $RMROOT/usr/share/activities/$ACT/share/roadmap	$ACT/config
! cp $STUFF/config/{roadmap.screenobjects,sprites}	$ACT/config
  
  # disable the toolbar by default, but provide an example
***************
*** 68,73 ****
  if [ -d /usr/local/share/roadmap/maps ]
  then
!     ln -s /usr/local/share/roadmap/maps/{SB,usdir.rdm} $ACT/maps
!     for state in MA NH VT
      # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA
      do
--- 68,73 ----
  if [ -d /usr/local/share/roadmap/maps ]
  then
!     ln -s /usr/local/share/roadmap/maps/{SB,MA,usdir.rdm} $ACT/maps
!     for state in NH VT
      # for state in ON IL MI IN OH TN GA NC VA MD DE PA NJ NY CT MA
      do
***************
*** 123,128 ****
  cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs
  
  # finally, bundle the bundle
! zip -r RoadMap.xo $ACT
  
  
--- 123,129 ----
  cp $TOP/COPYING $TOP/INSTALL $TOP/README README.xo_laptop $SRC/manual.html $ACT/docs
  
+ version=$(sed -n 's/activity_version.*=//p' $STUFF/activity.info)
  # finally, bundle the bundle
! zip -r RoadMap-$version.xo $ACT