23 Oct
2007
23 Oct
'07
7:09 p.m.
Author: dreimer
Date: Tue Oct 23 23:09:38 2007
New Revision: 29833
URL: http://svn.reactos.org/svn/reactos?rev=29833&view=rev
Log:
Clean up Readme.txt, Readme.pdf, info.txt, License.txt
Try to clean up and simplify the makefiles.
Modified:
trunk/tools/RosBE-Windows/Root/LICENSE.txt
trunk/tools/RosBE-Windows/Root/README.txt
trunk/tools/RosBE-Windows/Root/readme.pdf
trunk/tools/RosBE-Windows/Tools/config/makefile
trunk/tools/RosBE-Windows/Tools/info.txt
trunk/tools/RosBE-Windows/Tools/makefile
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 Tue Oct 23 23:09:38 2007
@@ -1,4 +1,4 @@
-ReactOS Build Environment v0.X.X.X
+ReactOS Build Environment v1.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)
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 Tue Oct 23 23:09:38 2007
@@ -1,7 +1,7 @@
-ReactOS Build Environment 0.X.X.X
+ReactOS Build Environment 1.0
-The ReactOS Build Environment v0.X.X.X contains a complete build environment for ReactOS
based on GCC 4.1.3/MinGW.
+The ReactOS Build Environment v1.0 contains a complete build environment for ReactOS
based on GCC 4.1.3/MinGW.
While installing the ReactOS Build Environment you are asked to provide the directory
where your ReactOS sources are located or should be checked out to (ie.reactos\), you must
enter the complete path to this folder (ie. C:\projects\reactos). The path is now required
for the ReactOS Build Environment to work correctly, so if you change where your sources
are located you must also change the entry in the shortcuts in the start menu (the
'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and
type svn create. This will take a while.
@@ -9,42 +9,45 @@
menu. Now you have a choice of using either the built in commands (which are displayed
onscreen with information
about their use) or you can build as you normally would using the standard MinGW/RBuild
commands.
-The ReactOS Build Environment v0.X.X.X contains the following packages:
+The ReactOS Build Environment v1.0 contains the following packages:
binutils-2.18.50-20071015
+ patched with:
+ - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch
mingw-runtime-3.13
w32api-3.10
mingw32-make-3.81-2
nasm-0.99.05-win32
mingw-4.1.3-20071015-prerelease
- - Patched to fix a GCC bug concerning
- decorating virtual methods with stdcall
- in C++, see GCC issue:
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27067
- - Patched to run on Vista under UAC, see GCC issue:
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30335
+ patched with:
+ - GCC-v4.1-r129382-prerelease-w3seek.patch
+ - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch
+ - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch
Websites:
MinGW - Minimalist GNU for Windows
-http://www.mingw.org/
+http://www.mingw.org
GCC, the GNU Compiler Collection
-http://www.gcc.org/
+http://www.gcc.org
NASM, the Netwide Assembler
-http://www.kernel.org/pub/software/devel/nasm/
-http://nasm.sourceforge.net/
+http://www.kernel.org/pub/software/devel/nasm
+http://nasm.sourceforge.net
NSIS (Nullsoft Scriptable Install System)
-http://nsis.sourceforge.net/
+http://nsis.sourceforge.net
-The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here)
-http://gnuwin32.sourceforge.net/
+The GnuWin32 Project (tee/test/sed/grep and their dependencies were obtained here)
+http://gnuwin32.sourceforge.net
+
+Olof's Tools (cut)
+http://www.ltr-data.se
Subversion Client
-http://subversion.tigris.org/
+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/)
+Inspired by Dazzle from TinyKRNL (http://www.tinykrnl.org)
Icon made by ROSFan
Modified: trunk/tools/RosBE-Windows/Root/readme.pdf
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd…
==============================================================================
Binary files - no diff available.
Modified: trunk/tools/RosBE-Windows/Tools/config/makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/makefile (original)
+++ trunk/tools/RosBE-Windows/Tools/config/makefile Tue Oct 23 23:09:38 2007
@@ -4,7 +4,7 @@
all: $(TARGET)
-CPP=mingw32-gcc
+CC=gcc
CFLAGS := $(HOST_CFLAGS) -DWIN32 -DUNICODE -O2 -std=c99
LFLAGS := -mwindows -s
LIBS :=
@@ -15,10 +15,10 @@
OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff)
$(TARGET): $(OBJS)
- $(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(CC) $(LFLAGS) -o $@ $(OBJS) $(LIBS)
.c.o: $<
- $(CPP) $(CFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) -c $< -o $@
$(RC:.rc=.coff):
windres $(HOST_CFLAGS) $(RCFLAGS) -o $@ $(RC)
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 Tue Oct 23 23:09:38 2007
@@ -1,7 +1,7 @@
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
+cut: http://www.ltr-data.se/files/cut.zip
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
Modified: trunk/tools/RosBE-Windows/Tools/makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/makefile (original)
+++ trunk/tools/RosBE-Windows/Tools/makefile Tue Oct 23 23:09:38 2007
@@ -1,26 +1,28 @@
# makefile - Simple makefile to build the various RosBE tools.
CC = gcc
-OFLAGS = -Wall -O2 -o
+CFLAGS := $(HOST_CFLAGS) -Wall -O2 -o
+LFLAGS := -s
+WINVER := 0x502
buildtime: buildtime.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c
+ $(CC) $(CFLAGS) buildtime buildtime.c
cpucount: cpucount.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c
+ $(CC) $(CFLAGS) cpucount cpucount.c
echoh: echoh.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c
+ $(CC) $(CFLAGS) echoh echoh.c
flash: flash.c
- $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c
+ $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=0x$(WINVER) $(CFLAGS) flash flash.c
getdate: getdate.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c
+ $(CC) $(CFLAGS) getdate getdate.c
all: buildtime.c cpucount.c echoh.c flash.c getdate.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) buildtime buildtime.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) cpucount cpucount.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) echoh echoh.c
- $(CC) $(HOST_CFLAGS) -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 $(OFLAGS) flash flash.c
- $(CC) $(HOST_CFLAGS) $(OFLAGS) getdate getdate.c
+ $(CC) $(CFLAGS) buildtime buildtime.c
+ $(CC) $(CFLAGS) cpucount cpucount.c
+ $(CC) $(CFLAGS) echoh echoh.c
+ $(CC) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS) flash flash.c
+ $(CC) $(CFLAGS) getdate getdate.c