diff --git a/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32-amd64.sh b/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32-amd64.sh
index fde5609f..48ec24e8 100644
--- a/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32-amd64.sh
+++ b/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32-amd64.sh
@@ -41,7 +41,7 @@ export MSYS=winsymlinks:nativestrict
# RosBE Setup Variables
rs_host_cc="gcc"
-rs_host_cflags="-pipe -O2 -g0 -march=core2"
+rs_host_cflags="-pipe -O2 -g0 -march=nocona"
rs_host_cxx="g++"
rs_host_cxxflags="$rs_host_cflags"
rs_needed_tools="as bzip2 find $CC $CXX grep help2man m4 makeinfo python tar" # GNU Make has a special check
@@ -196,7 +196,7 @@ if rs_prepare_module "gcc"; then
export CFLAGS_FOR_TARGET="$rs_target_cflags"
export CXXFLAGS_FOR_TARGET="$rs_target_cxxflags"
- rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --enable-version-specific-runtime-libs --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose
+ rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --enable-version-specific-runtime-libs --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose --enable-plugin
rs_do_command $rs_makecmd -j $rs_cpucount all-gcc
rs_do_command $rs_makecmd install-gcc
rs_do_command $rs_makecmd install-lto-plugin
diff --git a/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh b/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh
index a4d10def..a95098da 100644
--- a/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh
+++ b/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh
@@ -47,7 +47,7 @@ export MSYS=winsymlinks:nativestrict
# RosBE Setup Variables
rs_host_cc="gcc"
-rs_host_cflags="-pipe -O2 -g0 -march=core2"
+rs_host_cflags="-pipe -O2 -g0 -march=nocona"
rs_host_cxx="g++"
rs_host_cxxflags="$rs_host_cflags"
rs_needed_tools="as bzip2 find $CC $CXX grep help2man m4 makeinfo python tar" # GNU Make has a special check
@@ -71,7 +71,7 @@ rs_scriptdir="$PWD"
# Use the GCC with POSIX Thread Model! CMake uses C++11 threads, which are not supported in GCC's Win32 Thread Model (yet).
HOST_GCC_VERSION="gcc version 8.1.0 (i686-posix-dwarf-rev0, Built by MinGW-W64 project)"
-MODULES="bison cmake binutils mingw_w64 gcc ninja"
+MODULES="bison cmake binutils mingw_w64 gmp gcc ninja"
source "$rs_scriptdir/scripts/setuplibrary.sh"
@@ -222,6 +222,13 @@ if rs_prepare_module "mingw_w64"; then
rs_clean_module "mingw_w64"
fi
+if rs_prepare_module "gmp"; then
+ rs_do_command ../gmp/configure --prefix="$rs_archprefixdir/$rs_target" --host="$rs_target" --build="$rs_target"
+ rs_do_command $rs_makecmd -j $rs_cpucount
+ rs_do_command $rs_makecmd install
+ rs_clean_module "gmp"
+fi
+
if rs_prepare_module "gcc"; then
rs_extract_module gmp $PWD/../gcc
rs_extract_module mpc $PWD/../gcc
@@ -232,7 +239,7 @@ if rs_prepare_module "gcc"; then
export CFLAGS_FOR_TARGET="$rs_target_cflags"
export CXXFLAGS_FOR_TARGET="$rs_target_cxxflags"
- rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --host="$rs_target" --build="$rs_target" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --enable-version-specific-runtime-libs --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose
+ rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --host="$rs_target" --build="$rs_target" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --enable-version-specific-runtime-libs --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose --enable-plugin
rs_do_command $rs_makecmd -j $rs_cpucount all-gcc
rs_do_command $rs_makecmd install-gcc
rs_do_command $rs_makecmd install-lto-plugin
diff --git a/RosBE-Windows/Powershell/RosBE.ps1 b/RosBE-Windows/Powershell/RosBE.ps1
index 5bc46f01..ba64fa0e 100644
--- a/RosBE-Windows/Powershell/RosBE.ps1
+++ b/RosBE-Windows/Powershell/RosBE.ps1
@@ -53,7 +53,7 @@ $global:BUILD_ENVIRONMENT = "MinGW"
$global:0 = $myInvocation.MyCommand.Definition
$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0)
$global:_ROSBE_PREFIX = $null
-$global:_ROSBE_VERSION = "2.2.1"
+$global:_ROSBE_VERSION = "2.3.0"
$global:_ROSBE_ROSSOURCEDIR = "$pwd"
$global:_ROSBE_SHOWTIME = 1
$global:_ROSBE_WRITELOG = 1
diff --git a/RosBE-Windows/Root/ChangeLog.txt b/RosBE-Windows/Root/ChangeLog.txt
index 2cd5939f..a38c0ce2 100644
--- a/RosBE-Windows/Root/ChangeLog.txt
+++ b/RosBE-Windows/Root/ChangeLog.txt
@@ -1,3 +1,13 @@
+*** Jun xxth, 2021 - RosBE 2.3.0 Released
+
+- Readded forgotten 7z.dll to setup. Fixes ROSBE-171 (Daniel Reimer)
+- Fixed build problems of some testers by going from "core2" cpu optimize to "nocona" optimize. (Daniel Reimer)
+- Added GMP as separate libs to RosBE's compiler suite. (Daniel Reimer)
+- Added Windows experimental plugin support to RosBE's compiler suite.
+ Needed for Jérôme Gardou's x64 PSEH plugin support. (Daniel Reimer)
+
+Needed patches for GCC, binutils and ninja can be found here: https://www.dreimer.de/?p=1582
+
*** Jun 05th, 2020 - RosBE 2.2.1 Released
- Updated CMake to 3.17.2-ReactOS (Colin Finck)
diff --git a/RosBE-Windows/Root/LICENSE.txt b/RosBE-Windows/Root/LICENSE.txt
index 7704ad7c..e630ab28 100644
--- a/RosBE-Windows/Root/LICENSE.txt
+++ b/RosBE-Windows/Root/LICENSE.txt
@@ -1,4 +1,4 @@
-ReactOS Build Environment v2.2.1
+ReactOS Build Environment v2.3.0
Various parts of the ReactOS Build Environment are under different license's, the license's are as follows.
(The complete text for each license is included in this document excluding Subversion)
diff --git a/RosBE-Windows/Root/README.odt b/RosBE-Windows/Root/README.odt
index da7d9ce2..43b92e18 100644
Binary files a/RosBE-Windows/Root/README.odt and b/RosBE-Windows/Root/README.odt differ
diff --git a/RosBE-Windows/Root/README.pdf b/RosBE-Windows/Root/README.pdf
index 809b87a8..01dd9312 100644
Binary files a/RosBE-Windows/Root/README.pdf and b/RosBE-Windows/Root/README.pdf differ
diff --git a/RosBE-Windows/Root/RosBE.cmd b/RosBE-Windows/Root/RosBE.cmd
index c68a0b69..52e440a8 100644
--- a/RosBE-Windows/Root/RosBE.cmd
+++ b/RosBE-Windows/Root/RosBE.cmd
@@ -75,7 +75,7 @@ if defined _ROSBE_CMAKE_DIFF (
set BUILD_ENVIRONMENT=MinGW
set _ROSBE_BASEDIR=%~dp0
set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
-set _ROSBE_VERSION=2.2.1
+set _ROSBE_VERSION=2.3.0
set _ROSBE_ROSSOURCEDIR=%CD%
set _ROSBE_SHOWTIME=1
set _ROSBE_WRITELOG=1
diff --git a/RosBE-Windows/RosBE.nsi b/RosBE-Windows/RosBE.nsi
index 33fb63b6..008a176a 100644
--- a/RosBE-Windows/RosBE.nsi
+++ b/RosBE-Windows/RosBE.nsi
@@ -1,6 +1,6 @@
Unicode true
!define PRODUCT_NAME "ReactOS Build Environment"
-!define PRODUCT_VERSION "2.2.1"
+!define PRODUCT_VERSION "2.3.0"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
@@ -18,7 +18,7 @@ ShowUnInstDetails show
;;
;; Add version/product information metadata to the installation file.
;;
-VIAddVersionKey /LANG=1033 "FileVersion" "2.2.1.0"
+VIAddVersionKey /LANG=1033 "FileVersion" "2.3.0.0"
VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System"
@@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2020 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2020 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
-VIProductVersion "2.2.1.0"
+VIProductVersion "2.3.0.0"
CRCCheck force
SetDatablockOptimize on
@@ -152,6 +152,7 @@ Section -BaseFiles SEC01
SetOutPath "$INSTDIR\bin"
SetOverwrite try
File /r Components\bin\7z.exe
+ File /r Components\bin\7z.dll
File /r Components\bin\bison.exe
File /r Components\bin\buildtime.exe
File /r Components\bin\ccache.exe
diff --git a/RosBE-Windows/Tools/config/x86/options.c b/RosBE-Windows/Tools/config/x86/options.c
index b8848835..a87af348 100644
--- a/RosBE-Windows/Tools/config/x86/options.c
+++ b/RosBE-Windows/Tools/config/x86/options.c
@@ -62,9 +62,9 @@ getConfigFileCMD()
}
else
{
- if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.2.1.cmd")) < MAX_PATH)
+ if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.3.0.cmd")) < MAX_PATH)
{
- wcscat(filename, L"\\RosBE\\rosbe-options-2.2.1.cmd");
+ wcscat(filename, L"\\RosBE\\rosbe-options-2.3.0.cmd");
}
}
}
@@ -80,7 +80,7 @@ getConfigFileCMD()
}
else
{
- wcscpy(filename, L"rosbe-options-2.2.1.cmd");
+ wcscpy(filename, L"rosbe-options-2.3.0.cmd");
}
}
return filename;
@@ -110,9 +110,9 @@ getConfigFilePS1()
}
else
{
- if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.2.1.ps1")) < MAX_PATH)
+ if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.3.0.ps1")) < MAX_PATH)
{
- wcscat(filename, L"\\RosBE\\rosbe-options-2.2.1.ps1");
+ wcscat(filename, L"\\RosBE\\rosbe-options-2.3.0.ps1");
}
}
}
@@ -128,7 +128,7 @@ getConfigFilePS1()
}
else
{
- wcscpy(filename, L"rosbe-options-2.2.1.ps1");
+ wcscpy(filename, L"rosbe-options-2.3.0.ps1");
}
}
return filename;
diff --git a/RosBE-Windows/Tools/config/x86/options.exe.Manifest b/RosBE-Windows/Tools/config/x86/options.exe.Manifest
index 290312c6..d5dbb974 100644
--- a/RosBE-Windows/Tools/config/x86/options.exe.Manifest
+++ b/RosBE-Windows/Tools/config/x86/options.exe.Manifest
@@ -3,7 +3,7 @@
Config Tool
diff --git a/RosBE-Windows/Tools/config/x86/options.rc b/RosBE-Windows/Tools/config/x86/options.rc
index 857987bd..54f517fb 100644
--- a/RosBE-Windows/Tools/config/x86/options.rc
+++ b/RosBE-Windows/Tools/config/x86/options.rc
@@ -6,8 +6,8 @@ ID_OPTICON ICON "options.ico"
1 24 "options.exe.Manifest"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,1,0
- PRODUCTVERSION 2,2,1,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0"
VALUE "FileDescription", "Config Tool for RosBE\0"
- VALUE "FileVersion", "2.2.1.0\0"
+ VALUE "FileVersion", "2.3.0.0\0"
VALUE "InternalName", "options\0"
VALUE "LegalCopyright", "Copyright © Marteen Bosma / Daniel Reimer / Pierre Schweitzer 2020\0"
VALUE "OriginalFilename", "options.exe\0"
VALUE "ProductName", "Config Tool for RosBE\0"
- VALUE "ProductVersion", "2.2.1.0\0"
+ VALUE "ProductVersion", "2.3.0.0\0"
END
END
BLOCK "VarFileInfo"