Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[cfinck] 28127: Check if the same Monitor ID (= 10 bytes from the EDID, which can be used to uniquely identify a monitor) appears two times and stop the enumeration in this case. This is needed for some older monitors (1994-1999), which transmit the EDID data according to the VBE/DDC Standard 1.0. We assumed that the function for reading the EDID fails, when we input higher controller unit numbers, but some older monitors don't care about the controller unit number and always return valid EDID d

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Aug 3 16:10:43 2007 New Revision: 28127 URL: http://svn.reactos.org/svn/reactos?rev=28127&view=rev Log: Check if the same Monitor ID (= 10 bytes from the EDID, which can be used to uniquely identify a monitor) appears two times and stop the enumeration in this case. This is needed for some older monitors (1994-1999), which transmit the EDID data according to the VBE/DDC Standard 1.0. We assumed that the function for reading the EDID fails, when we input higher controller unit numbers, but some older monitors don't care about the controller unit number and always return valid EDID data. More information is available at: http://www.vesa.org/public/VBE/VBEDDC11.PDF See issue #2239 for more details. Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Aug 3 16:10:43 2007 @@ -1100,6 +1100,8 @@ ULONG Status; VIDEO_CHILD_ENUM_INFO ChildEnumInfo; VIDEO_CHILD_TYPE ChildType; + BOOLEAN bHaveLastMonitorID = FALSE; + UCHAR LastMonitorID[10]; UCHAR ChildDescriptor[256]; ULONG ChildId; ULONG Unused; @@ -1131,7 +1133,37 @@ ChildDescriptor, &ChildId, &Unused); - if (Status == VIDEO_ENUM_INVALID_DEVICE) + if (Status == VIDEO_ENUM_MORE_DEVICES) + { + if (ChildType == Monitor) + { + // Check if the EDID is valid + if (ChildDescriptor[0] == 0x00 && + ChildDescriptor[1] == 0xFF && + ChildDescriptor[2] == 0xFF && + ChildDescriptor[3] == 0xFF && + ChildDescriptor[4] == 0xFF && + ChildDescriptor[5] == 0xFF && + ChildDescriptor[6] == 0xFF && + ChildDescriptor[7] == 0x00) + { + if (bHaveLastMonitorID) + { + // Compare the previous monitor ID with the current one, break the loop if they are identical + if (RtlCompareMemory(LastMonitorID, &ChildDescriptor[8], sizeof(LastMonitorID)) == sizeof(LastMonitorID)) + { + DPRINT("Found identical Monitor ID two times, stopping enumeration\n"); + break; + } + } + + // Copy 10 bytes from the EDID, which can be used to uniquely identify the monitor + RtlCopyMemory(LastMonitorID, &ChildDescriptor[8], sizeof(LastMonitorID)); + bHaveLastMonitorID = TRUE; + } + } + } + else if (Status == VIDEO_ENUM_INVALID_DEVICE) { DPRINT("Child device %d is invalid!\n", ChildEnumInfo.ChildIndex); continue; @@ -1141,7 +1173,7 @@ DPRINT("End of child enumeration! (%d children enumerated)\n", i - 1); break; } - else if (Status != VIDEO_ENUM_MORE_DEVICES) + else { DPRINT("HwGetVideoChildDescriptor returned unknown status code 0x%x!\n", Status); break;

17 years, 4 months

[hpoussin] 28126: Move some more autogenerated files to intermediate directory Remove POSTAUTO hack in Makefile

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Aug 3 15:54:33 2007 New Revision: 28126 URL: http://svn.reactos.org/svn/reactos?rev=28126&view=rev Log: Move some more autogenerated files to intermediate directory Remove POSTAUTO hack in Makefile Modified: trunk/reactos/Makefile trunk/reactos/ReactOS-i386.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/lib/win32ksys/win32ksys.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/buildno/buildno.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28126&r1=2812… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Aug 3 15:54:33 2007 @@ -391,11 +391,11 @@ NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc KERNEL32_MC = dll$(SEP)win32$(SEP)kernel32$(SEP)kernel32.mc -BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h -BUGCODES_H = include$(SEP)reactos$(SEP)bugcodes.h -BUGCODES_RC = ntoskrnl$(SEP)bugcodes.rc -ERRCODES_H = include$(SEP)reactos$(SEP)errcodes.h -ERRCODES_RC = dll$(SEP)win32$(SEP)kernel32$(SEP)errcodes.rc +BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h +BUGCODES_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)bugcodes.h +BUGCODES_RC = $(INTERMEDIATE_)ntoskrnl$(SEP)bugcodes.rc +ERRCODES_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)errcodes.h +ERRCODES_RC = $(INTERMEDIATE_)dll$(SEP)win32$(SEP)kernel32$(SEP)errcodes.rc include lib/lib.mak @@ -414,15 +414,10 @@ $(GENDIB_DIB_FILES) \ $(NCI_SERVICE_FILES) -POSTAUTO : \ - psdk \ - $(IDL_FILES) - $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) ${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw - @$(MAKE) POSTAUTO world: all bootcd livecd @@ -494,10 +489,14 @@ $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) msvc $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC) + ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)ntoskrnl 2>$(NUL) $(ECHO_WMC) $(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) + ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)dll$(SEP)win32$(SEP)kernel32 2>$(NUL) $(ECHO_WMC) $(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=28… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Fri Aug 3 15:54:33 2007 @@ -65,6 +65,7 @@ <include>include/GL</include> <include>include/ndk</include> <include>include/reactos</include> + <include root="intermediate">include/reactos</include> <include>include/reactos/libs</include> <directory name="base"> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Fri Aug 3 15:54:33 2007 @@ -47,19 +47,8 @@ <directory name="inc"> <pch>ntdll.h</pch> </directory> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>napi.S</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>napi.S</file> - </directory> - </if> - <if property="ARCH" value="mips"> - <directory name="mips"> - <file>napi.S</file> - </directory> - </if> + + <directory name="." root="intermediate"> + <file>napi.S</file> + </directory> </module> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Fri Aug 3 15:54:33 2007 @@ -117,6 +117,7 @@ <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> <importlibrary definition="kernel32.def" /> <include base="kernel32">.</include> + <include base="kernel32" root="intermediate">.</include> <include base="kernel32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> Modified: trunk/reactos/lib/win32ksys/win32ksys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/win32ksys/win32ksys.rb… ============================================================================== --- trunk/reactos/lib/win32ksys/win32ksys.rbuild (original) +++ trunk/reactos/lib/win32ksys/win32ksys.rbuild Fri Aug 3 15:54:33 2007 @@ -3,20 +3,7 @@ <define name="__REACTOS__" /> <define name="__USE_W32API" /> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>win32k.S</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>win32k.S</file> - </directory> - </if> - <if property="ARCH" value="mips"> - <directory name="mips"> - <file>win32k.S</file> - </directory> - </if> - + <directory name="." root="intermediate"> + <file>win32k.S</file> + </directory> </module> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri Aug 3 15:54:33 2007 @@ -14,6 +14,7 @@ </if> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> + <include base="ntoskrnl" root="intermediate"></include> <include base="ReactOS">include/reactos/drivers</include> <library>csq</library> <library>hal</library> @@ -121,23 +122,15 @@ <file>dbgkutil.c</file> <file>dbgkobj.c</file> </directory> + <directory name="ex" root="intermediate"> + <file>zw.S</file> + </directory> <directory name="ex"> <if property="ARCH" value="i386"> <directory name="i386"> <file>interlck_asm.S</file> <file>fastinterlck_asm.S</file> <file>ioport.S</file> - <file>zw.S</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>zw.S</file> - </directory> - </if> - <if property="ARCH" value="mips"> - <directory name="mips"> - <file>zw.S</file> </directory> </if> <file>atom.c</file> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Fri Aug 3 15:54:33 2007 @@ -12,16 +12,19 @@ <define name="_WIN32K_" /> <pch>w32k.h</pch> + <directory name="dib" root="intermediate"> + <file>dib8gen.c</file> + <file>dib16gen.c</file> + <file>dib32gen.c</file> + </directory> + <directory name="dib"> <file>dib1bpp.c</file> <file>dib4bpp.c</file> <file>dib8bpp.c</file> - <file>dib8gen.c</file> <file>dib16bpp.c</file> - <file>dib16gen.c</file> <file>dib24bpp.c</file> <file>dib32bpp.c</file> - <file>dib32gen.c</file> <file>dib.c</file> <if property="ARCH" value="i386"> Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak (original) +++ trunk/reactos/tools/buildno/buildno.mak Fri Aug 3 15:54:33 2007 @@ -46,5 +46,6 @@ clean: buildno_clean $(BUILDNO_H): $(BUILDNO_TARGET) + ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) $(ECHO_BUILDNO) $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H) Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak (original) +++ trunk/reactos/tools/gendib/gendib.mak Fri Aug 3 15:54:33 2007 @@ -41,7 +41,7 @@ -@$(rm) $(GENDIB_TARGET) $(GENDIB_OBJECTS) 2>$(NUL) clean: gendib_clean -GENDIB_DIB_DIR = subsystems$(SEP)win32$(SEP)win32k$(SEP)dib +GENDIB_DIB_DIR = $(INTERMEDIATE_)subsystems$(SEP)win32$(SEP)win32k$(SEP)dib GENDIB_DIB_FILES = \ $(GENDIB_DIB_DIR)$(SEP)dib32gen.c \ @@ -49,5 +49,6 @@ $(GENDIB_DIB_DIR)$(SEP)dib8gen.c $(GENDIB_DIB_FILES): $(GENDIB_TARGET) + ${mkdir} $(GENDIB_DIB_DIR) 2>$(NUL) $(ECHO_GENDIB) $(Q)$(GENDIB_TARGET) $(GENDIB_DIB_DIR) Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2812… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Fri Aug 3 15:54:33 2007 @@ -43,16 +43,16 @@ # WIN32K.SYS WIN32K_SVC_DB = subsystems$(SEP)win32$(SEP)win32k$(SEP)w32ksvc.db -WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h -WIN32K_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S +WIN32K_SERVICE_TABLE = $(INTERMEDIATE_)subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h +WIN32K_STUBS = $(INTERMEDIATE_)lib$(SEP)win32ksys$(SEP)win32k.S # NTOSKRNL.EXE KERNEL_SVC_DB = ntoskrnl$(SEP)sysfuncs.lst -KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h -NTDLL_STUBS = dll$(SEP)ntdll$(SEP)$(ARCH)$(SEP)napi.S -KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)$(ARCH)$(SEP)zw.S +KERNEL_SERVICE_TABLE = $(INTERMEDIATE_)ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h +NTDLL_STUBS = $(INTERMEDIATE_)dll$(SEP)ntdll$(SEP)napi.S +KERNEL_STUBS = $(INTERMEDIATE_)ntoskrnl$(SEP)ex$(SEP)zw.S NCI_SERVICE_FILES = \ $(KERNEL_SERVICE_TABLE) \ @@ -64,11 +64,11 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI) - ${mkdir} dll$(SEP)ntdll$(SEP)$(ARCH) 2>$(NUL) - ${mkdir} ntoskrnl$(SEP)ex$(SEP)$(ARCH) 2>$(NUL) - ${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) - ${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) - ${mkdir} lib$(SEP)win32ksys$(SEP)$(ARCH) 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)ntoskrnl$(SEP)include$(SEP)internal 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)dll$(SEP)ntdll 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)ntoskrnl$(SEP)ex$(SEP) 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)subsystems$(SEP)win32$(SEP)win32k$(SEP)include 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)lib$(SEP)win32ksys 2>$(NUL) $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Fri Aug 3 15:54:33 2007 @@ -240,7 +240,7 @@ s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" ); - FileSupportCode::WriteIfChanged ( buf, "include" + sSep + "roscfg.h" ); + FileSupportCode::WriteIfChanged ( buf, Environment::GetIntermediatePath() + sSep + "include" + sSep + "roscfg.h" ); free ( buf ); }

17 years, 4 months

[dreimer] 28125: Update Help and Comments. Set Default Shortcut active after setting it.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Aug 3 15:47:20 2007 New Revision: 28125 URL: http://svn.reactos.org/svn/reactos?rev=28125&view=rev Log: Update Help and Comments. Set Default Shortcut active after setting it. Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Aug 3 15:47:20 2007 @@ -118,6 +118,9 @@ echo (Optional: "Shortcut" "Directory" as second and third parameter) echo remove - Removes a shortcut. echo (Optional: "Shortcut" as second parameter) + echo def - Chooses Default Shortcut which is enabled on + echo every start of RosBE. "Default" is the Source + echo Directory as you know it from previous Versions goto :EOF ) if not "%1" == "" ( 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 Aug 3 15:47:20 2007 @@ -58,8 +58,8 @@ :EndCommandParse :: -:: Save our initial directory (should be the ReactOS source directory) -:: and add PATH for Tools Folder. +:: Load the Base Directory from the Shortcut-XML and set it as new +:: Source Directory and add PATH for Tools Folder. :: set PATH=%ROSBEBASEDIR%\Tools;%PATH% for /f "usebackq" %%i in (`"grep base= "%ROSBEBASEDIR%\srclist.xml"|cutz main"`) do @SET scut=%%i @@ -82,7 +82,8 @@ echo ------------------------------------------------- :: -:: Load the macros that serve as our commands. +:: Load the macros that serve as our commands and set new Source +:: Directory / Default Source Directory. :: doskey /macrofile="%ROSBEBASEDIR%\RosBE.mac" if "%scut%" == "Default" ( Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Fri Aug 3 15:47:20 2007 @@ -10,6 +10,9 @@ title Choose your Source Folder... +:: +:: Receive the first Parameter and decide what to do. +:: if /I "%1"=="" ( goto :DEF ) @@ -32,6 +35,9 @@ SET /P XY= goto :RUN +:: +:: Load Shortcut from XML and set it active. +:: :RUN for /f "usebackq" %%i in (`"grep name=\"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir"`) do @SET dir=%%i cd /D %dir% @@ -51,6 +57,9 @@ goto :ADD1 ) +:: +:: Add new Shortcut to XML. +:: :ADD1 echo Choose your Shortcut: SET /P CUT= @@ -64,6 +73,9 @@ ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml goto :END +:: +:: Remove Shortcut from XML. +:: :REM if not "%2" == "" ( set CUTREM=%2 @@ -77,6 +89,9 @@ ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml goto :END +:: +:: Set Default Shortcut. +:: :DEF2 if not "%2" == "" ( set DEF=%2 @@ -88,6 +103,7 @@ sed "s/base=\".*\"/base=\"%DEF%\"/g" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" del "%ROSBEBASEDIR%\srclist.xml" ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +call "%ROSBEBASEDIR%\RosBE.cmd" :END title ReactOS Build Environment %_VER%

17 years, 4 months

[hpoussin] 28124: Add ROS_ARCH environment variable Set -r option of rbuild as mandatory

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Aug 3 15:35:01 2007 New Revision: 28124 URL: http://svn.reactos.org/svn/reactos?rev=28124&view=rev Log: Add ROS_ARCH environment variable Set -r option of rbuild as mandatory Added: trunk/reactos/ReactOS-i386.rbuild - copied unchanged from r28101, trunk/reactos/ReactOS.rbuild Removed: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/exception.cpp trunk/reactos/tools/rbuild/exception.h trunk/reactos/tools/rbuild/rbuild.cpp trunk/reactos/tools/tools.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28124&r1=2812… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Aug 3 15:35:01 2007 @@ -48,6 +48,10 @@ # # # Accepted environment variables: +# +# ROS_ARCH +# This variable specifies the name of the architecture to build ReactOS for. +# The variable defaults to i386. # # ROS_PREFIX # This variable specifies the prefix of the MinGW installation. On Windows @@ -323,13 +327,19 @@ endif endif +ifneq ($(ROS_ARCH),) + ARCH := $(ROS_ARCH) +else + ARCH := i386 +endif + ifneq ($(ROS_INTERMEDIATE),) INTERMEDIATE := $(ROS_INTERMEDIATE) else ifneq ($(ROS_CDOUTPUT),) INTERMEDIATE := obj-$(ROS_CDOUTPUT) else - INTERMEDIATE := obj-i386 + INTERMEDIATE := obj-$(ARCH) endif endif INTERMEDIATE_ := $(INTERMEDIATE)$(SEP) @@ -340,7 +350,7 @@ ifneq ($(ROS_CDOUTPUT),) OUTPUT := output-$(ROS_CDOUTPUT) else - OUTPUT := output-i386 + OUTPUT := output-$(ARCH) endif endif OUTPUT_ := $(OUTPUT)$(SEP) @@ -392,7 +402,6 @@ include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak -include $(ROS_AUTOMAKE) -include tools/nci/nci.mak PREAUTO := \ $(BIN2C_TARGET) \ @@ -402,17 +411,17 @@ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ - $(GENDIB_DIB_FILES) + $(GENDIB_DIB_FILES) \ + $(NCI_SERVICE_FILES) POSTAUTO : \ psdk \ - $(IDL_FILES) \ - $(NCI_SERVICE_FILES) + $(IDL_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) ${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw @$(MAKE) POSTAUTO world: all bootcd livecd Removed: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=28123&v… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild (removed) @@ -1,104 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.rbuild" /> - - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - - <if property="GDB" value="0"> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - </if> - - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <linkerflag>-enable-stdcall-fixup</linkerflag> - - <include>.</include> - <include>include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include>include/crt</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include>include/reactos/libs</include> - - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> - -</project> Modified: trunk/reactos/tools/rbuild/exception.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/exception.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/exception.cpp (original) +++ trunk/reactos/tools/rbuild/exception.cpp Fri Aug 3 15:35:01 2007 @@ -48,6 +48,13 @@ void Exception::SetMessageV ( const char* message, va_list args ) { _e = ssvprintf ( message, args); +} + + +MissingArgumentException::MissingArgumentException ( const string& argument ) + : Exception ( "Argument '%s' is missing", + argument.c_str () ) +{ } Modified: trunk/reactos/tools/rbuild/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/exception.h?r… ============================================================================== --- trunk/reactos/tools/rbuild/exception.h (original) +++ trunk/reactos/tools/rbuild/exception.h Fri Aug 3 15:35:01 2007 @@ -36,6 +36,13 @@ private: std::string _e; +}; + + +class MissingArgumentException : public Exception +{ +public: + MissingArgumentException ( const std::string& argument ); }; Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Fri Aug 3 15:35:01 2007 @@ -33,7 +33,7 @@ using std::vector; static string BuildSystem; -static string RootXmlFile = "ReactOS.rbuild"; +static string RootXmlFile; static Configuration configuration; bool @@ -239,12 +239,11 @@ if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); - printf ( " rbuild [switches] buildsystem\n\n" ); + printf ( " rbuild [switches] -r{rootfile.rbuild} buildsystem\n\n" ); printf ( "Switches:\n" ); printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); printf ( " needed anymore.\n" ); - printf ( " -r{file.rbuild} Name of the root rbuild file. Default is ReactOS.rbuild.\n" ); printf ( " -dd Disable automatic dependencies.\n" ); printf ( " -dm{module} Check only automatic dependencies for this module.\n" ); printf ( " -ud Disable multiple source files per compilation unit.\n" ); @@ -267,6 +266,9 @@ } try { + if ( RootXmlFile.length () == 0 ) + throw MissingArgumentException ( "-r" ); + string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=28124&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Fri Aug 3 15:35:01 2007 @@ -48,6 +48,7 @@ include tools/dbgprint/dbgprint.mak include tools/gendib/gendib.mak include tools/mkhive/mkhive.mak +include tools/nci/nci.mak include tools/pefixup.mak include tools/raddr2line.mak include tools/rbuild/rbuild.mak

17 years, 4 months

[weiden] 28122: Revert r28121 as it removes an optimization

by weiden＠svn.reactos.org

Author: weiden Date: Fri Aug 3 14:23:19 2007 New Revision: 28122 URL: http://svn.reactos.org/svn/reactos?rev=28122&view=rev Log: Revert r28121 as it removes an optimization Modified: trunk/reactos/lib/inflib/infput.c Modified: trunk/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infput.c?rev=28… ============================================================================== --- trunk/reactos/lib/inflib/infput.c (original) +++ trunk/reactos/lib/inflib/infput.c Fri Aug 3 14:23:19 2007 @@ -43,8 +43,8 @@ DPRINT("Out of free space. TotalSize %lu FreeSize %lu Length %u\n", OutBuf->TotalSize, OutBuf->FreeSize, Length); /* Round up to next SIZE_INC */ - NewSize = OutBuf->TotalSize - OutBuf->FreeSize + - (((Length + 1) + (SIZE_INC - 1)) / + NewSize = OutBuf->TotalSize + + (((Length + 1) - OutBuf->FreeSize + (SIZE_INC - 1)) / SIZE_INC) * SIZE_INC; DPRINT("NewSize %lu\n", NewSize); NewBuf = MALLOC(NewSize);

17 years, 4 months

[weiden] 28121: Improve calculation of new buffer size

by weiden＠svn.reactos.org

Author: weiden Date: Fri Aug 3 14:21:59 2007 New Revision: 28121 URL: http://svn.reactos.org/svn/reactos?rev=28121&view=rev Log: Improve calculation of new buffer size Modified: trunk/reactos/lib/inflib/infput.c Modified: trunk/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infput.c?rev=28… ============================================================================== --- trunk/reactos/lib/inflib/infput.c (original) +++ trunk/reactos/lib/inflib/infput.c Fri Aug 3 14:21:59 2007 @@ -43,8 +43,8 @@ DPRINT("Out of free space. TotalSize %lu FreeSize %lu Length %u\n", OutBuf->TotalSize, OutBuf->FreeSize, Length); /* Round up to next SIZE_INC */ - NewSize = OutBuf->TotalSize + - (((Length + 1) - OutBuf->FreeSize + (SIZE_INC - 1)) / + NewSize = OutBuf->TotalSize - OutBuf->FreeSize + + (((Length + 1) + (SIZE_INC - 1)) / SIZE_INC) * SIZE_INC; DPRINT("NewSize %lu\n", NewSize); NewBuf = MALLOC(NewSize);

17 years, 4 months

[weiden] 28120: Fix buffer overflow See issue #2516 for more details.

by weiden＠svn.reactos.org

Author: weiden Date: Fri Aug 3 14:12:25 2007 New Revision: 28120 URL: http://svn.reactos.org/svn/reactos?rev=28120&view=rev Log: Fix buffer overflow See issue #2516 for more details. Modified: trunk/reactos/lib/inflib/infput.c Modified: trunk/reactos/lib/inflib/infput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infput.c?rev=28… ============================================================================== --- trunk/reactos/lib/inflib/infput.c (original) +++ trunk/reactos/lib/inflib/infput.c Fri Aug 3 14:12:25 2007 @@ -83,7 +83,7 @@ *OutBuf->Current++ = (char) *Text++; OutBuf->FreeSize--; } - OutBuf->Current[1] = '\0'; + *OutBuf->Current = '\0'; } INFSTATUS

17 years, 4 months

[hpoussin] 28119: Create directory before rbuild tries to access it

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Aug 3 14:12:03 2007 New Revision: 28119 URL: http://svn.reactos.org/svn/reactos?rev=28119&view=rev Log: Create directory before rbuild tries to access it Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28119&r1=2811… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Aug 3 14:12:03 2007 @@ -410,6 +410,7 @@ $(NCI_SERVICE_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) + ${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw @$(MAKE) POSTAUTO

17 years, 4 months

[hpoussin] 28118: Autogenerate syssetup.inf file in intermediate directory

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Aug 3 13:41:42 2007 New Revision: 28118 URL: http://svn.reactos.org/svn/reactos?rev=28118&view=rev Log: Autogenerate syssetup.inf file in intermediate directory Modified: trunk/reactos/media/inf/inf.rbuild trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/syssetupgenerator.cpp Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Fri Aug 3 13:41:42 2007 @@ -14,7 +14,7 @@ <installfile base="inf">nettcpip.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> -<installfile base="inf">syssetup.inf</installfile> +<installfile base="inf" root="intermediate">syssetup.inf</installfile> <installfile base="inf">usbport.inf</installfile> <installfile base="inf">usbstor.inf</installfile> <installfile base="inf">xboxdisp.inf</installfile> Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Fri Aug 3 13:41:42 2007 @@ -23,8 +23,8 @@ using std::string; InstallFile::InstallFile ( const Project& project_, - const XMLElement& installfileNode, - const string& path ) + const XMLElement& installfileNode, + const string& path ) : project ( project_ ), node ( installfileNode ) { @@ -40,7 +40,24 @@ else newname = node.value; name = node.value; - this->path = path; + + att = node.GetAttribute ( "root", false ); + if ( att != NULL) + { + if ( att->value == "intermediate" ) + this->path = Environment::GetIntermediatePath () + sSep + path; + else if ( att->value == "output" ) + this->path = Environment::GetOutputPath () + sSep + path; + else + { + throw InvalidAttributeValueException ( + node.location, + "root", + att->value ); + } + } + else + this->path = path; } InstallFile::~InstallFile () Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgener… ============================================================================== --- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Fri Aug 3 13:41:42 2007 @@ -39,7 +39,7 @@ unsigned long errorLine; string syssetupTemplate = "media" + sSep + "inf" + sSep + "syssetup.inf.tpl"; - string syssetup = "media" + sSep + "inf" + sSep + "syssetup.inf"; + string syssetup = Environment::GetIntermediatePath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf"; if ( 0 != InfHostOpenFile ( &inf, syssetupTemplate.c_str (), &errorLine ) ) throw new FileNotFoundException ( syssetupTemplate );

17 years, 4 months

[dreimer] 28117: - Rename test to its real and final name. - Add it to help, Changelog and Macros. - Simplify reladdr2line. - Get rid of Temp File use in ssvn.cmd and Rosbe.cmd.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Aug 3 13:34:37 2007 New Revision: 28117 URL: http://svn.reactos.org/svn/reactos?rev=28117&view=rev Log: - Rename test to its real and final name. - Add it to help, Changelog and Macros. - Simplify reladdr2line. - Get rid of Temp File use in ssvn.cmd and Rosbe.cmd. Added: trunk/tools/RosBE-Windows/Root/scut.cmd Removed: trunk/tools/RosBE-Windows/Root/test.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Fri Aug 3 13:34:37 2007 @@ -1,6 +1,7 @@ *** Oct XXth, 2007 - RosBE 0.3.8 Released - Added DrFred's Config Tool. (Daniel Reimer) +- Added ShortCut Tool (Daniel Reimer) *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Aug 3 13:34:37 2007 @@ -26,6 +26,8 @@ echo with the appropriate number. echo basedir - Switch back to the ReactOS source directory. echo. + echo scut - Define, Remove and Switch to Shortcutted Source- + echo Directories. echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. echo clean [logs] - Fully clean the ReactOS source directory and/or @@ -108,6 +110,16 @@ echo Switches back to the ReactOS source directory. goto :EOF ) +if "%1" == "scut" ( + echo Usage: scut [OPTIONS] + echo Defines, Removes and Switches to Shortcutted Source Directories. + echo. + echo add - Adds a Shortcut. + echo (Optional: "Shortcut" "Directory" as second and third parameter) + echo remove - Removes a shortcut. + echo (Optional: "Shortcut" as second parameter) + goto :EOF +) if not "%1" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :EOF 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 Aug 3 13:34:37 2007 @@ -17,9 +17,7 @@ color 0A set _VER=0.3.7.2 set ROSBEBASEDIR=%~dp0 -echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed "s/.$//g" > "%Temp%\aaa.tmp" -set /P ROSBEBASEDIR=< "%Temp%\aaa.tmp" -del "%Temp%\aaa.tmp" +for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 set _LOGDIR=%CD%\RosBE-Logs Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Fri Aug 3 13:34:37 2007 @@ -6,3 +6,4 @@ MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* RADDR2LINE = "%ROSBEBASEDIR%\reladdr2line.cmd" $* +SCUT = "%ROSBEBASEDIR%\scut.cmd" $* Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Fri Aug 3 13:34:37 2007 @@ -14,16 +14,16 @@ :: :: Receive the Parameters and decide what to do. :: -set _1=%1 -set _2=%2 -if "%_1%" == "" ( +if "%1" == "" ( goto :MAN ) -if not "%_1%" == "" ( - if "%_2%" == "" ( +if not "%1" == "" ( + set _1=%1 + if "%2" == "" ( goto :AUTO1 ) else ( + set _2=%2 goto :EOC ) ) @@ -34,16 +34,9 @@ :MAN echo Set the Path to the Executable to be examined. SET /P _1= +:AUTO1 echo Set the Address you wanna analyze inside the Executable. SET /P _2= -echo. -goto :EOC - -:AUTO1 -echo Set the Address you wanna analyze inside the Executable. -echo. -SET /P _2= -goto :EOC :EOC :: Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Fri Aug 3 13:34:37 2007 @@ -57,8 +57,7 @@ if "%1" == "status" ( title Status for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i - svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp" - set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp" + for /f "usebackq" %%j IN (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) DO @set ONSVN=%%j call :UP goto :ExitSVN ) @@ -71,7 +70,6 @@ :UP echo Recent Offline Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% -del "%ROSBEBASEDIR%\onsvn.tmp" echo. if %OFFSVN% LSS %ONSVN% ( echo Your Tree is not Up to date. Do you want to update it? Added: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (added) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Fri Aug 3 13:34:37 2007 @@ -1,0 +1,79 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/scut.cmd +:: PURPOSE: Shortcut Creator, Remover and Switcher. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title Choose your Source Folder... + +if /I "%1"=="" ( + goto :DEF +) +if /I "%1"=="add" ( + goto :ADD +) +if /I "%1"=="remove" ( + goto :REM +) +) else ( + set XY=%1 + goto :RUN +) +goto :END + +:DEF +echo Choose your Source Folder: +SET /P XY= +goto :RUN + +:RUN +for /f "usebackq" %%i in (`"grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir"`) do @SET dir=%%i +cd /D %dir% +goto :END + +:ADD +if not "%2" == "" ( + if not "%3" == "" ( + set CUT=%2 + set DIR=%3 + goto :ADD23 + ) else ( + set CUT=%2 + goto :ADD2 + ) +) else ( + goto :ADD1 +) + +:ADD1 +echo Choose your Shortcut: +SET /P CUT= +:ADD2 +echo Choose your Source Folder: +SET /P DIR= +:ADD23 +echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp" +copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml" +del "%ROSBEBASEDIR%\srclist.xml" +ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +goto :END + +:REM +if not "%2" == "" ( + set CUTREM=%2 + goto :REM1 +) +echo Choose your Shortcut: +SET /P CUTREM= +:REM1 +grep -v \"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" +del "%ROSBEBASEDIR%\srclist.xml" +ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +goto :END + +:END +title ReactOS Build Environment %_VER% Removed: trunk/tools/RosBE-Windows/Root/test.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/test.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/test.cmd (original) +++ trunk/tools/RosBE-Windows/Root/test.cmd (removed) @@ -1,60 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See COPYING in the top level directory -:: FILE: Root/test.cmd -:: PURPOSE: First step in the direction of a Multiple Source Tree "Compatible" RosBE. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -title Choose your Source Folder... - -if /I "%1"=="" ( - goto :DEF -) -if /I "%1"=="add" ( - goto :ADD -) -if /I "%1"=="remove" ( - goto :REM -) -) else ( - set XY=%1 - goto :RUN -) -goto :END - -:DEF -echo Choose your Source Folder: -SET /P XY= -goto :RUN - -:RUN -grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" -set /P dir=< "%ROSBEBASEDIR%\aaa.tmp" -del "%ROSBEBASEDIR%\aaa.tmp" -cd /D %dir% -goto :END - -:ADD -echo Choose your Shortcut: -SET /P CUT= -echo Choose your Source Folder: -SET /P DIR= -echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp" -copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml" -del "%ROSBEBASEDIR%\srclist.xml" -ren "%ROSBEBASEDIR%\srclist2.xml" "srclist.xml" -goto :END - -:REM -echo Choose your Shortcut: -SET /P CUTREM= -grep -v \"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" -del "%ROSBEBASEDIR%\srclist.xml" -ren "%ROSBEBASEDIR%\srclist2.xml" "srclist.xml" -goto :END - -:END -title ReactOS Build Environment %_VER%

17 years, 4 months

← Newer
1
...
58
59
60
61
62
63
64
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007