Author: cwittich Date: Sat May 15 22:37:24 2010 New Revision: 47227
URL: http://svn.reactos.org/svn/reactos?rev=47227&view=rev Log: [RBUILD] delete outdated codeblocks backend (codeblocks does not support all features needed to build ros)
See issue #5381 for more details.
Removed: trunk/reactos/tools/rbuild/backend/codeblocks/ Modified: trunk/reactos/Makefile trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rbuild/rbuild.vcproj
Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=47227&r1=4... ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sat May 15 22:37:24 2010 @@ -472,11 +472,6 @@ $(ECHO_RGENSTAT) $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
-.PHONY: cb -cb: $(ROS_BUILDENGINE) - $(ECHO_RBUILD) - $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb - .PHONY: msbuild msbuild: $(ROS_BUILDENGINE) $(ECHO_RBUILD)
Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg.... ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat May 15 22:37:24 2010 @@ -4841,15 +4841,7 @@ return RtlNtStatusToDosError(Status); }
- if (lpValueName != NULL) - { - RtlInitUnicodeString(&ValueName, - lpValueName); - } - else - { - RtlInitUnicodeString(&ValueName, L""); - } + RtlInitUnicodeString(&ValueName, lpValueName); pValueName = &ValueName;
if (is_string(dwType) && (cbData != 0))
Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?rev... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] Sat May 15 22:37:24 2010 @@ -84,24 +84,6 @@ ${mkdir} $@ endif
-RBUILD_CODEBLOCKS_BASE = $(RBUILD_BACKEND_BASE_)codeblocks -RBUILD_CODEBLOCKS_BASE_ = $(RBUILD_CODEBLOCKS_BASE)$(SEP) -RBUILD_CODEBLOCKS_INT = $(INTERMEDIATE_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_INT_ = $(RBUILD_CODEBLOCKS_INT)$(SEP) -RBUILD_CODEBLOCKS_OUT = $(OUTPUT_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_OUT_ = $(RBUILD_CODEBLOCKS_OUT)$(SEP) - -$(RBUILD_CODEBLOCKS_INT): | $(RBUILD_BACKEND_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_CODEBLOCKS_OUT): | $(RBUILD_BACKEND_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - - RBUILD_MSBUILD_BASE = $(RBUILD_BACKEND_BASE_)msbuild RBUILD_MSBUILD_BASE_ = $(RBUILD_MSBUILD_BASE)$(SEP) RBUILD_MSBUILD_INT = $(INTERMEDIATE_)$(RBUILD_MSBUILD_BASE) @@ -184,10 +166,6 @@ mstools_detection.cpp \ proxymakefile.cpp \ rule.cpp \ - ) - -RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES = $(addprefix $(RBUILD_CODEBLOCKS_BASE_), \ - codeblocks.cpp \ )
RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \ @@ -215,7 +193,6 @@ RBUILD_BACKEND_SOURCES = \ $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ - $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ $(RBUILD_BACKEND_VREPORT_BASE_SOURCES) \ $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ @@ -257,9 +234,6 @@ RBUILD_BACKEND_MSVCCPP_HEADERS = \ msvc.h
-RBUILD_BACKEND_CODEBLOCKS_HEADERS = \ - codeblocks.h - RBUILD_BACKEND_DEPMAP_HEADERS = \ dependencymap.h
@@ -278,7 +252,6 @@ backend.h \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ - $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ $(addprefix msbuild$(SEP), $(RBUILD_BACKEND_MSBUILD_HEADERS)) \ $(addprefix versionreport$(SEP), $(RBUILD_BACKEND_VREPORT_HEADERS)) \ $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) @@ -470,10 +443,6 @@ $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-$(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) - $(ECHO_HOSTCC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - $(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj?... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Sat May 15 22:37:24 2010 @@ -444,18 +444,6 @@ </File> </Filter> <Filter - Name="codeblocks" - > - <File - RelativePath=".\backend\codeblocks\codeblocks.cpp" - > - </File> - <File - RelativePath=".\backend\codeblocks\codeblocks.h" - > - </File> - </Filter> - <Filter Name="dependencymap" > <File