Author: tkreuzer Date: Wed Mar 24 00:45:57 2010 New Revision: 46375
URL: http://svn.reactos.org/svn/reactos?rev=46375&view=rev Log: Merge trunk HEAD (r46369) (part 1/x)
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/dependencymap/dependencymap.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rule.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msbuild/msbuild.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/msvc.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/versionreport/versionreport.h branches/ros-amd64-bringup/reactos/tools/rbuild/exception.h branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h branches/ros-amd64-bringup/reactos/tools/rbuild/test.h
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/backend.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __BACKEND_H -#define __BACKEND_H + +#pragma once
#include "../rbuild.h"
@@ -75,5 +75,3 @@ Project& ProjectNode; Configuration& configuration; }; - -#endif /* __BACKEND_H */
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/codeblocks/codeblocks.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __CODEBLOCKS_H__ -#define __CODEBLOCKS_H__ + +#pragma once
#include <fstream> #include <vector> @@ -98,7 +98,3 @@ bool _copy_file ( const std::string& inputname, const std::string& targetname ) const; const Property* _lookup_property ( const Module& module, const std::string& name ) const; }; - - -#endif // __MSVC_H__ -
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/dependencymap/dependencymap.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/dependencymap/dependencymap.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/dependencymap/dependencymap.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __DEPMAP_H__ -#define __DEPMAP_H__ + +#pragma once
#include <fstream> #include <vector> @@ -62,7 +62,3 @@ };
}; - - -#endif // __DEPMAP_H__ -
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -17,7 +17,7 @@ BUILTIN_CXXFLAGS+= -fno-optimize-sibling-calls
# Add -fno-set-stack-executable required for x86/MinGW -ifneq (,$(filter $(ARCH), i386)) +ifneq (,$(filter $(ARCH),amd64 i386)) BUILTIN_CFLAGS+= -fno-set-stack-executable BUILTIN_CXXFLAGS+= -fno-set-stack-executable endif @@ -129,7 +129,7 @@
${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch: $(2) ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch.d $(3) | ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1) $$(ECHO_PCH) - $${gcc} -MF $$@ ${call RBUILD_cflags,$(1),$(4)} -x c-header -M -MP -MT $$@ $$< + $${gcc} -o $$@ ${call RBUILD_cflags,$(1),$(4)} -x c-header $$<
else
@@ -156,7 +156,7 @@
${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch: $(2) ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1)$$(SEP)$(notdir $(2)).gch.d $(3) | ${call RBUILD_intermediate_dir,$(2)}$$(SEP).gch_$(1) $$(ECHO_PCH) - $${gpp} -MF $$@ ${call RBUILD_cxxflags,$(1),$(4)} -x c++-header -M -MP -MT $$@ $$< + $${gpp} -o $$@ ${call RBUILD_cxxflags,$(1),$(4)} -x c++-header $$<
else
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -487,8 +487,11 @@ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile );
fprintf ( fMakefile, "PROJECT_CCLIBS := "$(shell ${TARGET_CC} -print-libgcc-file-name)"\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := "$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)" "$(shell ${TARGET_CPP} -print-libgcc-file-name)" "$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)" "$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)" " ); - + + // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a". + // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources. + fprintf ( fMakefile, "PROJECT_CXXLIBS := "$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)" "$(shell ${TARGET_CPP} -print-libgcc-file-name)" "$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)" "$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)" "$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)" "$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)"\n" ); + /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64") fprintf ( fMakefile, " "$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)"" );
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MINGW_H -#define MINGW_H + +#pragma once
#include "../backend.h"
@@ -150,5 +150,3 @@ };
extern const struct ModuleHandlerInformations ModuleHandlerInformations[]; - -#endif /* MINGW_H */
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MINGW_MODULEHANDLER_H -#define MINGW_MODULEHANDLER_H + +#pragma once
#include "../backend.h" #include "mingw.h" @@ -370,5 +370,3 @@ MingwElfExecutableModuleHandler ( const Module& module ); virtual void Process (); }; - -#endif /* MINGW_MODULEHANDLER_H */
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rule.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rule.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rule.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -16,8 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
-#ifndef MINGW_RULE_H -#define MINGW_RULE_H +#pragma once
#include "mingw.h"
@@ -46,5 +45,3 @@ const std::string command; string_list generatedFiles; }; - -#endif
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msbuild/msbuild.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msbuild/msbuild.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msbuild/msbuild.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MSBUILD_H__ -#define __MSBUILD_H__ + +#pragma once
#include <fstream> #include <vector> @@ -66,7 +66,3 @@ };
}; - - -#endif // __MsBuild_H__ -
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/msvc.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/msvc/msvc.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -16,8 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __MSVC_H__ -#define __MSVC_H__ + +#pragma once
#include <fstream> #include <vector> @@ -253,4 +253,3 @@ void _generate_footer();
}; -#endif // __MSVC_H__
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/versionreport/versionreport.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/versionreport/versionreport.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/versionreport/versionreport.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __VREPORT_H__ -#define __VREPORT_H__ + +#pragma once
#include <fstream> #include <vector> @@ -63,6 +63,3 @@ };
}; - - -#endif // __VREPORT_H__
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/exception.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/exception.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/exception.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __EXCEPTION_H -#define __EXCEPTION_H + +#pragma once
#include "pch.h" #include "xml.h" @@ -144,5 +144,3 @@ std::string BuildTool; std::string Version; }; - -#endif /* __EXCEPTION_H */
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/pch.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef PCH_H -#define PCH_H + +#pragma once
#ifdef _MSC_VER #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information @@ -79,5 +79,3 @@ #define MAX_PATH PATH_MAX #define _MAX_PATH PATH_MAX #endif - -#endif//PCH_H
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __RBUILD_H -#define __RBUILD_H + +#pragma once
#include "pch.h"
@@ -1098,5 +1098,3 @@
extern std::string ToLower ( std::string filename ); - -#endif /* __RBUILD_H */
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/... ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/test.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/test.h [iso-8859-1] Wed Mar 24 00:45:57 2010 @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TEST_H -#define __TEST_H + +#pragma once
#include "rbuild.h" #include "backend/mingw/mingw.h" @@ -160,5 +160,3 @@ public: void Run (); }; - -#endif /* __TEST_H */
-
tkreuzer＠svn.reactos.org