eiffel/es_build_deliv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quiet svn commands

Browse Source 
workaround few issues (delay during deletion ?)
This commit is contained in:
Jocelyn FIAT
2019-03-02 20:24:34 +00:00
parent 2415d545f8
commit b216cb5759
6 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
windows_deliv/install/wix/install.bat Normal file
View File

@@ -0,0 +1,4 @@
c:\apps\bin\junction "Windows Installer XML v3" C:\dev\es-deliv-scripts\windows_deliv\install\wix\v3.0
c:\apps\bin\junction "C:\Program Files (x86)\MSBuild\Microsoft\WiX" C:\dev\es-deliv-scripts\windows_deliv\install\wix
cd v3.0
c:\apps\bin\junction bin %cd%

6
windows_deliv/make_delivery.btm
View File

@@ -201,6 +201,7 @@ cdd %STUDIO_DIR
remtrace root remtrace root
exprt -N -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery Delivery exprt -N -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery Delivery
move Delivery\*.* . >>& %INSTALL_LOG move Delivery\*.* . >>& %INSTALL_LOG
give_time_to move Delivery files.
fullrd Delivery >>& %INSTALL_LOG fullrd Delivery >>& %INSTALL_LOG
fullrf INSTALL README make_install compile_libraries fullrf INSTALL README make_install compile_libraries
remtrace eweasel (just the necessary) remtrace eweasel (just the necessary)
@@ -300,8 +301,11 @@ iff not defined NO_COMPILE then
remtrace Update all libraries remtrace Update all libraries
iff isdir %EIFFEL_SRC then iff isdir %EIFFEL_SRC then
remtrace Delete %EIFFEL_SRC remtrace Delete %EIFFEL_SRC
fullrd %EIFFEL_SRC rename %EIFFEL_SRC% %EIFFEL_SRC%-deleting
fullrd %EIFFEL_SRC%-deleting
give_time_to remove %EIFFEL_SRC%
endiff endiff
safe_md %EIFFEL_SRC safe_md %EIFFEL_SRC
REM Clean up the files REM Clean up the files

2
windows_deliv/make_installations.btm
View File

@@ -59,7 +59,9 @@ iff .%1.==.. then
cdd %EIFFEL_SRC cdd %EIFFEL_SRC
cd tools cd tools
if EXIST %INIT_DIR%\isesvn\tools\setup ( if EXIST %INIT_DIR%\isesvn\tools\setup (
if not EXIST setup (
xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
)
) else ( ) else (
co %DEFAULT_ISE_SVN%/Src/tools/setup setup co %DEFAULT_ISE_SVN%/Src/tools/setup setup
) )

1
windows_deliv/set_aliases.btm
View File

@@ -22,7 +22,6 @@ echo ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%
iff defined ISE_C_COMPILER_VER then iff defined ISE_C_COMPILER_VER then
set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140% set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140%
:: set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140%.%ISE_C_COMPILER_VER% :: set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140%.%ISE_C_COMPILER_VER%
:: set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_C_COMPILER_VER%
else else
set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM% set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%
endiff endiff

4
windows_deliv/set_simple_aliases.btm
View File

@@ -43,8 +43,8 @@ alias cancel `echo Exiting... & echo Total time used: & echo %@TIMER[2] & set PA
alias CANCEL_ON_ERROR `iff not "%DELIV_SKIP_ERROR%" == "True" then & CANCEL & endiff` alias CANCEL_ON_ERROR `iff not "%DELIV_SKIP_ERROR%" == "True" then & CANCEL & endiff`
REM CVS Commands: checkout, export REM CVS Commands: checkout, export
alias co `call %INIT_DIR\svn_command.bat co %$ >>& %INSTALL_LOG` alias co `call %INIT_DIR\svn_command.bat co --quiet %$ >>& %INSTALL_LOG`
alias exprt `call %INIT_DIR\svn_command.bat --force export %$ >>& %INSTALL_LOG` alias exprt `call %INIT_DIR\svn_command.bat --force export --quiet %$ >>& %INSTALL_LOG`
REM We cannot redirect the output here, since the output is redirected to a file REM We cannot redirect the output here, since the output is redirected to a file
alias exprtfile `call %INIT_DIR\svn_command.bat cat %$` alias exprtfile `call %INIT_DIR\svn_command.bat cat %$`

1
windows_deliv/svn_command.bat
View File

@@ -6,6 +6,7 @@ set i=0
:start :start
if not "%i%"=="0" goto finish if not "%i%"=="0" goto finish
echo svn ... %*
svn --config-option config:miscellany:use-commit-times=yes %* svn --config-option config:miscellany:use-commit-times=yes %*
if not errorlevel 1 set i=1 if not errorlevel 1 set i=1
goto start goto start