From 176fa3f4ad26892604d1f207acd1acefb161a3ba Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 11 Dec 2018 18:11:56 +0100
Subject: [PATCH] Updated config files.

---
 .gitignore                             |  1 +
 windows_deliv/.gitignore               |  1 +
 windows_deliv/etc/machines/JFIATPC.btm | 16 ++++++++--------
 windows_deliv/etc/machines/local.btm   |  6 +++++-
 windows_deliv/init.btm                 |  1 +
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 windows_deliv/.gitignore

diff --git a/.gitignore b/.gitignore
index ef49332..1e1dcbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 tools
 windows/headers/
 windows/wix
+windows_deliv/bin/eiffel_win64
 windows_deliv/headers/
 windows_deliv/install/bin/
 windows_deliv/install/binaries/
diff --git a/windows_deliv/.gitignore b/windows_deliv/.gitignore
new file mode 100644
index 0000000..bf867e0
--- /dev/null
+++ b/windows_deliv/.gitignore
@@ -0,0 +1 @@
+nightly
diff --git a/windows_deliv/etc/machines/JFIATPC.btm b/windows_deliv/etc/machines/JFIATPC.btm
index 8098793..6a405a2 100644
--- a/windows_deliv/etc/machines/JFIATPC.btm
+++ b/windows_deliv/etc/machines/JFIATPC.btm
@@ -4,7 +4,7 @@ iff not defined ISE_PLATFORM then
 	set ISE_PLATFORM=win64
 endiff
 iff not defined ISE_EIFFEL then
-	set ISE_EIFFEL=e:\Eiffel\18.07_%ISE_PLATFORM%
+	set ISE_EIFFEL=%INIT_DIR%\bin\eiffel_%ISE_PLATFORM%
 endiff
 
 
@@ -23,17 +23,17 @@ iff not defined MYSQL then
 endiff
 
 iff not defined WORK_DIR then
-	set WORK_DIR=e:\deliv
+	set WORK_DIR=%INIT_DIR%\deliv
 	set WORK_DIR=M:\deliv
 endiff
 
-set LOCAL_REPO_ROOT=%~dp0..\..\..\repos\mirrors
-pushd %LOCAL_REPO_ROOT%
-set LOCAL_REPO_ROOT=%CD%
-popd
-set "LOCAL_REPO_ROOT=%LOCAL_REPO_ROOT:\=/%"
-
+::set LOCAL_REPO_ROOT=%~dp0..\..\..\repos\mirrors
+::pushd %LOCAL_REPO_ROOT%
+::set LOCAL_REPO_ROOT=%CD%
+::popd
+::set "LOCAL_REPO_ROOT=%LOCAL_REPO_ROOT:\=/%"
 set LOCAL_REPO_ROOT=b:\ise\repos\mirrors
+
 iff not defined DEFAULT_PUBLIC_SVN then
 	set DEFAULT_PUBLIC_SVN=file:///%LOCAL_REPO_ROOT%/svn/eiffelstudio/trunk
 rem 	set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk
diff --git a/windows_deliv/etc/machines/local.btm b/windows_deliv/etc/machines/local.btm
index 7f8fe19..875ab1c 100644
--- a/windows_deliv/etc/machines/local.btm
+++ b/windows_deliv/etc/machines/local.btm
@@ -7,7 +7,11 @@ endiff
 :: Set default environment for any machine here.
 
 iff not defined WORK_DIR then
-	set WORK_DIR=%~dp0..\..\_DELIV
+	set WORK_DIR=%~dp0..\..\DELIV
+endiff
+
+iff not defined ISE_EIFFEL then
+	set ISE_EIFFEL=%INIT_DIR%\bin\eiffel_%ISE_PLATFORM%
 endiff
 
 
diff --git a/windows_deliv/init.btm b/windows_deliv/init.btm
index e9370a7..8754062 100644
--- a/windows_deliv/init.btm
+++ b/windows_deliv/init.btm
@@ -1,6 +1,7 @@
 iff not defined INIT_DIR then
 	set INIT_DIR=%@EXECSTR[cd]
 endiff
+:: Set aliases and also call etc\config.btm
 call %INIT_DIR\set_aliases.btm
 
 REM Adding Wix to the path.