[ros-diffs] [dreimer] 47272: Remove the Old behavior mode for now again. 64 bit hosts and their (x86) in path make problems in stupid batch!

[dreimer at svn.reactos.org]

Author: dreimer
Date: Wed May 19 10:45:36 2010
New Revision: 47272

URL: http://svn.reactos.org/svn/reactos?rev=47272&view=rev
Log:
Remove the Old behavior mode for now again. 64 bit hosts and their (x86) in path make problems in stupid batch!

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE/RosBE-Windows/RosBE.nsi

Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt?rev=47272&r1=47271&r2=47272&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Wed May 19 10:45:36 2010
@@ -1,4 +1,11 @@
-*** May XXth, 2010 - RosBE 1.5.1 Released
+*** May 19th, 2010 - RosBE 1.5.1.1 Released
+
+- fix a bug in ssvn batch version which always ran through the update function even if the 1st param was crap. (Crocodile)
+- Fixing another Bug noone saw in the RCs or in RosBE 1.5 Update 1, a bug which exactly shows the bullshit Batch is in real. (Daniel Reimer)
+  Results in having to remove the old behavior mode again for now. 64 bit hosts make problems with their (x86) in the path var. (Daniel Reimer)
+- Some sSVN cleanup, too. (Daniel Reimer)
+
+*** May 16th, 2010 - RosBE 1.5.1 Released
 
 - Updated NASM to 2.08.01 (Daniel Reimer)
 - Updated YASM to 1.0.0 (Daniel Reimer)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd?rev=47272&r1=47271&r2=47272&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed May 19 10:45:36 2010
@@ -41,15 +41,7 @@
 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH%
 set _BUILDBOT_SVNSKIPMAINTRUNK=0
 
-setlocal enabledelayedexpansion
-
-if "%_ROSBE_NOSYSPATH%" == "1" (
-    set _ROSBE_ORIGINALPATH=!_ROSBE_BASEDIR!;!_ROSBE_BASEDIR!\Tools;!_ROSBE_BASEDIR!\samples;!SystemRoot!\system32;!SystemRoot!;!SystemRoot!\System32\Wbem
-) else (
-    set _ROSBE_ORIGINALPATH=!_ROSBE_BASEDIR!;!_ROSBE_BASEDIR!\Tools;!_ROSBE_BASEDIR!\samples;!PATH!
-)
-
-endlocal && set _ROSBE_ORIGINALPATH=%_ROSBE_ORIGINALPATH%
+set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH%
 
 :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces)
 set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi?rev=47272&r1=47271&r2=47272&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed May 19 10:45:36 2010
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "ReactOS Build Environment for Windows"
-!define PRODUCT_VERSION "1.5.1"
+!define PRODUCT_VERSION "1.5.1.1"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKCU"
@@ -17,7 +17,7 @@
 ;;
 ;; Add version/product information metadata to the installation file.
 ;;
-VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.0"
+VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.1"
 VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}"
 VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)"
@@ -25,7 +25,7 @@
 VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team"
 VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team"
 VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
-VIProductVersion "1.5.1.0"
+VIProductVersion "1.5.1.1"
 
 CRCCheck force
 SetDatablockOptimize on