diff --git a/windows_deliv/etc/config.btm b/windows_deliv/etc/config.btm index ebfed75..4534f1c 100644 --- a/windows_deliv/etc/config.btm +++ b/windows_deliv/etc/config.btm @@ -38,12 +38,13 @@ iff not defined DEFAULT_ISE_SVN then endiff iff not defined ISE_C_COMPILER then -REM set ISE_C_COMPILER=msc - set ISE_C_COMPILER=msc_vc140 +REM set ISE_C_COMPILER=msc_vc140 + set ISE_C_COMPILER=msc endiff iff not defined ISE_C_COMPILER_VER then REM set ISE_C_COMPILER_VER=WSDK71 +REM set ISE_C_COMPILER_VER=VC150 REM set ISE_C_COMPILER_VER=VC140 set ISE_C_COMPILER_VER=VC100 endiff diff --git a/windows_deliv/etc/local-WINPC.btm b/windows_deliv/etc/local-WINPC.btm new file mode 100644 index 0000000..c7141a0 --- /dev/null +++ b/windows_deliv/etc/local-WINPC.btm @@ -0,0 +1,48 @@ +echo Load local settings + +REM set ISE_PLATFORM=windows +iff not defined ISE_PLATFORM then + set ISE_PLATFORM=win64 +endiff + +iff not defined ISE_EIFFEL then + set ISE_EIFFEL=C:\DEV\Eiffel\18.05_%ISE_PLATFORM% +endiff + +rem set ISE_EC_FLAGS=-full + +iff "%ISE_PLATFORM%" == "win64" then + rem set MYSQL=C:\Program Files (x86)\MySQL\MySQL Connector.C 6.1 + rem set MYSQL=C:\DEV\mysql\winx64\ + rem set MYSQL=C:\apps\mysql-5.6.22-winx64\ + rem set MYSQL=C:\DEV\3rd\mysql\mysql-5.6.38-winx64 + set MYSQL=C:\DEV\include\mysql-connector-c-6.1.11-winx64 +else + rem set MYSQL=C:\Program Files (x86)\MySQL\MySQL Connector.C 6.1 + set MYSQL=C:\DEV\3rd\mysql\mysql-5.6.38-win32 + rem set MYSQL=C:\DEV\include\mysql-connector-c-6.1.11-win32 +endiff + +iff not defined WORK_DIR then + set WORK_DIR=C:\DEV\deliv + rem set WORK_DIR=M:\deliv +endiff +iff not defined DEFAULT_PUBLIC_SVN then + set DEFAULT_PUBLIC_SVN=file:///C:/DEV/ise/repos/mirrors/svn/eiffelstudio/trunk + set DEFAULT_PUBLIC_SVN=svn://192.168.1.11:3699/trunk +endiff +iff not defined DEFAULT_ISE_SVN then + set DEFAULT_ISE_SVN=svn://jfiat@svn.ise:3691/ise_svn/trunk + set DEFAULT_ISE_SVN=file:///C:/DEV/ise/repos/mirrors/svn/ise/trunk + set DEFAULT_ISE_SVN=svn://192.168.1.11:3698/trunk +endiff + +rem set PATH=%PATH%;C:\cygwin64\bin +set PATH=%PATH%;C:\apps\files\7-Zip + +set DELIV_SKIP_ERROR="True" +rem set DELIV_SKIP_ERROR="False" + + +set ISE_LITE_DELIV="False" + diff --git a/windows_deliv/make_dotnet.btm b/windows_deliv/make_dotnet.btm index b27da9e..43be635 100644 --- a/windows_deliv/make_dotnet.btm +++ b/windows_deliv/make_dotnet.btm @@ -5,7 +5,9 @@ cdd %EIFFEL_SRC remtrace Compiling .NET runtime cd %EIFFEL_SRC%\Eiffel\eiffel\com_il_generation\core\run-time -espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c nmake msbuild_20" +sed -e "s/msbuild runtime.sln/msbuild runtime.sln \/p:Platform=\"Any CPU\" \/p:Configuration=Release /" Makefile > Makefile-release + +espawn -u:%ISE_C_COMPILER_VER% "%COMSPEC% /c nmake -f Makefile-release msbuild_20" iff exist EiffelSoftware.Runtime.dll then safe_copy EiffelSoftware.Runtime.dll %STUDIO_DIR\studio\spec\%ISE_PLATFORM\lib safe_copy EiffelSoftware.Runtime.dll %STUDIO_DIR\studio\spec\%ISE_PLATFORM\bin @@ -15,7 +17,7 @@ else CANCEL_ON_ERROR endiff -remtrace Compiling Eiffel Assembly Cache +remtrace Compiling Eiffel Assembly Cache EiffelSoftware.MetadataConsumer.dll iff exist %STUDIO_DIR\studio\spec\%ISE_PLATFORM\bin\EiffelSoftware.MetadataConsumer.dll then remtrace EiffelSoftware.MetadataConsumer.dll is already built else @@ -26,12 +28,12 @@ else safe_copy EiffelSoftware.MetadataConsumer.dll %STUDIO_DIR\studio\spec\%ISE_PLATFORM\bin safe_copy libEiffelSoftware.MetadataConsumer.dll %STUDIO_DIR\studio\spec\%ISE_PLATFORM\bin else - remerror Could not compile EiffelSoftware.MetadataConsumer.dll + remerror Could not compile EiffelSoftware.MetadataConsumer.dll (consumer_20) CANCEL_ON_ERROR endiff endiff -remtrace Compiling Eiffel Metadata Cosumer Executable +remtrace Compiling Eiffel Metadata Consumer Executable emdc.exe iff exist %STUDIO_DIR\tools\spec\%ISE_PLATFORM\bin\emdc.exe then remtrace emdc tool is already built else diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm index 1e71901..a0619b5 100644 --- a/windows_deliv/make_installations.btm +++ b/windows_deliv/make_installations.btm @@ -25,6 +25,7 @@ else set WINNAME=x86 endiff + iff .%1.==.. then remtrace --------------------------------------------- remtrace Checkout and compile the hallow tool @@ -43,7 +44,7 @@ iff .%1.==.. then cleanup_dotnet_eiffel hallow hallow.exe iff not exist libhallow.dll then remtrace Couldnt generate hallow.exe - CANCEL + CANCEL_ON_ERROR else move hallow.exe %INIT_DIR\install\bin move libhallow.dll %INIT_DIR\install\bin @@ -64,7 +65,7 @@ iff .%1.==.. then iff not exist setup.dll then remtrace Couldnt generate setup.dll QUIT - CANCEL + CANCEL_ON_ERROR endiff safe_md %INIT_DIR\install\binaries safe_md %INIT_DIR\install\binaries\%WINNAME @@ -75,6 +76,7 @@ remtrace ---------------------------------------------- remtrace Building the MSIs remtrace ---------------------------------------------- + cdd %INIT_DIR\install\content\eiffelstudio safe_md %INSTALL_DIR\setups safe_md %INSTALL_DIR\setups\gpl @@ -92,6 +94,7 @@ remtrace Preparing Commercial edition espawn "nmake /nologo enterprise_%WINNAME" safe_copy %INIT_DIR\install\bin\studio_ent_%WINNAME\package.msi %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.msi + remtrace ---------------------------------------------- remtrace Building the Zips remtrace ---------------------------------------------- diff --git a/windows_deliv/set_aliases.btm b/windows_deliv/set_aliases.btm index 21c88ff..0915e44 100644 --- a/windows_deliv/set_aliases.btm +++ b/windows_deliv/set_aliases.btm @@ -18,7 +18,7 @@ else CANCEL endiff -set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%_%ISE_C_COMPILER_VER% +set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_C_COMPILER_VER% set DELIV_DIR=%WORK_DIR%\build