[ros-diffs] [peterw] 31949: - Update changelog, license, etc... in preperation for 1.2 release with new tools, flex, bison and patch.

Author: peterw
Date: Tue Jan 22 22:01:48 2008
New Revision: 31949

URL: http://svn.reactos.org/svn/reactos?rev=31949&view=rev
Log:
- Update changelog, license, etc... in preperation for 1.2 release with new tools, flex,
bison and patch.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt
    trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/README.odt
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
    trunk/tools/RosBE/RosBE-Windows/RosBE.nsi

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Tue Jan 22 22:01:48 2008
@@ -134,6 +134,7 @@
     :: No Option - Number of CPUs.
     :: -x1       - Number of CPUs, plus 1.
     :: -x2       - Number of CPUs, doubled.
+    :: -a        - Determine the cpu count based on the inherited process affinity mask.
     ::
     for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe"
-x1`) do set CPUCOUNT=%%i
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Tue Jan 22 22:01:48 2008
@@ -1,4 +1,10 @@
 *** XXX XXth, 2008 - RosBE 1.2 Released
+
+- Updated: NASM to 2.01 (Peter Ward)
+- Updated: Subversion to 1.4.6 (Peter Ward)
+- Added: Flex 2.5.4a-1 from GnuWin32 (Peter Ward)
+- Added: Bison 2.1 from GnuWin32 (Peter Ward)
+- Added: Patch 2.5.9-7 from GnuWin32 (Peter Ward)
 
 - Updated RosBE Configuration Tool. (Pierre Schweitzer)
    - Removed an used var (Pierre Schweitzer)
@@ -7,9 +13,12 @@
    - If there's a slash at the end of the entered path, it's removed (Pierre
Schweitzer)
    - Definitively get rid of pidl work (Pierre Schweitzer)
    - Now, previous path is just selected in browse window (Pierre Schweitzer)
+   - Stop abusing WM_SETCURSOR and use tooltips instead. (Thomas Weidenmueller)
 
 - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output
AND Logs in one process. (Daniel Reimer)
 - Add a macro file for the MinGW prompt and add SCUT to this macro file (Colin Finck)
+- Add the ability to determine the cpu count based on the inherited process affinity mask
to cpucount (only for win32 hosts) (Thomas Weidenmueller)
+- KDBG is defaulted to 1 now in Config.cmd to reflect changes in svn. (Daniel Reimer)
 
 *** December 8th, 2007 - RosBE 1.1 Released
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt Tue Jan 22 22:01:48 2008
@@ -1,4 +1,4 @@
-ReactOS Build Environment v1.1
+ReactOS Build Environment v1.2
 
 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)
@@ -21,6 +21,12 @@
 
 - Subversion is licensed under various licenses.
   (installed to INSTALLDIR\Tools\licences\*)
+
+- Bison is licensed under the GPLv2.
+
+- Flex is licensed under a modified BSD license.
+
+- Patch is licensed under the GPLv2.
 
 *** The complete text of the GNU GENERAL PUBLIC LICENSE v2
 
@@ -2199,3 +2205,44 @@
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
+
+*** The complete text of the Flex modified BSD license.
+
+Flex carries the copyright used for BSD software, slightly modified
+because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
+which operates under a contract with the Department of Energy:
+
+	Copyright (c) 1990 The Regents of the University of California.
+	All rights reserved.
+
+	This code is derived from software contributed to Berkeley by
+	Vern Paxson.
+
+	The United States Government has rights in this work pursuant
+	to contract no. DE-AC03-76SF00098 between the United States
+	Department of Energy and the University of California.
+
+	Redistribution and use in source and binary forms with or without
+	modification are permitted provided that: (1) source distributions
+	retain this entire copyright notice and comment, and (2)
+	distributions including binaries display the following
+	acknowledgement: ``This product includes software developed by the
+	University of California, Berkeley and its contributors'' in the
+	documentation or other materials provided with the distribution and
+	in all advertising materials mentioning features or use of this
+	software.  Neither the name of the University nor the names of its
+	contributors may be used to endorse or promote products derived
+	from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+	IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	PURPOSE.
+
+This basically says "do whatever you please with this software except
+remove this notice or take advantage of the University's (or the flex
+authors') name".
+
+Note that the "flex.skl" scanner skeleton carries no copyright notice.
+You are free to do whatever you please with scanners generated using flex;
+for them, you are not even bound by the above copyright.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Tue Jan 22 22:01:48 2008
@@ -35,6 +35,7 @@
 :: No Option - Number of CPUs.
 :: -x1       - Number of CPUs, plus 1.
 :: -x2       - Number of CPUs, doubled.
+:: -a        - Determine the cpu count based on the inherited process affinity mask.
 ::
 for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe"
-x1`) do set CPUCOUNT=%%i
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA…
==============================================================================
Binary files - no diff available.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Tue Jan 22 22:01:48 2008
@@ -17,7 +17,7 @@
 color 0A
 if not defined APPDATA set APPDATA=%USERPROFILE%
 set PATH=%SystemRoot%\system32;%SystemRoot%
-set _ROSBE_VERSION=1.1
+set _ROSBE_VERSION=1.2
 set _ROSBE_BASEDIR=%~dp0
 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
 set _ROSBE_MODE=RosBE

Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Tue Jan 22 22:01:48 2008
@@ -47,5 +47,19 @@
         echo ERROR: NASM is required to build ReactOS, none found in the current
MinGW/GCC.
     )
 )
+if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" (
+    bison --version | find "GNU Bison"
+) else (
+    if "%_ROSBE_MODE%" == "RosBE" (
+        echo ERROR: Bison is required to build ReactOS, none found in the current
MinGW/GCC.
+    )
+)
+if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" (
+    flex --version
+) else (
+    if "%_ROSBE_MODE%" == "RosBE" (
+        echo ERROR: Flex is required to build ReactOS, none found in the current
MinGW/GCC.
+    )
+)
 ld -v
 mingw32-make -v | find "GNU Make"

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Tue Jan 22 22:01:48 2008
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "ReactOS Build Environment for Windows"
-!define PRODUCT_VERSION "1.1"
+!define PRODUCT_VERSION "1.2"
 !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"
@@ -17,7 +17,7 @@
 ;;
 ;; Add version/product information metadata to the installation file.
 ;;
-VIAddVersionKey /LANG=1033 "FileVersion" "1.1.0.0"
+VIAddVersionKey /LANG=1033 "FileVersion" "1.2.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
(http://nsis.sourceforge.net/)"
@@ -25,7 +25,7 @@
 VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS
Team"
 VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS
Team"
 VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
-VIProductVersion "1.1.0.0"
+VIProductVersion "1.2.0.0"
 
 CRCCheck force
 SetCompressor /FINAL /SOLID lzma
@@ -116,6 +116,7 @@
     File /r Root\changelog.txt
     File /r Root\LICENSE.txt
     File /r Root\MinGW.cmd
+    File /r Root\MinGW.mac
     File /r Root\Build.cmd
     File /r Root\chdefgcc.cmd
     File /r Root\Clean.cmd