[SCM] routino branch, master, updated. 59f7dd29369e69f05afb4de29306d16a08197830

[Thibaut Gridel]

The following commit has been merged in the master branch:
commit e4fe4f4e3e096d4f945d289ec2137b4190b25c26
Author: Thibaut Gridel <tgridel at free.fr>
Date:   Wed Oct 26 19:03:50 2011 +0200

    Fixing tests

diff --git a/src/test/a-b-c.sh b/src/test/a-b-c.sh
index c8e0c8a..62ae8fd 100755
--- a/src/test/a-b-c.sh
+++ b/src/test/a-b-c.sh
@@ -74,8 +74,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
-    $debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+    echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+    $debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
 
     mv shortest* $dir/$name-$waypoint
 
diff --git a/src/test/a-b.sh b/src/test/a-b.sh
index 0361ab6..c2b1df6 100755
--- a/src/test/a-b.sh
+++ b/src/test/a-b.sh
@@ -73,8 +73,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
-    $debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+    echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+    $debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
 
     mv shortest* $dir/$name-$waypoint
 
diff --git a/src/test/start-1-finish.sh b/src/test/start-1-finish.sh
index 58e8f1a..810fc11 100755
--- a/src/test/start-1-finish.sh
+++ b/src/test/start-1-finish.sh
@@ -73,8 +73,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
-    $debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+    echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+    $debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
 
     mv shortest* $dir/$name-$waypoint
 
diff --git a/web/www/routino/paths.pl b/web/www/routino/paths.pl
index 2233efb..05375db 100644
--- a/web/www/routino/paths.pl
+++ b/web/www/routino/paths.pl
@@ -30,7 +30,7 @@ $data_dir="$root_dir/data";
 $results_dir="$root_dir/results";
 
 # EDIT THIS to change the names of the executables (enables easy selection of slim mode).
-$router_exe="router";
+$router_exe="routino-router";
 $filedumper_exe="filedumper";
 
 1;

-- 
Packaging for routino