16 May
2009
16 May
'09
11:11 p.m.
Author: dreimer
Date: Sun May 17 03:11:19 2009
New Revision: 40946
URL: http://svn.reactos.org/svn/reactos?rev=40946&view=rev
Log:
and revert buildflags...
Removed:
trunk/tools/RosBE/RosBE-Windows/Powershell/Buildflags.ps1
trunk/tools/RosBE/RosBE-Windows/Root/Buildflags.cmd
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac
trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Removed: trunk/tools/RosBE/RosBE-Windows/Powershell/Buildflags.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Buildflags.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Buildflags.ps1 (removed)
@@ -1,56 +1,0 @@
-#
-# PROJECT: RosBE - ReactOS Build Environment for Windows
-# LICENSE: GNU General Public License v2. (see LICENSE.txt)
-# FILE: Root/Buildflags.cmd
-# PURPOSE: Sets the RBuild
-# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de>
-#
-
-$temparg = $args[1]
-
-if ($args -eq "verbose") {
- # Be verbose.
- $ENV:ROS_RBUILDFLAGS = "-v"
-} elseif ($args -eq "lowhddspace") {
- # Clean as you go. Delete generated files as soon as they are not needed anymore.
- $ENV:ROS_RBUILDFLAGS = "-c"
-} elseif ($args -eq "noautodep") {
- # Disable automatic dependencies.
- $ENV:ROS_RBUILDFLAGS = "-dd"
-} elseif ($args -eq "autodep") {
- # Enable automatic dependencies.
- $ENV:ROS_RBUILDFLAGS = "-da"
-} elseif ($args -eq "fullautodep") {
- # Enable full dependencies.
- $ENV:ROS_RBUILDFLAGS = "-df"
-} elseif ($args -eq "depforx") {
- # Check only automatic dependencies for this module.
- $ENV:ROS_RBUILDFLAGS = "-dm{$temparg}"
-} elseif ($args -eq "noprecompheaders") {
- # Disable precompiled headers.
- $ENV:ROS_RBUILDFLAGS = "-hd"
-} elseif ($args -eq "makegendir") {
- # Let make handle creation of install directories. Rbuild will not generate the
directories.
- $ENV:ROS_RBUILDFLAGS = "-mi"
-} elseif ($args -eq "proxymakefiles") {
- # Generate proxy makefiles in source tree instead of the output tree.
- $ENV:ROS_RBUILDFLAGS = "-ps"
-} elseif ($args -eq "nocompunits") {
- # Disable compilation units.
- $ENV:ROS_RBUILDFLAGS = "-ud"
-} elseif ($args -eq "inputxml") {
- # Input XML
- $ENV:ROS_RBUILDFLAGS = "-r"
-} elseif ($args -eq "installpath") {
- # This variable controls where to install output files to when using
- # 'make install'. N.B. Don't put a path separator at the end. The
variable
- # defaults to .\{ROS_CDOUTPUT}.
- $ENV:ROS_INSTALL = "$temparg"
-} elseif ($args -eq "buildengine") {
- # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
- $ENV:ROS_BUILDENGINE = "$temparg"
-} elseif ($args -eq "reset") {
- $ENV:ROS_RBUILDFLAGS = $null
- $ENV:ROS_INSTALL = $null
- $ENV:ROS_BUILDENGINE = $null
-}
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun May 17 03:11:19
2009
@@ -19,10 +19,7 @@
" number of CPU Cores in the system and uses -j
with"
" the appropriate number."
" basedir - Switch back to the ReactOS source directory."
- if (Test-Path "$_ROSBE_BASEDIR\Buildflags.ps1") {
- " buildflags [OPTIONS] - Change Buildflags for Rbuild, like
Dependency"
- " Checking, other build tool usage and
more."
- }
+
if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") {
" charch [OPTIONS] - Change the Architecture to build ReactOS
for"
" for the current RosBE session."
@@ -125,32 +122,6 @@
} elseif ("$args" -eq "basedir") {
" Usage: basedir"
" Switches back to the ReactOS source directory."
-} elseif ("$args" -eq "buildflags") {
- if (Test-Path "$_ROSBE_BASEDIR\Buildflags.ps1") {
- " A tool to set rather hidden switches in rbuild. It can set Dependency
checks"
- " or can completely replace the build engine."
- " verbose - Be verbose."
- " lowhddspace - Clean as you go. Delete generated files as soon as
they"
- " are not needed anymore."
- " noautodep - Disable automatic dependencies."
- " autodep - Enable automatic dependencies."
- " fullautodep - Enable full dependencies."
- " depforx - Check only automatic dependencies for this
module."
- " noprecompheaders - Disable precompiled headers."
- " makegendir - Let make handle creation of install directories.
Rbuild"
- " will not generate the directories."
- " proxymakefiles - Generate proxy makefiles in source tree instead of
the"
- " output tree."
- " nocompunits - Disable compilation units."
- " inputxml - Input XML"
- " installpath - This variable controls where to install output files
to"
- " when using 'make install'. N.B. Don't
put a path"
- " separator at the end. The variable defaults
to"
- " .\{ROS_CDOUTPUT}."
- " buildengine - The Build engine to be used. The variable defaults
to"
- " rbuild (RBUILD_TARGET)"
- " reset - Set all back to default."
- }
} elseif ("$args" -eq "charch") {
if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") {
" Usage: charch [OPTIONS]"
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sun May 17 03:11:19
2009
@@ -69,11 +69,6 @@
function global:BASEDIR {
set-location "$_ROSBE_ROSSOURCEDIR"
}
-
- if (Test-Path "$_ROSBE_BASEDIR\Buildflags.ps1") {
- set-alias BUILDFLAGS "$_ROSBE_BASEDIR\Buildflags.ps1" -scope Global
- }
-
if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") {
set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global
}
Removed: trunk/tools/RosBE/RosBE-Windows/Root/Buildflags.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Buildflags.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Buildflags.cmd (removed)
@@ -1,63 +1,0 @@
-::
-:: PROJECT: RosBE - ReactOS Build Environment for Windows
-:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
-:: FILE: Root/Buildflags.cmd
-:: PURPOSE: Sets the RBuild
-:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de>
-::
-
-@echo off
-if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0
-if %_ROSBE_DEBUG% == 1 (
- @echo on
-)
-
-setlocal enabledelayedexpansion
-
-if /i "%1" == "verbose" (
- REM Be verbose.
- set ROS_RBUILDFLAGS=-v
-) else if /i "%1" == "lowhddspace" (
- REM Clean as you go. Delete generated files as soon as they are not needed anymore.
- set ROS_RBUILDFLAGS=-c
-) else if /i "%1" == "noautodep" (
- REM Disable automatic dependencies.
- set ROS_RBUILDFLAGS=-dd
-) else if /i "%1" == "autodep" (
- REM Enable automatic dependencies.
- set ROS_RBUILDFLAGS=-da
-) else if /i "%1" == "fullautodep" (
- REM Enable full dependencies.
- set ROS_RBUILDFLAGS=-df
-) else if /i "%1" == "depforx" (
- REM Check only automatic dependencies for this module.
- set ROS_RBUILDFLAGS=-dm{%2}
-) else if /i "%1" == "noprecompheaders" (
- REM Disable precompiled headers.
- set ROS_RBUILDFLAGS=-hd
-) else if /i "%1" == "makegendir" (
- REM Let make handle creation of install directories. Rbuild will not generate the
directories.
- set ROS_RBUILDFLAGS=-mi
-) else if /i "%1" == "proxymakefiles" (
- REM Generate proxy makefiles in source tree instead of the output tree.
- set ROS_RBUILDFLAGS=-ps
-) else if /i "%1" == "nocompunits" (
- REM Disable compilation units.
- set ROS_RBUILDFLAGS=-ud
-) else if /i "%1" == "inputxml" (
- REM Input XML
- set ROS_RBUILDFLAGS=-r
-) else if /i "%1" == "installpath" (
- REM This variable controls where to install output files to when using
- REM 'make install'. N.B. Don't put a path separator at the end. The
variable
- REM defaults to .\{ROS_CDOUTPUT}.
- set ROS_INSTALL=%2
-) else if /i "%1" == "buildengine" (
- REM The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
- set ROS_BUILDENGINE=%2
-) else if /i "%1" == "reset" (
- set ROS_RBUILDFLAGS=
- set ROS_INSTALL=
- set ROS_BUILDENGINE=
-)
-endlocal & set ROS_RBUILDFLAGS=%ROS_RBUILDFLAGS%& set
ROS_INSTALL=%ROS_INSTALL%& set ROS_BUILDENGINE=%ROS_BUILDENGINE%
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 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sun May 17 03:11:19
2009
@@ -14,7 +14,6 @@
- In PS Logs were generated, but without any warnings or errors in it. Additionally they
were not even displayed
in the console too. This is now fixed. (Daniel Reimer)
- "buildno.h not found" errors i PS were fixed now that I was able to see them
:-P (Daniel Reimer)
-- Added tool to set Buildflags of RBuild, like Dependency checking etc. (Daniel Reimer)
- Fixed chdefgcc, charch and chdefdir for PS and Batch. (Daniel Reimer)
- Fixed version showing when using charch and chdefdir under PS. (Daniel Reimer)
- Fixed endless loop in update under PS. (Daniel Reimer)
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sun May 17 03:11:19 2009
@@ -27,11 +27,6 @@
echo the appropriate number.
echo basedir - Switch back to the ReactOS source directory.
- if exist "%_ROSBE_BASEDIR%\Buildflags.cmd" (
- echo buildflags [OPTIONS] - Change Buildflags for Rbuild, like Dependency
- echo Checking, other build tool usage and more.
- )
-
if exist "%_ROSBE_BASEDIR%\charch.cmd" (
echo charch [OPTIONS] - Change the Architecture to build ReactOS for
echo for the current RosBE session.
@@ -133,32 +128,6 @@
) else if /i "%1" == "basedir" (
echo Usage: basedir
echo Switches back to the ReactOS source directory.
-) else if /i "%1" == "buildflags" (
- if exist "%_ROSBE_BASEDIR%\buildflags.cmd" (
- echo A tool to set rather hidden switches in rbuild. It can set Dependency checks
or
- echo can completely replace the build engine.
- echo verbose - Be verbose.
- echo lowhddspace - Clean as you go. Delete generated files as soon as
they
- echo are not needed anymore.
- echo noautodep - Disable automatic dependencies.
- echo autodep - Enable automatic dependencies.
- echo fullautodep - Enable full dependencies.
- echo depforx - Check only automatic dependencies for this module.
- echo noprecompheaders - Disable precompiled headers.
- echo makegendir - Let make handle creation of install directories.
Rbuild
- echo will not generate the directories.
- echo proxymakefiles - Generate proxy makefiles in source tree instead of
the
- echo output tree.
- echo nocompunits - Disable compilation units.
- echo inputxml - Input XML
- echo installpath - This variable controls where to install output files
to
- echo when using 'make install'. N.B. Don't put
a path
- echo separator at the end. The variable defaults to
- echo .\{ROS_CDOUTPUT}.
- echo buildengine - The Build engine to be used. The variable defaults to
- echo rbuild
- echo reset - Set all back to default.
- )
) else if /i "%1" == "charch" (
if exist "%_ROSBE_BASEDIR%\charch.cmd" (
echo Usage: charch [OPTIONS]
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Sun May 17 03:11:19 2009
@@ -1,5 +1,4 @@
BASEDIR = cd /d "%_ROSBE_ROSSOURCEDIR%"
-BUILDFLAGS = "%_ROSBE_BASEDIR%\buildflags.cmd" $*
CHDEFDIR = "%_ROSBE_BASEDIR%\chdefdir.cmd" $*
CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $*
CHARCH = "%_ROSBE_BASEDIR%\charch.cmd" $*
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 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun May 17 03:11:19 2009
@@ -121,7 +121,6 @@
File /r Root\LICENSE.txt
${If} $R4 = '6.1'
File /r Components\Powershell\Build.ps1
- File /r Components\Powershell\Buildflags.ps1
File /r Components\Powershell\charch.ps1
File /r Components\Powershell\chdefgcc.ps1
File /r Components\Powershell\Clean.ps1
@@ -132,7 +131,6 @@
WriteRegStr HKLM
"Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
"ExecutionPolicy" "RemoteSigned"
${else}
File /r Root\Build.cmd
- File /r Root\Buildflags.cmd
File /r Root\Build-Multi.cmd
File /r Root\Build-Shared.cmd
File /r Root\charch.cmd
@@ -301,7 +299,6 @@
SetOutPath "$INSTDIR"
SetOverwrite try
File /r Root\Build.cmd
- File /r Root\Buildflags.cmd
File /r Root\Build-Multi.cmd
File /r Root\Build-Shared.cmd
File /r Root\chdefgcc.cmd
@@ -333,7 +330,6 @@
SetOutPath "$INSTDIR"
SetOverwrite try
File /r Components\Powershell\Build.ps1
- File /r Components\Powershell\Buildflags.ps1
File /r Components\Powershell\RosBE.ps1
File /r Components\Powershell\rosbe-gcc-env.ps1
File /r Components\Powershell\Help.ps1
@@ -458,8 +454,6 @@
Delete /REBOOTOK "$INSTDIR\Build-Multi.cmd"
Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd"
Delete /REBOOTOK "$INSTDIR\Build.ps1"
- Delete /REBOOTOK "$INSTDIR\Buildflags.cmd"
- Delete /REBOOTOK "$INSTDIR\Buildflags.ps1"
Delete /REBOOTOK "$INSTDIR\chdefdir.cmd"
Delete /REBOOTOK "$INSTDIR\chdefdir.ps1"
Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd"