From fd4c4ea0987eef2ebc8d4422a673da0a3a61e92b Mon Sep 17 00:00:00 2001 From: Jocelyn Date: Mon, 4 Mar 2019 20:35:21 +0000 Subject: [PATCH 1/3] updated gitignore file --- windows_deliv/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_deliv/.gitignore b/windows_deliv/.gitignore index 6dd74b1..12a84e7 100644 --- a/windows_deliv/.gitignore +++ b/windows_deliv/.gitignore @@ -1,3 +1,3 @@ nightly include -isevpn +isesvn From eec43c3fd7aa36022a48cfd4a6353122f4e7b599 Mon Sep 17 00:00:00 2001 From: Jocelyn Date: Mon, 4 Mar 2019 20:45:11 +0000 Subject: [PATCH 2/3] added helper scripts --- windows_deliv/bin/install_from_7z.bat | 11 +++++++++++ windows_deliv/bin/setup.bat | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 windows_deliv/bin/install_from_7z.bat create mode 100644 windows_deliv/bin/setup.bat diff --git a/windows_deliv/bin/install_from_7z.bat b/windows_deliv/bin/install_from_7z.bat new file mode 100644 index 0000000..e5bf0e9 --- /dev/null +++ b/windows_deliv/bin/install_from_7z.bat @@ -0,0 +1,11 @@ +echo Remove Eiffel_*.* +rd /q/s Eiffel_%1 + +echo Extract archive +%~dp07z x %2 + +echo remove junction eiffel_win64 +c:\apps\bin\junction -d eiffel_win64 + +echo create new junction +c:\apps\bin\junction eiffel_win64 Eiffel_%1 diff --git a/windows_deliv/bin/setup.bat b/windows_deliv/bin/setup.bat new file mode 100644 index 0000000..08d1823 --- /dev/null +++ b/windows_deliv/bin/setup.bat @@ -0,0 +1,5 @@ +set ISE_EIFFEL=%CD%\eiffel_win64 +set ISE_PLATFORM=win64 +set ISE_C_COMPILER=msc_vc140 + +set PATH=%PATH%;%ISE_EIFFEL%\studio\spec\%ISE_PLATFORM%\bin From 4801a49ed9c8622960c6e021e347221021b3084e Mon Sep 17 00:00:00 2001 From: Jocelyn Date: Thu, 7 Mar 2019 19:24:28 +0000 Subject: [PATCH 3/3] updated delivery scripts. --- windows_deliv/bin/setup.bat | 4 +++- windows_deliv/call_make_dotnet.btm | 5 +++++ windows_deliv/make_delivery.btm | 6 +++--- windows_deliv/menu.bat | 24 ++++++++++++++++++++++-- 4 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 windows_deliv/call_make_dotnet.btm diff --git a/windows_deliv/bin/setup.bat b/windows_deliv/bin/setup.bat index 08d1823..febe8b9 100644 --- a/windows_deliv/bin/setup.bat +++ b/windows_deliv/bin/setup.bat @@ -1,5 +1,7 @@ -set ISE_EIFFEL=%CD%\eiffel_win64 +set ISE_EIFFEL=%~dp0eiffel_win64 set ISE_PLATFORM=win64 set ISE_C_COMPILER=msc_vc140 set PATH=%PATH%;%ISE_EIFFEL%\studio\spec\%ISE_PLATFORM%\bin +set PATH=%PATH%;%ISE_EIFFEL%\tools\spec\%ISE_PLATFORM%\bin +set PATH=%PATH%;%ISE_EIFFEL%\library\gobo\spec\%ISE_PLATFORM%\bin diff --git a/windows_deliv/call_make_dotnet.btm b/windows_deliv/call_make_dotnet.btm new file mode 100644 index 0000000..15af451 --- /dev/null +++ b/windows_deliv/call_make_dotnet.btm @@ -0,0 +1,5 @@ +call %~dp0init.btm + +cdd %INIT_DIR +call make_dotnet.btm +cdd %EIFFEL_SRC diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm index 69a9c60..049375d 100644 --- a/windows_deliv/make_delivery.btm +++ b/windows_deliv/make_delivery.btm @@ -317,18 +317,18 @@ iff not defined NO_COMPILE then remtrace ISE specific files cdd %EIFFEL_SRC if EXIST %INIT_DIR%\isesvn\library\keygen ( - xcopy %INIT_DIR%\isesvn\library\keygen library\keygen /E /I + xcopy %INIT_DIR%\isesvn\library\keygen library\keygen /E /I /Y ) else ( co %DEFAULT_ISE_SVN%/Src/library/keygen library/keygen ) cd tools if EXIST %INIT_DIR%\isesvn\tools\activation ( - xcopy %INIT_DIR%\isesvn\tools\activation activation /E /I + xcopy %INIT_DIR%\isesvn\tools\activation activation /E /I /Y ) else ( co %DEFAULT_ISE_SVN%/Src/tools/activation activation ) if EXIST %INIT_DIR%\isesvn\tools\estudio_enterprise ( - xcopy %INIT_DIR%\isesvn\tools\estudio_enterprise estudio_enterprise /E /I + xcopy %INIT_DIR%\isesvn\tools\estudio_enterprise estudio_enterprise /E /I /Y ) else ( co %DEFAULT_ISE_SVN%/Src/tools/estudio_enterprise estudio_enterprise ) diff --git a/windows_deliv/menu.bat b/windows_deliv/menu.bat index 17b0a95..99f6c79 100644 --- a/windows_deliv/menu.bat +++ b/windows_deliv/menu.bat @@ -14,10 +14,11 @@ echo EiffelStudio delivery: @echo 7: GPL only @echo ------------------- @echo i: display info +@echo x: extra menu @echo ------------------- @echo q: quit -CHOICE /C 1234567iq /M " > selection:" +CHOICE /C 1234567ixq /M " > selection:" if .%ERRORLEVEL%. == .1. GOTO make_delivery if .%ERRORLEVEL%. == .2. GOTO make_exes if .%ERRORLEVEL%. == .3. GOTO make_installations @@ -26,7 +27,8 @@ if .%ERRORLEVEL%. == .5. GOTO bootstrap_env if .%ERRORLEVEL%. == .6. GOTO display_logs if .%ERRORLEVEL%. == .7. GOTO menu_gpl if .%ERRORLEVEL%. == .8. GOTO display_info -if .%ERRORLEVEL%. == .9. goto end +if .%ERRORLEVEL%. == .9. GOTO menu_extra +if .%ERRORLEVEL%. == .10. goto end goto end :menu_gpl @@ -35,6 +37,8 @@ echo EiffelStudio GPL delivery: @echo 1: make_delivery @echo 2: make_exes @echo 3: make_installation +@echo ------------------- +@echo q: quit CHOICE /C 123q /M " > selection:" if .%ERRORLEVEL%. == .1. GOTO make_delivery if .%ERRORLEVEL%. == .2. GOTO make_exes @@ -42,6 +46,16 @@ if .%ERRORLEVEL%. == .3. GOTO make_installations if .%ERRORLEVEL%. == .4. goto end goto end +:menu_extra +echo Extra menu +@echo 1: make_dotnet +@echo ------------------- +@echo q: quit +CHOICE /C 1q /M " > selection:" +if .%ERRORLEVEL%. == .1. GOTO call_make_dotnet +if .%ERRORLEVEL%. == .2. goto end +goto end + :make_delivery %TCCLECMD% /C make_delivery.btm goto end @@ -59,10 +73,16 @@ set NO_ENTERPRISE_BUILD="True" goto end :make_exes +set NO_ENTERPRISE_BUILD= %TCCLECMD% /C make_exes.btm goto end +:call_make_dotnet +%TCCLECMD% /C call_make_dotnet.btm +goto end + :make_installations +set NO_ENTERPRISE_BUILD= %TCCLECMD% /C make_installations.btm goto end