Skip to content

Commit e1d4dbe

Browse files
kevinkreiserkevinkreiser
committed
make thor depend on midgard odin and baldr. cut out all stuff that isnt thor.
1 parent ba3fbc8 commit e1d4dbe

File tree

102 files changed

+233
-8630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+233
-8630
lines changed

‎.gitignore

+4-19
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ install-sh
1616
missing
1717
depcomp
1818
Makefile
19-
include/config.h
20-
include/config.h.in
21-
include/stamp-h1
19+
valhalla/config.h
20+
valhalla/config.h.in
21+
valhalla/stamp-h1
2222
ltmain.sh
2323
m4/libtool.m4
2424
m4/ltoptions.m4
@@ -28,34 +28,19 @@ m4/lt~obsolete.m4
2828
libtool
2929

3030
# built objects
31-
include/proto
32-
src/proto
33-
pbfgraphbuilder
3431
pathtest
3532
*.o
3633
.deps/
3734
.dirstamp
3835
*.lo
3936
.libs/
40-
libvalhalla.la
37+
libvalhalla_thor.la
4138

4239
# tests
4340
test-suite.log
4441
test-driver
45-
test/point2
46-
test/linesegment2
47-
test/distanceapproximator
4842
test/edgestatus
49-
test/aabb2
50-
test/aabbll
51-
test/vector2
52-
test/polyline2
5343
test/adjacencylist
54-
test/pointll
55-
test/location
56-
test/tilehierarchy
57-
test/graphid
58-
test/edgeinfobuilder
5944
test/*.log
6045
test/*.trs
6146

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "OSM-binary"]
2-
path = OSM-binary
3-
url = https://github.com/scrosby/OSM-binary.git

‎Makefile.am

+25-156
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
ACLOCAL_AMFLAGS = -I m4
2-
AM_LDFLAGS = @BOOST_LDFLAGS@ @LUA_LIB@ @COVERAGE_LDFLAGS@
3-
AM_CPPFLAGS = -Iinclude -Iinclude/proto @BOOST_CPPFLAGS@
4-
AM_CXXFLAGS = -Iinclude -Iinclude/proto @COVERAGE_CXXFLAGS@ @LUA_INCLUDE@
5-
if HAVE_SQLITE3
6-
AM_CPPFLAGS += @SQLITE3_CFLAGS@
7-
endif
2+
AM_LDFLAGS = @BOOST_LDFLAGS@ @COVERAGE_LDFLAGS@
3+
AM_CPPFLAGS = -Ivalhalla @BOOST_CPPFLAGS@
4+
AM_CXXFLAGS = -Ivalhalla @COVERAGE_CXXFLAGS@
5+
VALHALLA_LDFLAGS = @VALHALLA_MIDGARD_LDFLAGS@ @VALHALLA_MIDGARD_LIB@ @VALHALLA_BALDR_LDFLAGS@ @VALHALLA_BALDR_LIB@ @VALHALLA_ODIN_LDFLAGS@ @VALHALLA_ODIN_LIB@
6+
VALHALLA_CPPFLAGS = @VALHALLA_MIDGARD_CPPFLAGS@ @VALHALLA_BALDR_CPPFLAGS@ @VALHALLA_ODIN_CPPFLAGS@
87
LIBTOOL_DEPS = @LIBTOOL_DEPS@
98
libtool: $(LIBTOOL_DEPS)
109
$(SHELL) ./config.status libtool
@@ -36,174 +35,44 @@ clean-gcno:
3635
clean-local: clean-coverage clean-gcno
3736
endif
3837

39-
# proto generation etc
40-
PROTO_FILES = proto/trippath.proto proto/osmformat.proto proto/fileformat.proto
41-
BUILT_SOURCES = $(patsubst %.proto,src/%.pb.cc,$(PROTO_FILES))
42-
CLEANFILES = $(patsubst %.proto,include/%.pb.h,$(PROTO_FILES)) $(patsubst %.proto,src/%.pb.cc,$(PROTO_FILES))
43-
nodist_libvalhalla_la_SOURCES = $(patsubst %.proto,src/%.pb.cc,$(PROTO_FILES))
44-
src/proto/%.pb.cc: proto/%.proto
45-
@echo " PROTOC $<"; mkdir -p src/proto include/proto; @PROTOC_BIN@ -Iproto --cpp_out=include/proto $< && mv include/proto/$(@F) src/proto
46-
4738
# lib valhalla compilation etc
48-
lib_LTLIBRARIES = libvalhalla.la
39+
lib_LTLIBRARIES = libvalhalla_thor.la
4940
include_HEADERS = \
50-
include/baldr/directededge.h \
51-
include/baldr/edgeinfo.h \
52-
include/baldr/graphid.h \
53-
include/baldr/graphreader.h \
54-
include/baldr/graphtile.h \
55-
include/baldr/graphtileheader.h \
56-
include/baldr/nodeinfo.h \
57-
include/baldr/location.h \
58-
include/baldr/pathlocation.h \
59-
include/midgard/linesegment2.h \
60-
include/midgard/tiles.h \
61-
include/midgard/aabbll.h \
62-
include/midgard/polyline2.h \
63-
include/midgard/obb2.h \
64-
include/midgard/pointll.h \
65-
include/midgard/vector2.h \
66-
include/midgard/clipper2.h \
67-
include/midgard/aabb2.h \
68-
include/midgard/point2.h \
69-
include/midgard/util.h \
70-
include/midgard/distanceapproximator.h \
71-
include/midgard/ellipse.h \
72-
include/midgard/tilehierarchy.h \
73-
include/thor/adjacencylist.h \
74-
include/thor/astarheuristic.h \
75-
include/thor/edgecost.h \
76-
include/thor/edgelabel.h \
77-
include/thor/edgestatus.h \
78-
include/thor/pathalgorithm.h \
79-
include/thor/trippathbuilder.h \
80-
include/odin/narrativebuilder.h \
81-
include/mjolnir/directededgebuilder.h \
82-
include/mjolnir/graphtilebuilder.h \
83-
include/mjolnir/graphtileheaderbuilder.h \
84-
include/mjolnir/nodeinfobuilder.h \
85-
include/mjolnir/edgeinfobuilder.h
86-
libvalhalla_la_SOURCES = \
87-
src/baldr/directededge.cc \
88-
src/baldr/edgeinfo.cc \
89-
src/baldr/graphid.cc \
90-
src/baldr/graphreader.cc \
91-
src/baldr/graphtile.cc \
92-
src/baldr/graphtileheader.cc \
93-
src/baldr/nodeinfo.cc \
94-
src/baldr/location.cc \
95-
src/baldr/pathlocation.cc \
96-
src/midgard/linesegment2.cc \
97-
src/midgard/tiles.cc \
98-
src/midgard/aabbll.cc \
99-
src/midgard/polyline2.cc \
100-
src/midgard/obb2.cc \
101-
src/midgard/pointll.cc \
102-
src/midgard/vector2.cc \
103-
src/midgard/clipper2.cc \
104-
src/midgard/aabb2.cc \
105-
src/midgard/point2.cc \
106-
src/midgard/util.cc \
107-
src/midgard/distanceapproximator.cc \
108-
src/midgard/ellipse.cc \
109-
src/midgard/tilehierarchy.cc \
41+
valhalla/thor/adjacencylist.h \
42+
valhalla/thor/astarheuristic.h \
43+
valhalla/thor/edgecost.h \
44+
valhalla/thor/edgelabel.h \
45+
valhalla/thor/edgestatus.h \
46+
valhalla/thor/pathalgorithm.h \
47+
valhalla/thor/trippathbuilder.h
48+
libvalhalla_thor_la_SOURCES = \
11049
src/thor/adjacencylist.cc \
11150
src/thor/astarheuristic.cc \
11251
src/thor/edgecost.cc \
11352
src/thor/edgelabel.cc \
11453
src/thor/edgestatus.cc \
11554
src/thor/pathalgorithm.cc \
116-
src/thor/trippathbuilder.cc \
117-
src/odin/narrativebuilder.cc \
118-
src/mjolnir/directededgebuilder.cc \
119-
src/mjolnir/graphtilebuilder.cc \
120-
src/mjolnir/graphtileheaderbuilder.cc \
121-
src/mjolnir/nodeinfobuilder.cc \
122-
src/mjolnir/edgeinfobuilder.cc \
123-
src/proto/fileformat.pb.cc \
124-
src/proto/osmformat.pb.cc \
125-
src/proto/trippath.pb.cc
126-
libvalhalla_la_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
127-
libvalhalla_la_LIBADD = $(DEPS_LIBS) @PROTOC_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_FILESYSTEM_LIB@
128-
if HAVE_SQLITE3
129-
libvalhalla_la_LIBADD += @SQLITE3_LDFLAGS@
130-
endif
55+
src/thor/trippathbuilder.cc
56+
libvalhalla_thor_la_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_CPPFLAGS) @BOOST_CPPFLAGS@
57+
libvalhalla_thor_la_LIBADD = $(DEPS_LIBS) $(VALHALLA_LDFLAGS) @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_FILESYSTEM_LIB@ @PROTOC_LIBS@
13158

13259
#distributed executables
133-
bin_PROGRAMS = pathtest pbfgraphbuilder
60+
bin_PROGRAMS = pathtest
13461
pathtest_SOURCES = \
13562
src/thor/pathtest/pathtest.cc
136-
pathtest_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
137-
pathtest_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ @BOOST_PROGRAM_OPTIONS_LIB@ \
138-
-lz libvalhalla.la
139-
pbfgraphbuilder_SOURCES = \
140-
src/mjolnir/pbfgraphbuilder/pbfgraphbuilder.cc \
141-
src/mjolnir/pbfgraphbuilder/graphbuilder.cc \
142-
src/mjolnir/pbfgraphbuilder/luatagtransform.cc
143-
pbfgraphbuilder_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
144-
pbfgraphbuilder_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ -lz libvalhalla.la
63+
pathtest_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_CPPFLAGS) @BOOST_CPPFLAGS@
64+
pathtest_LDADD = $(DEPS_LIBS) $(VALHALLA_LDFLAGS) @BOOST_LDFLAGS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_FILESYSTEM_LIB@ -lz libvalhalla_thor.la
14565

14666
# tests
14767
check_PROGRAMS = \
148-
test/point2 \
149-
test/distanceapproximator \
150-
test/aabb2 \
151-
test/linesegment2 \
15268
test/edgestatus \
153-
test/aabbll \
154-
test/vector2 \
155-
test/polyline2 \
156-
test/adjacencylist \
157-
test/pointll \
158-
test/location \
159-
test/tilehierarchy \
160-
test/graphid \
161-
test/edgeinfobuilder
162-
test_valhalla_SOURCES = test/valhalla.cc test/test.cc
163-
test_valhalla_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
164-
test_valhalla_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@
165-
test_point2_SOURCES = test/point2.cc test/test.cc
166-
test_point2_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
167-
test_point2_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
168-
test_distanceapproximator_SOURCES = test/distanceapproximator.cc test/test.cc
169-
test_distanceapproximator_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
170-
test_distanceapproximator_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
171-
test_aabb2_SOURCES = test/aabb2.cc test/test.cc
172-
test_aabb2_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
173-
test_aabb2_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
174-
test_linesegment2_SOURCES = test/linesegment2.cc test/test.cc
175-
test_linesegment2_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
176-
test_linesegment2_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
69+
test/adjacencylist
17770
test_edgestatus_SOURCES = test/edgestatus.cc test/test.cc
178-
test_edgestatus_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
179-
test_edgestatus_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
180-
test_aabbll_SOURCES = test/aabbll.cc test/test.cc
181-
test_aabbll_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
182-
test_aabbll_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
183-
test_vector2_SOURCES = test/vector2.cc test/test.cc
184-
test_vector2_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
185-
test_vector2_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
186-
test_polyline2_SOURCES = test/polyline2.cc test/test.cc
187-
test_polyline2_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
188-
test_polyline2_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
71+
test_edgestatus_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_CPPFLAGS) @BOOST_CPPFLAGS@
72+
test_edgestatus_LDADD = $(DEPS_LIBS) $(VALHALLA_LDFLAGS) @BOOST_LDFLAGS@ libvalhalla_thor.la
18973
test_adjacencylist_SOURCES = test/adjacencylist.cc test/test.cc
190-
test_adjacencylist_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
191-
test_adjacencylist_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
192-
test_pointll_SOURCES = test/pointll.cc test/test.cc
193-
test_pointll_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
194-
test_pointll_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
195-
test_location_SOURCES = test/location.cc test/test.cc
196-
test_location_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
197-
test_location_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
198-
test_tilehierarchy_SOURCES = test/tilehierarchy.cc test/test.cc
199-
test_tilehierarchy_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
200-
test_tilehierarchy_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
201-
test_graphid_SOURCES = test/graphid.cc test/test.cc
202-
test_graphid_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
203-
test_graphid_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
204-
test_edgeinfobuilder_SOURCES = test/edgeinfobuilder.cc test/test.cc
205-
test_edgeinfobuilder_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
206-
test_edgeinfobuilder_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ libvalhalla.la
74+
test_adjacencylist_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_CPPFLAGS) @BOOST_CPPFLAGS@
75+
test_adjacencylist_LDADD = $(DEPS_LIBS) $(VALHALLA_LDFLAGS) @BOOST_LDFLAGS@ libvalhalla_thor.la
20776

20877
TESTS = $(check_PROGRAMS)
20978
TEST_EXTENSIONS = .sh

‎OSM-binary

-1
This file was deleted.

‎autogen.sh

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
mkdir -p include
32
libtoolize -i
43
aclocal -I m4
54
autoreconf -fi --warning=no-portability

‎import/configs/db2graph.json ‎conf/db2graph.json

File renamed without changes.

‎import/configs/pbf2graph.json ‎conf/pbf2graph.json

File renamed without changes.

‎configure.ac

+12-19
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
AC_INIT([valhalla],
1+
AC_INIT([thor],
22
[0.0.1],
3-
[https://github.com/mapzen/valhalla/issues],
4-
[valhalla-0.0.1],
5-
[https://github.com/mapzen/valhalla])
3+
[https://github.com/valhalla/thor/issues],
4+
[thor-0.0.1],
5+
[https://github.com/valhalla/thor])
66
AM_INIT_AUTOMAKE([subdir-objects parallel-tests])
77
LT_INIT
88
AC_SUBST([LIBTOOL_DEPS])
99

1010
AM_SILENT_RULES([yes])
11-
AC_CONFIG_HEADERS([include/config.h])
11+
AC_CONFIG_HEADERS([valhalla/config.h])
1212
AC_CONFIG_MACRO_DIR([m4])
1313

1414
AC_PROG_CXX
@@ -21,29 +21,22 @@ AC_LANG_CPLUSPLUS
2121
# require c++11
2222
AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
2323

24+
# require other thor dependencies
25+
CHECK_VALHALLA_MIDGARD
26+
CHECK_VALHALLA_BALDR
27+
CHECK_VALHALLA_ODIN
28+
2429
# check for protocol buffers compiler and libraries
2530
REQUIRE_PROTOC
2631

27-
# check for SQLite, which we use for HTTP cache information
28-
AX_LIB_SQLITE3([3.6.16])
29-
AM_CONDITIONAL([HAVE_SQLITE3], [test -n "$SQLITE3_VERSION"])
30-
3132
# check for boost and make sure we have the program options library
32-
AX_BOOST_BASE([1.54], , [AC_MSG_ERROR([cannot find Boost libraries, which are are required for building valhalla. Please install libboost-dev.])])
33+
AX_BOOST_BASE([1.54], , [AC_MSG_ERROR([cannot find Boost libraries, which are are required for building thor. Please install libboost-dev.])])
3334
AX_BOOST_PROGRAM_OPTIONS
3435
AX_BOOST_SYSTEM
3536
AX_BOOST_FILESYSTEM
3637

37-
# check for Lua libraries and headers
38-
AX_PROG_LUA([5.2],[],[
39-
AX_LUA_HEADERS([
40-
AX_LUA_LIBS([
41-
],[AC_MSG_ERROR([Cannot find Lua libs. Please install lua5.2 liblua5.2-dev])])
42-
],[AC_MSG_ERROR([Cannot find Lua includes. Please install lua5.2 liblua5.2-dev])])
43-
],[AC_MSG_ERROR([Cannot find Lua interpreter. Please install lua5.2 liblua5.2-dev])])
44-
4538
# check pkg-config packaged packages.
46-
PKG_CHECK_MODULES([DEPS], [protobuf >= 2.4.0 libzmq >= 2.1.10 libcurl >= 7.19.5])
39+
PKG_CHECK_MODULES([DEPS], [protobuf >= 2.4.0 libzmq >= 2.1.10])
4740

4841
# optionally enable coverage information
4942
CHECK_COVERAGE

0 commit comments

Comments
 (0)