1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
Description: Rename router binaries
Author: Thibaut Gridel <tgridel@free.fr>
Forwarded: not-needed
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,9 +33,9 @@ DEPDIR=.deps
C=$(wildcard *.c)
D=$(wildcard $(DEPDIR)/*.d)
-EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) \
+EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) \
filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \
- router+lib$(.EXE) router+lib-slim$(.EXE)
+ routino-router+lib$(.EXE) routino-router+lib-slim$(.EXE)
ifneq ($(HOST),MINGW)
LIB =libroutino.so libroutino-slim.so
@@ -116,7 +116,7 @@ ifeq ($(HOST),MINGW)
ROUTER_OBJ+=mman-win32.o
endif
-router$(.EXE) : $(ROUTER_OBJ)
+routino-router$(.EXE) : $(ROUTER_OBJ)
$(LD) $^ -o $@ $(LDFLAGS)
########
@@ -131,7 +131,7 @@ ifeq ($(HOST),MINGW)
ROUTER_SLIM_OBJ+=mman-win32.o
endif
-router-slim$(.EXE) : $(ROUTER_SLIM_OBJ)
+routino-router-slim$(.EXE) : $(ROUTER_SLIM_OBJ)
$(LD) $^ -o $@ $(LDFLAGS)
########
@@ -188,10 +188,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
ROUTER_LIB_OBJ=router+lib.o
-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
+routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
+routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
########
--- a/web/Makefile
+++ b/web/Makefile
@@ -52,7 +52,7 @@ TRANS_FILES=$(wildcard $(WEBTRANSDIR)/tr
DOC_FILES=$(notdir $(wildcard $(DOCDIR)/html/*.html)) $(notdir $(wildcard $(DOCDIR)/html/*.css))
-EXE_FILES=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE)
+EXE_FILES=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE)
########
--- a/src/test/run-one-test.sh
+++ b/src/test/run-one-test.sh
@@ -117,8 +117,8 @@ run_router()
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
mv shortest* $dir/$name-$waypoint
--- a/web/www/routino/paths.pl
+++ b/web/www/routino/paths.pl
@@ -33,7 +33,7 @@ $results_dir="$root_dir/results";
$data_prefix="";
# 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";
# EDIT THIS to change the search type and base URL (must be a type recognised by search.pl).
|
