Updated config files.

.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/

windows_deliv/.gitignore

@@ -0,0 +1 @@
+nightly

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

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
 
 

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.