7 Nov
2009
7 Nov
'09
5:16 p.m.
Author: cfinck
Date: Sat Nov 7 18:16:41 2009
New Revision: 44005
URL: http://svn.reactos.org/svn/reactos?rev=44005&view=rev
Log:
- Change version to 1.5-RC1
- Handle unknown RosBE-Unix versions in the installation script
- Update tool version information
Modified:
trunk/tools/RosBE/RosBE-Unix/Base-i386/README
trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt
trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh
trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh
trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R…
==============================================================================
--- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sat Nov 7 18:16:41 2009
@@ -1,7 +1,7 @@
ReactOS Build Environment
- Version 1.4.2 for Unix-based operating systems
+ Version 1.5-RC1 for Unix-based operating systems
Base package and i386 build tools
- by Colin Finck (mail(a)colinfinck.de)
+ by Colin Finck (colin(a)reactos.org)
Introduction
-------------
@@ -103,28 +103,21 @@
This version of RosBE for Unix-based operating systems uses the following
components:
- * GNU Binutils v2.19.51-20090127 (snapshot)
+ * GNU Binutils v2.20-20091017 (snapshot)
+ compiled for mingw32
+
+ * GCC, The GNU Compiler Collection v4.4.2
compiled for mingw32
patched with:
- - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch
-
(http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.…)
-
- * GCC, The GNU Compiler Collection v4.1.3-20071015 (snapshot)
- compiled for mingw32
- patched with:
- - GCC-v4.1-r129382-prerelease-w3seek.patch
-
(http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…)
- - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch
-
(http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…)
- - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch
-
(http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1294…)
+ - http://gcc.gnu.org/bugzilla/attachment.cgi?id=18882&action=view
+ (committed in GCC r153606)
NOTE: This GCC version only supports C and C++
* Make 20071219 (CVS version)
- * MinGW-Runtime 3.13
- * NASM, The Netwide assembler v2.05.01
- * W32api 3.10
+ * MinGW-Runtime 3.16
+ * NASM, The Netwide assembler v2.07
+ * W32api 3.13
Tested Operating Systems
@@ -132,7 +125,7 @@
The Build Environment was designed to work on all Unix-based operating
systems. Nevertheless, it is impossible to test it on all possible systems out
there.
- The current primary development and test system is Ubuntu 8.10. But users
+ The current primary development and test system is Ubuntu 9.10. But users
also reported that it works well under other Linux systems such as Fedora or
openSUSE and Unix derivates like FreeBSD or Mac OS X.
You should be able to compile the build tools on both i386 (32-bit) and
@@ -159,7 +152,7 @@
Credits
--------
-Colin Finck (mail(a)colinfinck.de)
+Colin Finck (colin(a)reactos.org)
Thanks go also to the members of the RosBE-Windows team, namely:
Daniel Reimer (reimer.daniel(a)freenet.de)
@@ -175,3 +168,4 @@
Environment v0.2-3.4.4.
Inspired by Dazzle from TinyKRNL (http://tinykrnl.org/).
+
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R…
==============================================================================
Binary files - no diff available.
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R…
==============================================================================
--- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sat Nov 7
18:16:41 2009
@@ -21,8 +21,8 @@
# RosBE-Unix Constants
DEFAULT_INSTALL_DIR="/usr/local/RosBE"
-KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5"
-ROSBE_VERSION="1.5"
+KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC1"
+ROSBE_VERSION="1.5-RC1"
TARGET_ARCH="i386"
source "$rs_scriptdir/scripts/rosbelibrary.sh"
@@ -90,6 +90,8 @@
# Check if the directory is empty
if [ ! "`ls $installdir`" = "" ]; then
if [ -f "$installdir/RosBE-Version" ]; then
+ choice=""
+
# Allow the user to update an already installed RosBE version
installed_version=`cat "$installdir/RosBE-Version"`
@@ -115,10 +117,22 @@
rs_showchoice "U" "u U r R c C"
fi
- echo
break
fi
done
+
+ if [ "$choice" = "" ]; then
+ # We found no known version, so this could be for example a Release Candidate.
+ # Only offer the reinstallation option.
+ echo "Another version of the Build Environment is already installed in this
directory."
+ echo "Please choose one of the following options:"
+ echo
+ echo " (R)einstall all components of the Build Environment"
+ echo " (C)hoose a different installation directory"
+ echo
+
+ rs_showchoice "R" "r R c C"
+ fi
case "$choice" in
"U"|"u")
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s…
==============================================================================
--- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh [iso-8859-1]
(original)
+++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh [iso-8859-1] Sat Nov 7
18:16:41 2009
@@ -227,4 +227,6 @@
fi
done
done
-}
+
+ echo
+}
Modified:
trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh
[iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh
[iso-8859-1] Sat Nov 7 18:16:41 2009
@@ -227,4 +227,6 @@
fi
done
done
-}
+
+ echo
+}