Author: dreimer
Date: Sun Jun 10 23:24:23 2007
New Revision: 27126
URL: http://svn.reactos.org/svn/reactos?rev=27126&view=rev
Log:
- Updated Changelog. (makex readded)
- Updated License to include all new Tools.
- Updated Readme.
Modified:
trunk/tools/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE-Windows/Root/LICENSE.txt
trunk/tools/RosBE-Windows/Root/README.txt
Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Jun 10 23:24:23 2007
@@ -2,6 +2,7 @@
- Added a SVN Client
- Added a Build Configurator.
+- Readded makex. If theres a Bug in Vista, it's a GCC Bug.
*** May 21th, 2007 - RosBE 0.3.6 Released
Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original)
+++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Sun Jun 10 23:24:23 2007
@@ -12,6 +12,16 @@
- tee is licensed under the GPLv2.
- test is licensed under the GPLv2 or later.
+
+- cut is licensed under the GPLv2 or later.
+
+- grep is licensed under the GPLv2 or later.
+
+- sed is licensed under the GPLv2 or later.
+
+- pcre is licensed under the GPLv2 or later.
+
+- svn is licensed under the Apache/BSD-style open source license.
- libiconv is licensed under the LGPLv2.
Modified: trunk/tools/RosBE-Windows/Root/README.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/README.txt (original)
+++ trunk/tools/RosBE-Windows/Root/README.txt Sun Jun 10 23:24:23 2007
@@ -1,4 +1,4 @@
- ReactOS Build Environment 0.3.7
+ReactOS Build Environment 0.3.7
The ReactOS Build Environment v0.3.7 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW.
@@ -45,6 +45,9 @@
The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here)
http://gnuwin32.sourceforge.net/
-Inspired by blight's ReactOS Build Environment v0.2-3.4.4
+Subversion Client
+http://subversion.tigris.org/
+
+Inspired by blight's ReactOS Build Environment v0.2-3.4.5
Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org/)
Icon made by ROSFan
Author: dreimer
Date: Sun Jun 10 23:08:35 2007
New Revision: 27125
URL: http://svn.reactos.org/svn/reactos?rev=27125&view=rev
Log:
- Remove the need of a config.rbuild in the RosBE
tree. Just copy the one of ReactOS Tree at first use.
- Update Help to really help on the new commands
- Add cut/grep to info.txt
- Update a Setup Phrase to show that you don't need a
Tree before you install.
Removed:
trunk/tools/RosBE-Windows/Tools/config.rbuild
Modified:
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE-Windows/RosSourceDir.ini
trunk/tools/RosBE-Windows/Tools/info.txt
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 23:08:35 2007
@@ -6,8 +6,29 @@
title ReactOS Build Configurator
-cd ""
+if not exist "%ROSBEBASEDIR%\Tools\config.rbuild" (
+ copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\Tools\config.rbuild"
+)
+if "%1" == "delete" (
+ del %_ROSSOURCEDIR%\config.rbuild
+ del %ROSBEBASEDIR%\Tools\config.rbuild
+ goto :NOK
+)
+
+echo WARNING:
+echo Non-Default-Configurations are not useable for pasteing Bugs to Bugzilla
+echo or asking quesions about in Forum/Chat!
+echo.
+echo DID YOU UNDERSTAND?
+
+SET /P XY=(yes), (no)
+
+if /I "%XY%"=="yes" goto :OK
+if /I "%XY%"=="no" goto :NOK
+goto :NOK
+
+:OK
echo Architecture to build for. Not Editable.
echo.
echo Right now
@@ -122,5 +143,6 @@
del %ROSBEBASEDIR%\Tools\*.rbuild
copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild
del %ROSBEBASEDIR%\Tools\*.tmp
-copy %ROSBEBASEDIR%\Tools\config.rbuild _ROSSOURCEDIR\config.rbuild
-cd..
+copy %ROSBEBASEDIR%\Tools\config.rbuild %_ROSSOURCEDIR%\config.rbuild
+
+:NOK
Modified: trunk/tools/RosBE-Windows/Root/Help.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Help.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Jun 10 23:08:35 2007
@@ -21,15 +21,15 @@
echo specific command.
echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source
echo tree.
- echo config - Configures the way, ReactOS will be built.
- echo
+ echo config [OPTIONS]- Configures the way, ReactOS will be built.
+ echo.
echo basedir - Switch back to the ReactOS source directory.
goto :EOF
)
if "%1" == "make" (
echo Usage: make [OPTIONS]
echo make, without options does a standard build of ReactOS. OPTIONS
- echo are the standard ReactOS build options ie. bootcd.
+ echo are the standard ReactOS build options ie. bootcd, livecd, etc.
goto :EOF
)
if "%1" == "makex" (
@@ -56,6 +56,15 @@
if "%1" == "svn" (
echo Usage: svn [OPTIONS]
echo Creates, Updates or cleans up your ReactOS Source tree.
+ echo update - Updates to HEAD Revision.
+ echo create - Creates a new ReactOS Tree.
+ echo cleanup - Cleans up and fixes errors in Tree.
+ goto :EOF
+)
+if "%1" == "config" (
+ echo Usage: config [OPTIONS]
+ echo Creates a Configuration File, which tells RosBE how to build the Tree.
+ echo delete - Deletes the configuration File and so sets back to default
goto :EOF
)
if "%1" == "basedir" (
Modified: trunk/tools/RosBE-Windows/RosSourceDir.ini
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.i…
==============================================================================
--- trunk/tools/RosBE-Windows/RosSourceDir.ini (original)
+++ trunk/tools/RosBE-Windows/RosSourceDir.ini Sun Jun 10 23:08:35 2007
@@ -19,7 +19,7 @@
[Field 3]
Type=Label
-Text=Select the directory where the ReactOS sources are located. This directory is required for the RosBE to work correctly. If you accept the default here then you must modify the shortcut (The 'Start in:' field) in the start menu later to point to the ReactOS source directory.
+Text=Select the directory where the ReactOS sources are located or will be checked out to later. This directory is required for the RosBE to work correctly. If you accept the default here then you must modify the shortcut (The 'Start in:' field) in the start menu later to point to the ReactOS source directory.
Left=0
Right=-1
Top=6
Removed: trunk/tools/RosBE-Windows/Tools/config.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config.r…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config.rbuild (original)
+++ trunk/tools/RosBE-Windows/Tools/config.rbuild (removed)
@@ -1,16 +1,0 @@
-<?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<property name="ARCH" value="i386" />
-<property name="SARCH" value="" />
-<property name="OARCH" value="pentium" />
-<property name="OPTIMIZE" value="1" />
-<property name="MP" value="0" />
-<property name="KDBG" value="0" />
-<property name="DBG" value="1" />
-<property name="GDB" value="0" />
-<property name="NSWPAT" value="0" />
-<property name="NTLPC" value="1" />
-<property name="_WINKD_" value="0" />
-
-</rbuild>
Modified: trunk/tools/RosBE-Windows/Tools/info.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/info.txt (original)
+++ trunk/tools/RosBE-Windows/Tools/info.txt Sun Jun 10 23:08:35 2007
@@ -1,11 +1,14 @@
Additional Tools needed:
tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm
test: http://gnuwin32.sourceforge.net/packages/coreutils.htm
+cut: http://gnuwin32.sourceforge.net/packages/coreutils.htm
sed: http://gnuwin32.sourceforge.net/packages/sed.htm
+grep: http://gnuwin32.sourceforge.net/packages/grep.htm
svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91
Additional Libs needed:
LibIntl: http://gnuwin32.sourceforge.net/packages/libintl.htm
LibIconv: http://gnuwin32.sourceforge.net/packages/libiconv.htm
+Pcre: http://gnuwin32.sourceforge.net/packages/pcre.htm
Built Tools and Rest needs to be copied to /Root/Tools/
Author: dreimer
Date: Sun Jun 10 21:16:04 2007
New Revision: 27121
URL: http://svn.reactos.org/svn/reactos?rev=27121&view=rev
Log:
- Header Modification in SVN.cmd
- Configurator reaches Beta Stadium. Hopefully no bugs are left.
Modified:
trunk/tools/RosBE-Windows/Root/Config.cmd
trunk/tools/RosBE-Windows/Root/SVN.cmd
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 21:16:04 2007
@@ -1,64 +1,116 @@
+:: Copyright (c) Daniel Reimer. All rights reserved.
+::
+:: A Basic Config.rbuild Creator for ReactOS.
+::
@echo off
-echo ARCH
+title ReactOS Build Configurator
+
+echo Architecture to build for. Not Editable.
+echo
echo Right now
grep \"ARCH\" config.rbuild|cut -d "\"" -f 4
+echo
-echo SARCH
+echo Sub-architecture to build for.
+echo Default is: none
+echo
echo Right now
grep \"SARCH\" config.rbuild|cut -d "\"" -f 4
SET /P X= (), (xbox)
sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild
+cls
-echo OARCH
+echo Which CPU ReactOS should be optimized for.
+echo
+echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp,
+echo athlon-mp, k6-2
+echo See GCC manual for more CPU names and which CPUs GCC can optimize for.
+echo Default is: pentium
+echo
echo Right now
grep \"OARCH\" config.rbuild|cut -d "\"" -f 4
SET /P XX=
-sed "s/\"OARCH\" value=\"\"/\"OARCH\" value=\"%X%\"/g" config2.rbuild > config21.rbuild
+sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" config2.rbuild > config21.rbuild
+cls
-echo OPTIMIZE
+echo What level do you want ReactOS to be optimized at.
+echo this setting does not work if GDB is set
+echo 0 = off
+echo 1 = Normal compiling. Recommended, it is default setting in
+echo official build and debug build.
+echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
+echo
echo Right now
grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4
SET /P Y= (0), (1), (2), (3), (4), (5)
sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild
+cls
-echo MP
+echo Whether to compile for an uniprocessor or multiprocessor machine.
+echo Default is: 0
+echo
echo Right now
grep \"MP\" config.rbuild|cut -d "\"" -f 4
SET /P Z= (0), (1)
sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild
+cls
-echo KDBG
+echo Whether to compile in the integrated kernel debugger.
+echo Default is: 0
+echo
echo Right now
grep \"KDBG\" config.rbuild|cut -d "\"" -f 4
SET /P A= (0), (1)
sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild
+cls
-echo DBG
+echo Whether to compile for debugging. No compiler optimizations will be
+echo performed.
+echo Default is: 1
+echo
echo Right now
grep \"DBG\" config.rbuild|cut -d "\"" -f 4
SET /P B= (0), (1)
sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild
+cls
-echo GDB
+echo Whether to compile for debugging with GDB. If you don't use GDB, don't
+echo enable this.
+echo Default is: 0
+echo
echo Right now
grep \"GDB\" config.rbuild|cut -d "\"" -f 4
SET /P C= (0), (1)
sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild
+cls
-echo NSWPAT
+echo Whether to compile apps/libs with features covered software patents or not.
+echo If you live in a country where software patents are valid/apply, don't
+echo enable this (except they/you purchased a license from the patent owner).
+echo Default is: 0
+echo
echo Right now
grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4
SET /P D= (0), (1)
sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild
+cls
-echo NTLPC
+echo Whether to compile with NT-compatible LPC Semantics. This should always be 1.
+echo
echo Right now
grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4
SET /P E= (0), (1)
sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild
+cls
-echo _WINKD_
+echo Whether to compile with the KD protocol. This will disable support for KDBG
+echo as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS.
+echo This is currently not fully working, and requires kdcom from Windows 2003 or
+echo TinyKRNL. Booting into debug mode with this flag enabled will result in a
+echo failure to enter GUI mode. Do not enable unless you know what you're doing.
+echo Default is: 0
+echo
echo Right now
grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4
SET /P F= (0), (1)
Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/SVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/SVN.cmd Sun Jun 10 21:16:04 2007
@@ -1,6 +1,6 @@
-:: Copyright (c) Peter Ward and Daniel Reimer. All rights reserved.
+:: Copyright (c) Daniel Reimer. All rights reserved.
::
-:: SVN Client
+:: Integrated SVN Client
::
@echo off