update rake task to work with bins in /build

This commit is contained in:
Emil Tin 2013-04-27 17:01:43 +02:00
parent fcdee8f5d5
commit 7ac901cb08

View File

@ -120,9 +120,9 @@ end
desc "Reprocess OSM data." desc "Reprocess OSM data."
task :process => :setup do task :process => :setup do
Dir.chdir DATA_FOLDER do Dir.chdir DATA_FOLDER do
raise "Error while extracting data." unless system "../osrm-extract #{osm_data_area_name}.osm.pbf #{PROFILES_FOLDER}/#{PROFILE}.lua" raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf #{PROFILES_FOLDER}/#{PROFILE}.lua"
puts puts
raise "Error while preparing data." unless system "../osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions #{PROFILES_FOLDER}/#{PROFILE}.lua" raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions #{PROFILES_FOLDER}/#{PROFILE}.lua"
puts puts
end end
end end
@ -130,14 +130,14 @@ end
desc "Extract OSM data." desc "Extract OSM data."
task :extract => :setup do task :extract => :setup do
Dir.chdir DATA_FOLDER do Dir.chdir DATA_FOLDER do
raise "Error while extracting data." unless system "../osrm-extract #{osm_data_area_name}.osm.pbf ../profiles/#{PROFILE}.lua" raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf ../profiles/#{PROFILE}.lua"
end end
end end
desc "Prepare OSM data." desc "Prepare OSM data."
task :prepare => :setup do task :prepare => :setup do
Dir.chdir DATA_FOLDER do Dir.chdir DATA_FOLDER do
raise "Error while preparing data." unless system "../osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions ../profiles/#{PROFILE}.lua" raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm #{osm_data_area_name}.osrm.restrictions ../profiles/#{PROFILE}.lua"
end end
end end
@ -157,7 +157,7 @@ desc "Run the routing server in the terminal. Press Ctrl-C to stop."
task :run => :setup do task :run => :setup do
Dir.chdir DATA_FOLDER do Dir.chdir DATA_FOLDER do
write_server_ini osm_data_area_name write_server_ini osm_data_area_name
system "../osrm-routed" system "../#{BUILD_FOLDER}/osrm-routed"
end end
end end
@ -166,7 +166,7 @@ task :up => :setup do
Dir.chdir DATA_FOLDER do Dir.chdir DATA_FOLDER do
abort("Already up.") if up? abort("Already up.") if up?
write_server_ini osm_data_area_name write_server_ini osm_data_area_name
pipe = IO.popen('../osrm-routed 1>>osrm-routed.log 2>>osrm-routed.log') pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed 1>>osrm-routed.log 2>>osrm-routed.log")
timeout = 5 timeout = 5
(timeout*10).times do (timeout*10).times do
begin begin