Author: dreimer
Date: Fri Jul 6 18:03:36 2007
New Revision: 27425
URL: http://svn.reactos.org/svn/reactos?rev=27425&view=rev
Log:
- Fix Uninstaller for ALL new Files.
- Check if the Source Folder is empty. If so, suggest to use "svn create"
- Add a possibility to use RosBE with another Folder by typing in the path to it at the begining. (This will change later)
Modified:
trunk/tools/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Jul 6 18:03:36 2007
@@ -29,7 +29,11 @@
::
:: Save our initial directory (should be the ReactOS source directory)
::
-set _ROSSOURCEDIR=%CD%
+echo If you want to use RosBE with another Tree than the Default one, please set the Path to it now:
+SET /P XY=
+
+if /I "%XY%"=="" set _ROSSOURCEDIR=%CD%
+if /I not "%XY%"=="" set _ROSSOURCEDIR=%XY%
::
:: Display the current version of GCC, NASM, ld and make.
@@ -50,6 +54,17 @@
:: Load the macros that serve as our commands.
::
doskey /macrofile="%ROSBEBASEDIR%\RosBE.mac"
+
+::
+:: Look if the Source Folder is empty. If so, ask for using "svn create".
+::
+dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul
+if errorlevel 1 (
+ echo No ReactOS Source detected. Please use "svn create" to download it.
+ goto :ExitRosBE
+) else (
+ goto :ExitRosBE
+)
goto :ExitRosBE
Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Fri Jul 6 18:03:36 2007
@@ -185,6 +185,11 @@
Delete /REBOOTOK "$INSTDIR\Clean.cmd"
Delete /REBOOTOK "$INSTDIR\Help.cmd"
Delete /REBOOTOK "$INSTDIR\RosBE.cmd"
+ Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd"
+ Delete /REBOOTOK "$INSTDIR\Config.cmd"
+ Delete /REBOOTOK "$INSTDIR\SVN.cmd"
+ Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd"
+ Delete /REBOOTOK "$INSTDIR\RAddr.cmd"
Delete /REBOOTOK "$INSTDIR\TimeDate.cmd"
Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"
Delete /REBOOTOK "$INSTDIR\LICENSE.txt"
Author: dreimer
Date: Fri Jul 6 13:17:05 2007
New Revision: 27420
URL: http://svn.reactos.org/svn/reactos?rev=27420&view=rev
Log:
- Whitespace trim
- Finally managed to get another ReactOS Source Default Folder. Easier for n00bs and needed for my "svn create" feature. thx to kichik for help :-)
Modified:
trunk/tools/RosBE-Windows/Root/LICENSE.txt
trunk/tools/RosBE-Windows/RosSourceDir.nsh
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 Fri Jul 6 13:17:05 2007
@@ -1,4 +1,4 @@
- ReactOS Build Environment v0.3.7
+ReactOS Build Environment v0.3.7
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/RosSourceDir.nsh
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.n…
==============================================================================
--- trunk/tools/RosBE-Windows/RosSourceDir.nsh (original)
+++ trunk/tools/RosBE-Windows/RosSourceDir.nsh Fri Jul 6 13:17:05 2007
@@ -6,7 +6,7 @@
Function RosDir.show
!insertmacro MUI_HEADER_TEXT "Select ReactOS Source Location" "Select the directory where the ReactOS sources are located or will be checked out to later."
- !insertmacro MUI_INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR\Source"
!insertmacro MUI_INSTALLOPTIONS_DISPLAY "RosSourceDir.ini"
FunctionEnd
Author: dreimer
Date: Fri Jul 6 12:45:32 2007
New Revision: 27418
URL: http://svn.reactos.org/svn/reactos?rev=27418&view=rev
Log:
Move LogFolder check/creation from RosBE.cmd to Build-Shared.cmd. Otherwise it is impossible to use my uuuber n00b error preventing "svn create", which ONLY works in a empty folder.
Modified:
trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
trunk/tools/RosBE-Windows/Root/RosBE.cmd
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jul 6 12:45:32 2007
@@ -25,6 +25,16 @@
)
:Build
+
+::
+:: Check if our log directory exists, if it doesn't, create it.
+::
+if not exist "%_ROSSOURCEDIR%\RosBE-Logs\." (
+ mkdir "%_ROSSOURCEDIR%\RosBE-Logs"
+ set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
+) else (
+ set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
+)
::
:: Check if config.template.rbuild is newer than config.rbuild, if it is then
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Jul 6 12:45:32 2007
@@ -30,16 +30,6 @@
:: Save our initial directory (should be the ReactOS source directory)
::
set _ROSSOURCEDIR=%CD%
-
-::
-:: Check if our log directory exists, if it doesn't, create it.
-::
-if not exist "%_ROSSOURCEDIR%\RosBE-Logs\." (
- mkdir "%_ROSSOURCEDIR%\RosBE-Logs"
- set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
-) else (
- set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs
-)
::
:: Display the current version of GCC, NASM, ld and make.
Author: dreimer
Date: Fri Jul 6 12:36:37 2007
New Revision: 27417
URL: http://svn.reactos.org/svn/reactos?rev=27417&view=rev
Log:
- Whitespace trim
- Add new pdf to unistall.
Modified:
trunk/tools/RosBE-Windows/Root/README.txt
trunk/tools/RosBE-Windows/Root/SVN.cmd
trunk/tools/RosBE-Windows/RosBE.nsi
trunk/tools/RosBE-Windows/RosSourceDir.ini
trunk/tools/RosBE-Windows/Tools/config/makefile
trunk/tools/RosBE-Windows/Tools/config/options.c
trunk/tools/RosBE-Windows/Tools/config/todo.txt
trunk/tools/RosBE-Windows/Tools/echoh.c
trunk/tools/RosBE-Windows/Tools/info.txt
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 Fri Jul 6 12:36:37 2007
@@ -3,7 +3,7 @@
The ReactOS Build Environment v0.3.7 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.
+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.
To build ReactOS with the ReactOS Build Environment you run "GCC 4.1.3 ReactOS Build Environment" from the start
menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information
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 Fri Jul 6 12:36:37 2007
@@ -17,7 +17,7 @@
)
if "%1" == "update" (
title Updating...
- if not "%2" == "" (
+ if not "%2" == "" (
%ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% -r %2
) else (
%ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR%
Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Fri Jul 6 12:36:37 2007
@@ -189,6 +189,7 @@
Delete /REBOOTOK "$INSTDIR\ChangeLog.txt"
Delete /REBOOTOK "$INSTDIR\LICENSE.txt"
Delete /REBOOTOK "$INSTDIR\README.txt"
+ Delete /REBOOTOK "$INSTDIR\readme.pdf"
Delete /REBOOTOK "$INSTDIR\reactos.ico"
Delete /REBOOTOK "$INSTDIR\RosBE.mac"
Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
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 Fri Jul 6 12:36:37 2007
@@ -24,4 +24,3 @@
Right=-1
Top=6
Bottom=32
-
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 Fri Jul 6 12:36:37 2007
@@ -9,10 +9,10 @@
LFLAGS := -mwindows
LIBS :=
-SRCS := options.c
-RC := options.rc
+SRCS := options.c
+RC := options.rc
-OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff)
+OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff)
$(TARGET): $(OBJS)
$(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS)
@@ -26,4 +26,4 @@
.PHONY: clean
clean:
-@del $(TARGET)
- -@del $(OBJS)
+ -@del $(OBJS)
Modified: trunk/tools/RosBE-Windows/Tools/config/options.c
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/options.c (original)
+++ trunk/tools/RosBE-Windows/Tools/config/options.c Fri Jul 6 12:36:37 2007
@@ -4,8 +4,8 @@
* Copyright 2007 by Maarten Bosma
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original)
+++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Fri Jul 6 12:36:37 2007
@@ -1,4 +1,4 @@
-ToDo:
+ToDo:
- Fix control size / positions
- Load old settings
- Disable Save button if there are no changes
@@ -6,4 +6,4 @@
- Exe and dialog icon
- Use styled controls (uxtheme) for dialog
- Find out how to disable ... button
-- Font preview
+- Font preview
Modified: trunk/tools/RosBE-Windows/Tools/echoh.c
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?…
==============================================================================
--- trunk/tools/RosBE-Windows/Tools/echoh.c (original)
+++ trunk/tools/RosBE-Windows/Tools/echoh.c Fri Jul 6 12:36:37 2007
@@ -6,10 +6,10 @@
* COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org>
*
*/
-
-
+
+
#include <stdio.h>
-
+
int main(int argc, char** argv) {
if (argc == 2)
printf("%x", atoi(argv[1]));
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 Fri Jul 6 12:36:37 2007
@@ -11,4 +11,4 @@
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/
+Built Tools and Rest needs to be copied to /Root/Tools/