From 4c552671c177fbf22f8d9c102e4c648729374668 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 2 Dec 2014 10:51:08 +0100
Subject: [PATCH] Updated install_ewf.bat to use the new "ecf_tool" from
 https://svn.eiffel.com/eiffelstudio/trunk/Src/tools/ecf_tool .

---
 tools/bin/ecf_tool.bat | 37 +++++++++++++++++++++++++++++++++++++
 tools/install_ewf.bat  |  8 ++++----
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 tools/bin/ecf_tool.bat

diff --git a/tools/bin/ecf_tool.bat b/tools/bin/ecf_tool.bat
new file mode 100644
index 00000000..d8fd51b7
--- /dev/null
+++ b/tools/bin/ecf_tool.bat
@@ -0,0 +1,37 @@
+@echo off
+setlocal
+
+if "%ECF_TOOL_PATH%" == "" goto LOCAL_ECF_TOOL
+goto start
+
+:LOCAL_ECF_TOOL
+if exist "%~dp0ecf_tool.exe" set ECF_TOOL_PATH=%~dp0
+
+if "%ECF_TOOL_PATH%" == "" goto SEARCH_ECF_TOOL
+goto START
+
+:SEARCH_ECF_TOOL
+for %%f in (ecf_tool.exe) do (
+    if exist "%%~dp$PATH:f" set ECF_TOOL_PATH="%%~dp$PATH:f"
+ )
+if "%ECF_TOOL_PATH%" == "" goto BUILD_ECF_TOOL
+echo Using ecf_tool.exe from %ECF_TOOL_PATH%
+goto START
+
+:BUILD_ECF_TOOL
+set TMP_SVN_CHECKOUT=%~dp0.tmp_ecf_tool
+call svn checkout https://svn.eiffel.com/eiffelstudio/trunk/Src/tools/ecf_tool %TMP_SVN_CHECKOUT%
+call ecb -config %~dp0.tmp_ecf_tool\ecf_tool.ecf -finalize -c_compile -project_path %TMP_SVN_CHECKOUT%
+copy %TMP_SVN_CHECKOUT%\EIFGENs\ecf_tool\F_code\ecf_tool.exe %~dp0ecf_tool.exe
+rd /q/s %TMP_SVN_CHECKOUT%
+
+set ECF_TOOL_PATH=%~dp0
+goto START
+
+:START
+echo Calling %ECF_TOOL_PATH%ecf_tool.exe %*
+call %ECF_TOOL_PATH%ecf_tool.exe %*
+goto END
+
+:END
+endlocal
diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat
index 154dfd33..be11a064 100644
--- a/tools/install_ewf.bat
+++ b/tools/install_ewf.bat
@@ -126,16 +126,16 @@ rem #--- Update ecf files ---#
 :ecf_updating
 cd %TMP_TARGET_DIR%
 
-if -%ECF_UPDATER_PATH%- == -- goto use_bin_dir
-set TMP_ECF_UPDATER_CMD=%ECF_UPDATER_PATH%\ecf_updater.exe
+if -%ECF_TOOL_PATH%- == -- goto use_bin_dir
+set TMP_ECF_TOOL_CMD=%ECF_TOOL_PATH%\ecf_tool.exe
 goto call_ecf_update
 
 :use_bin_dir
-set TMP_ECF_UPDATER_CMD=%~dp0\bin\ecf_updater.bat
+set TMP_ECF_TOOL_CMD=%~dp0\bin\ecf_tool.bat
 goto call_ecf_update
 
 :call_ecf_update
-call %TMP_ECF_UPDATER_CMD% --force %2 %3 %4 %5 %6 %7 %8 %9 contrib
+call %TMP_ECF_TOOL_CMD% updater --root %TMP_TARGET_DIR% --force %2 %3 %4 %5 %6 %7 %8 %9 %TMP_TARGET_DIR%\contrib
 
 :end
 del %TMP_EXCLUDE%