From 3ef586653d5f319fbd1d62e545a7f78aff9bcbb5 Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 8 Jan 2011 23:30:39 +0200 Subject: [PATCH] Rewrite batch files for new indexer_tool options --- tools/win/from_bz2.bat | 4 ---- tools/win/from_bz2_ui.bat | 3 --- tools/win/from_osm.bat | 4 ---- tools/win/gen_all.bat | 4 ++++ tools/win/gen_features.bat | 3 +++ tools/win/gen_geometry.bat | 3 +++ tools/win/gen_index.bat | 2 +- tools/win/gen_intermediate.bat | 3 --- tools/win/process_xml.bat | 3 +++ tools/win/set_vars.bat | 1 - 10 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 tools/win/from_bz2.bat delete mode 100644 tools/win/from_bz2_ui.bat delete mode 100644 tools/win/from_osm.bat create mode 100644 tools/win/gen_all.bat create mode 100644 tools/win/gen_features.bat create mode 100644 tools/win/gen_geometry.bat delete mode 100644 tools/win/gen_intermediate.bat create mode 100644 tools/win/process_xml.bat diff --git a/tools/win/from_bz2.bat b/tools/win/from_bz2.bat deleted file mode 100644 index 8ca95a1ce1..0000000000 --- a/tools/win/from_bz2.bat +++ /dev/null @@ -1,4 +0,0 @@ -call set_vars.bat %1 %2 - -%UNZIP_TOOL% -dc %OSM_FILE% | %INDEXER_TOOL% --generate_intermediate_data=true --generate_final_data=false --use_light_nodes=true --generate_index=false --intermediate_data_path=D:\Temp\ -%UNZIP_TOOL% -dc %OSM_FILE% | %INDEXER_TOOL% --generate_intermediate_data=false --generate_final_data=true --use_light_nodes=true --generate_index=true --sort_features --intermediate_data_path=D:\Temp\ --output=%2 --bucketing_level=0 diff --git a/tools/win/from_bz2_ui.bat b/tools/win/from_bz2_ui.bat deleted file mode 100644 index 7b8d0229d6..0000000000 --- a/tools/win/from_bz2_ui.bat +++ /dev/null @@ -1,3 +0,0 @@ -call set_vars.bat %1 %2 - -%UNZIP_TOOL% -dc %OSM_FILE_PLANET% | %INDEXER_TOOL% --generate_intermediate_data=false --generate_final_data=true --use_light_nodes=false --generate_index=true --sort_features --intermediate_data_path=H:\omim\Intermediate\ --output=%2 diff --git a/tools/win/from_osm.bat b/tools/win/from_osm.bat deleted file mode 100644 index d78bf9a0ba..0000000000 --- a/tools/win/from_osm.bat +++ /dev/null @@ -1,4 +0,0 @@ -set INDEXER_TOOL="..\..\out\%1\indexer_tool.exe" - -%INDEXER_TOOL% --generate_intermediate_data=true --generate_final_data=false --use_light_nodes=true --generate_index=false --intermediate_data_path=D:\Temp\ < ..\..\data\tests\%2.osm -%INDEXER_TOOL% --generate_intermediate_data=false --generate_final_data=true --use_light_nodes=true --generate_index=true --sort_features --intermediate_data_path=D:\Temp\ --output=%2 < ..\..\data\tests\%2.osm --bucketing_level=0 diff --git a/tools/win/gen_all.bat b/tools/win/gen_all.bat new file mode 100644 index 0000000000..40ce1c2bf2 --- /dev/null +++ b/tools/win/gen_all.bat @@ -0,0 +1,4 @@ +rem call process_xml.bat %1 %2 +call gen_features.bat %1 %2 +call gen_geometry %1 %2 +call gen_index %1 %2 diff --git a/tools/win/gen_features.bat b/tools/win/gen_features.bat new file mode 100644 index 0000000000..d3003425d2 --- /dev/null +++ b/tools/win/gen_features.bat @@ -0,0 +1,3 @@ +call set_vars.bat %1 %2 + +%UNZIP_TOOL% -dc %OSM_FILE% | %INDEXER_TOOL% --generate_features=true --use_light_nodes=true --intermediate_data_path=D:\Temp\ --output=%2 --bucketing_level=0 diff --git a/tools/win/gen_geometry.bat b/tools/win/gen_geometry.bat new file mode 100644 index 0000000000..48499943ad --- /dev/null +++ b/tools/win/gen_geometry.bat @@ -0,0 +1,3 @@ +call set_vars.bat %1 %2 + +%INDEXER_TOOL% --generate_geometry=true --output=%2 --bucketing_level=0 diff --git a/tools/win/gen_index.bat b/tools/win/gen_index.bat index c68a72a9aa..ddee4f37bd 100644 --- a/tools/win/gen_index.bat +++ b/tools/win/gen_index.bat @@ -1,3 +1,3 @@ call set_vars.bat %1 %2 -%INDEXER_TOOL% --generate_intermediate_data=false --generate_final_data=false --generate_index=true --intermediate_data_path=D:\Temp\ +%INDEXER_TOOL% --generate_index=true --intermediate_data_path=D:\Temp\ --output=%2 --bucketing_level=0 diff --git a/tools/win/gen_intermediate.bat b/tools/win/gen_intermediate.bat deleted file mode 100644 index 355327a490..0000000000 --- a/tools/win/gen_intermediate.bat +++ /dev/null @@ -1,3 +0,0 @@ -call set_vars.bat %1 %2 - -%UNZIP_TOOL% -dc %OSM_FILE_PLANET% | %INDEXER_TOOL% --generate_intermediate_data=true --generate_final_data=false --use_light_nodes=false --generate_index=false --intermediate_data_path=H:\omim\Intermediate\ diff --git a/tools/win/process_xml.bat b/tools/win/process_xml.bat new file mode 100644 index 0000000000..f22851e59c --- /dev/null +++ b/tools/win/process_xml.bat @@ -0,0 +1,3 @@ +call set_vars.bat %1 %2 + +%UNZIP_TOOL% -dc %OSM_FILE% | %INDEXER_TOOL% --preprocess_xml=true --generate_features=false --generate_geometry=false --use_light_nodes=true --generate_index=false --intermediate_data_path=D:\Temp\ diff --git a/tools/win/set_vars.bat b/tools/win/set_vars.bat index 9db6d7e6d4..13865c60c4 100644 --- a/tools/win/set_vars.bat +++ b/tools/win/set_vars.bat @@ -1,4 +1,3 @@ set UNZIP_TOOL="..\bunzip2.exe" set OSM_FILE="D:\Temp\Osm\%2.osm.bz2" -set OSM_FILE_PLANET="H:\omim\%2.osm.bz2" set INDEXER_TOOL="..\..\out\%1\indexer_tool.exe"