[ros-diffs] [dreimer] 27862: - Kill chdefdir, because its useless now. - Wipe _ROSSOURCEDIR out of Clean.cmd

dreimer at svn.reactos.org dreimer at svn.reactos.org
Thu Jul 26 18:58:47 CEST 2007


Author: dreimer
Date: Thu Jul 26 20:58:47 2007
New Revision: 27862

URL: http://svn.reactos.org/svn/reactos?rev=27862&view=rev
Log:
- Kill chdefdir, because its useless now.
- Wipe _ROSSOURCEDIR out of Clean.cmd

Removed:
    trunk/tools/RosBE-Windows/Root/chdefdir.cmd
Modified:
    trunk/tools/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE-Windows/Root/Help.cmd
    trunk/tools/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE-Windows/Root/RosBE.mac

Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd?rev=27862&r1=27861&r2=27862&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Clean.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Clean.cmd Thu Jul 26 20:58:47 2007
@@ -15,77 +15,69 @@
     ::
     : Check if we have something to clean, if so, clean it.
     ::
-    if exist "%_ROSSOURCEDIR%\obj-i386\." (
+    if exist "%CD%\obj-i386\." (
         echo Cleaning ReactOS source directory...
 
         ::
         : Run ReactOS's make clean.
         ::
-        if exist "%_ROSSOURCEDIR%\makefile.auto" (
-            if not "%CD%" == "%_ROSSOURCEDIR%" (
-                pushd "%_ROSSOURCEDIR%"
-                "%_MINGWMAKE%" clean 1> NUL 2> NUL
-                popd
-            ) else (
-                "%_MINGWMAKE%" clean 1> NUL 2> NUL
-            )
-        )
+        "%_MINGWMAKE%" clean 1> NUL 2> NUL
 
         ::
         : Remove directories/makefile.auto created by the build.
         ::
-        if exist "%_ROSSOURCEDIR%\obj-i386\." (
-            rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL
+        if exist "%CD%\obj-i386\." (
+            rd /s /q "%CD%\obj-i386" 1> NUL 2> NUL
         )
-        if exist "%_ROSSOURCEDIR%\output-i386\." (
-            rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL
+        if exist "%CD%\output-i386\." (
+            rd /s /q "%CD%\output-i386" 1> NUL 2> NUL
         )
-        if exist "%_ROSSOURCEDIR%\reactos\." (
-            rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL
+        if exist "%CD%\reactos\." (
+            rd /s /q "%CD%\reactos" 1> NUL 2> NUL
         )
-        if exist "%_ROSSOURCEDIR%\makefile.auto" (
-            del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL
+        if exist "%CD%\makefile.auto" (
+            del "%CD%\makefile.auto" 1> NUL 2> NUL
         )
 
         ::
         : Now delete auto-generated/copied files not removed by make clean.
         ::
-        del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL
-        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL
+        del /f "%CD%\media\inf\syssetup.inf" 1> NUL 2> NUL
+        del /f "%CD%\include\roscfg.h" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL
+        del /f "%CD%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL
 
         echo Done cleaning ReactOS source directory.
     ) else (

Modified: trunk/tools/RosBE-Windows/Root/Help.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?rev=27862&r1=27861&r2=27862&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Help.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Help.cmd Thu Jul 26 20:58:47 2007
@@ -23,8 +23,6 @@
     echo                           with the appropriate number.
     echo    basedir              - Switch back to the ReactOS source directory.
     echo.
-    echo    chdefdir [OPTIONS]   - Reconfigures the Default Source Folder for one
-    echo                           Session.
     echo    config [OPTIONS]     - Configures the way, ReactOS will be built.
     echo.
     echo    clean [logs]         - Fully clean the ReactOS source directory and/or
@@ -81,15 +79,6 @@
     echo              Revision Number.
     goto :EOF
 )
-if "%1" == "chdefdir" (
-    echo Usage: chdefdir [OPTIONS]
-    echo Reconfigures the Default Source Folder for one Session. Exiting
-    echo sets RosBE back to the Default.
-    echo.
-    echo    default - Sets back to the Default Source Folder without a restart
-    ehco              of RosBE.
-    goto :EOF
-)
 if "%1" == "config" (
     echo Usage: config [OPTIONS]
     echo Creates a Configuration File, which tells RosBE how to build the Tree.

Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?rev=27862&r1=27861&r2=27862&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Jul 26 20:58:47 2007
@@ -35,7 +35,6 @@
 :: and add PATH for Tools Folder.
 ::
 set _ROSSOURCEDIR=%CD%
-set _ROSSRCDIRBCK=%CD%
 set PATH=%ROSBEBASEDIR%\Tools;%PATH%
 
 ::

Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac?rev=27862&r1=27861&r2=27862&view=diff
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.mac (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.mac Thu Jul 26 20:58:47 2007
@@ -5,5 +5,4 @@
 HELP       = "%ROSBEBASEDIR%\Help.cmd" $*
 MAKE       = "%ROSBEBASEDIR%\Build.cmd" $*
 MAKEX      = "%ROSBEBASEDIR%\Build-Multi.cmd" $*
-CHDEFDIR   = "%ROSBEBASEDIR%\chdefdir.cmd" $*
 RADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $*

Removed: trunk/tools/RosBE-Windows/Root/chdefdir.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.cmd?rev=27861&view=auto
==============================================================================
--- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd (removed)
@@ -1,40 +1,0 @@
-::
-:: PROJECT:     RosBE - ReactOS Build Environment for Windows
-:: LICENSE:     GPL - See COPYING in the top level directory
-:: FILE:        Root/chdefdir.cmd
-:: PURPOSE:     Tool to change the Default Work Dir in RosBE.
-:: COPYRIGHT:   Copyright 2007 Daniel Reimer <reimer.daniel at freenet.de>
-::
-::
- at echo off
-
-title Change the Default Dir...
-
-if /I "%1"=="" (
-    goto :DEF
-) 
-if /I "%1"=="default" ( 
-    set _ROSSOURCEDIR=%_ROSSRCDIRBCK%
-) else (
-    set _ROSSOURCEDIR=%1
-)
-goto :END
-
-:DEF
-
-echo in a Path to use RosBE in or "default" to revert to Default Dir:
-SET /P XY=
-
-if /I "%XY%"=="" (
-    goto :END
-) 
-if /I "%XY%"=="default" ( 
-    set _ROSSOURCEDIR=%_ROSSRCDIRBCK%
-) else (
-    set _ROSSOURCEDIR=%XY%
-)
-goto :END
-
-:END
-title ReactOS Build Environment %_VER%
-cd "%_ROSSOURCEDIR%"




More information about the Ros-diffs mailing list