Updated config files.

This commit is contained in:
2018-12-11 18:11:56 +01:00
parent f0ea7b8cd3
commit 176fa3f4ad
5 changed files with 16 additions and 9 deletions

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
tools tools
windows/headers/ windows/headers/
windows/wix windows/wix
windows_deliv/bin/eiffel_win64
windows_deliv/headers/ windows_deliv/headers/
windows_deliv/install/bin/ windows_deliv/install/bin/
windows_deliv/install/binaries/ windows_deliv/install/binaries/

1
windows_deliv/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
nightly

View File

@@ -4,7 +4,7 @@ iff not defined ISE_PLATFORM then
set ISE_PLATFORM=win64 set ISE_PLATFORM=win64
endiff endiff
iff not defined ISE_EIFFEL then 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 endiff
@@ -23,17 +23,17 @@ iff not defined MYSQL then
endiff endiff
iff not defined WORK_DIR then iff not defined WORK_DIR then
set WORK_DIR=e:\deliv set WORK_DIR=%INIT_DIR%\deliv
set WORK_DIR=M:\deliv set WORK_DIR=M:\deliv
endiff endiff
set LOCAL_REPO_ROOT=%~dp0..\..\..\repos\mirrors ::set LOCAL_REPO_ROOT=%~dp0..\..\..\repos\mirrors
pushd %LOCAL_REPO_ROOT% ::pushd %LOCAL_REPO_ROOT%
set LOCAL_REPO_ROOT=%CD% ::set LOCAL_REPO_ROOT=%CD%
popd ::popd
set "LOCAL_REPO_ROOT=%LOCAL_REPO_ROOT:\=/%" ::set "LOCAL_REPO_ROOT=%LOCAL_REPO_ROOT:\=/%"
set LOCAL_REPO_ROOT=b:\ise\repos\mirrors set LOCAL_REPO_ROOT=b:\ise\repos\mirrors
iff not defined DEFAULT_PUBLIC_SVN then iff not defined DEFAULT_PUBLIC_SVN then
set DEFAULT_PUBLIC_SVN=file:///%LOCAL_REPO_ROOT%/svn/eiffelstudio/trunk set DEFAULT_PUBLIC_SVN=file:///%LOCAL_REPO_ROOT%/svn/eiffelstudio/trunk
rem set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk rem set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk

View File

@@ -7,7 +7,11 @@ endiff
:: Set default environment for any machine here. :: Set default environment for any machine here.
iff not defined WORK_DIR then 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 endiff

View File

@@ -1,6 +1,7 @@
iff not defined INIT_DIR then iff not defined INIT_DIR then
set INIT_DIR=%@EXECSTR[cd] set INIT_DIR=%@EXECSTR[cd]
endiff endiff
:: Set aliases and also call etc\config.btm
call %INIT_DIR\set_aliases.btm call %INIT_DIR\set_aliases.btm
REM Adding Wix to the path. REM Adding Wix to the path.