updating release routine

ELENA-LANG · Sep 8, 2017 · bfbffe1 · bfbffe1
1 parent 2b42c00
commit bfbffe1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 28 deletions.
diff --git a/install/elena_inno.iss b/install/elena_inno.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{3CAA69D3-0F98-44B1-A73E-E864BA51D5BD}
 AppName=ELENA Programming Language
-AppVersion=3.w.0
+AppVersion=3.2.0
 ;AppVerName=ELENA Programming Language 3.1.0
 AppPublisher=Alexey Rakov
 AppPublisherURL=http://github.com/ELENA-LANG/elena-lang
@@ -42,7 +42,9 @@ Source: "..\src32\*"; DestDir: "{app}\src32"; Flags: ignoreversion recursesubdir
 Source: "..\doc\license"; DestDir: "{app}";
 Source: "..\readme.txt"; DestDir: "{app}"; Flags: isreadme
 Source: "..\whatsnew.txt"; DestDir: "{app}";
-Source: "VC_redist.x86.exe"; DestDir: "{app}"
+Source: "..\rebuild_lib.bat"; DestDir: "{app}";
+Source: "..\rebuild_examples.bat"; DestDir: "{app}";
+Source: "redist\VC_redist.x86.exe"; DestDir: "{app}"; Flags: deleteafterinstall
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -51,7 +53,7 @@ Name: "{commondesktop}\ELENA Programming Language"; Filename: "{app}\bin\elide.e
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\ELENA Programming Language"; Filename: "{app}\bin\elide.exe"; Tasks: quicklaunchicon
 
 [Run]
-Filename: "{app}\VC_redist.x86.exe; Parameters: "/install /passive /norestart" StatusMsg: Installing VC++ 2017 Redistributables...; Check: not VCinstalled
+Filename: "{app}\redist\VC_redist.x86.exe"; Parameters: "/install /passive /norestart"; StatusMsg: Installing VC++ 2017 Redistributables...; Check: not VCinstalled
 Filename: "{app}\bin\elide.exe"; Description: "{cm:LaunchProgram,ELENA Programming Language}"; Flags: nowait postinstall skipifsilent
 
 [Registry]

diff --git a/vs_release.bat b/vs_release.bat
@@ -13,52 +13,52 @@ ECHO =========== Starting Release Compile ==================
 
 ECHO Command line Compiler compiling....
 ECHO -----------------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\elc\vs\elc15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\elc\vs\elc15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Virtual Machine compiling....
 ECHO -----------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\elenavm\vs\elenavm15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\elenavm\vs\elenavm15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO IDE compiling....
 ECHO -----------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\ide\vs\elide15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\ide\vs\elide15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Run-Time Engine compiling....
 ECHO -----------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\elenart\vs\elenart15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\elenart\vs\elenart15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Script Engine compiling....
 ECHO ----------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\elenasm\vs\elenasm15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\elenasm\vs\elenasm15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Simplified Assembler compiling....
 ECHO -----------------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\tools\asm2bin\vs\asm2binx15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\tools\asm2bin\vs\asm2binx15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO ECODES viewer compiling....
 ECHO ---------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\tools\ecv\vs\ecv15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\tools\ecv\vs\ecv15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Virtual Machine Terminal compiling....
 ECHO --------------------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\tools\elt\vs\elt15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\tools\elt\vs\elt15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Optimization Rule Generator compiling....
 ECHO ------------------------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\tools\og\vs\og15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\tools\og\vs\og15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO Syntax Parse Table Generator compiling....
 ECHO ------------------------------------------
-"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" elenasrc2\tools\sg\vs\sg15.vcxproj /p:configuration=release
+"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %1\elenasrc2\tools\sg\vs\sg15.vcxproj /p:configuration=release
 IF NOT %ERRORLEVEL%==0 GOTO CompilerError
 
 ECHO =========== Release Compiled ==================
@@ -74,8 +74,8 @@ move %1\dat\og\rules.dat %1\bin
 md lib32
 %1\bin\asm2binx %1\src32\core\core_routines.esm lib32\system
 
-%1\bin\asm2binx %1\asm\x32\commands.asm %1\bin\x32
 %1\bin\asm2binx %1\asm\x32\core.asm %1\bin\x32
+%1\bin\asm2binx %1\asm\x32\corex.asm %1\bin\x32
 %1\bin\asm2binx %1\asm\x32\coreapi.asm %1\bin\x32
 %1\bin\asm2binx %1\asm\x32\core_vm.asm %1\bin\x32
 %1\bin\asm2binx %1\asm\x32\core_win.asm %1\bin\x32
@@ -303,6 +303,8 @@ copy %1\elenasrc2\tools\og\vs\*.vcxproj elenasrc2\tools\og\vs
 
 md install
 copy %1\install\*.iss install
+md install\redist
+copy %1\install\redist\VC_redist.x86.exe install\redist
 
 echo copying examples files
 
@@ -378,10 +380,10 @@ copy %1\examples\console\helloworld\*.prj examples\console\helloworld
 rem copy %1\examples\helloworld\*.es examples\helloworld
 
 md examples\script\interpreter
-copy %1\examples\script\interpreter\*.l examples\interpreter
-copy %1\examples\script\interpreter\*.prj examples\interpreter
-copy %1\examples\script\interpreter\*.txt examples\interpreter
-copy %1\examples\script\interpreter\*.es examples\interpreter
+copy %1\examples\script\interpreter\*.l examples\script\interpreter
+copy %1\examples\script\interpreter\*.prj examples\script\interpreter
+copy %1\examples\script\interpreter\*.txt examples\script\interpreter
+copy %1\examples\script\interpreter\*.es examples\script\interpreter
 
 md examples\console\matrix 
 copy %1\examples\console\matrix\*.l examples\console\matrix 
@@ -453,12 +455,12 @@ copy %1\examples\db\sqlite\*.l examples\db\sqlite
 copy %1\examples\db\sqlite\*.prj examples\db\sqlite
 
 md examples\script\js
-copy %1\examples\script\js\*.l examples\js
-copy %1\examples\script\js\*.prj examples\js
-copy %1\examples\script\js\*.xprj examples\js
-copy %1\examples\script\js\*.txt examples\js
-copy %1\examples\script\js\*.es examples\js
-copy %1\examples\script\js\*.js examples\js
+copy %1\examples\script\js\*.l examples\script\js
+copy %1\examples\script\js\*.prj examples\script\js
+copy %1\examples\script\js\*.xprj examples\script\js
+copy %1\examples\script\js\*.txt examples\script\js
+copy %1\examples\script\js\*.es examples\script\js
+copy %1\examples\script\js\*.js examples\script\js
 
 echo copying src3 files
 

diff --git a/whatsnew.txt b/whatsnew.txt
@@ -3,9 +3,9 @@
 
                                 Version 3.2.0
 
-******************************************************************************
+***************************************************************
                              What's New in 3.2.0
-******************************************************************************
+***************************************************************
 
 [ELENA]
 [!] binary incompatible due to implementing issues #100 and #333
@@ -35,9 +35,9 @@
 [Tools]
 [-] fixed #31 : Unresolved labels
 
-******************************************************************************
+**************************************************************
                              What's New in 3.1.1
-******************************************************************************
+**************************************************************
 
 [ELC]
 [-] #308 : Invalid lshift opcode when arg >= 32