pch.h can be used as pre-compiled header

svn path=/branches/xmlbuildsystem/; revision=12818

diff --git a/reactos/tools/rbuild/XML.cpp b/reactos/tools/rbuild/XML.cpp
index f3317a2..3935dd3 100644 (file)
--- a/reactos/tools/rbuild/XML.cpp
+++ b/reactos/tools/rbuild/XML.cpp
@@ -1,8 +1,6 @@
 // XML.cpp\r
 \r
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
+#include "pch.h"\r
 \r
 #include <direct.h>\r
 #include <io.h>\r
@@ -51,6 +49,8 @@ filelen ( FILE* f )
 \r
 Path::Path()\r
 {\r
+       if ( !working_directory.size() )\r
+               InitWorkingDirectory();\r
        string s ( working_directory );\r
        const char* p = strtok ( &s[0], "/\\" );\r
        while ( p )\r

diff --git a/reactos/tools/rbuild/XML.h b/reactos/tools/rbuild/XML.h
index f3cbec8..f8fbd54 100644 (file)
--- a/reactos/tools/rbuild/XML.h
+++ b/reactos/tools/rbuild/XML.h
@@ -1,10 +1,9 @@
 // XML.h\r
 \r
-#ifndef __XML_H\r
-#define __XML_H\r
+#ifndef XML_H\r
+#define XML_H\r
 \r
-#include <string>\r
-#include <vector>\r
+#include "pch.h"\r
 \r
 void\r
 InitWorkingDirectory();\r
@@ -80,4 +79,4 @@ XMLParse(XMLFile& f,
          const Path& path,\r
          bool* pend_tag = NULL);\r
 \r
-#endif//__XML_H\r
+#endif//XML_H\r

diff --git a/reactos/tools/rbuild/backend/backend.cpp b/reactos/tools/rbuild/backend/backend.cpp
index 148a5a5..385d0ee 100644 (file)
--- a/reactos/tools/rbuild/backend/backend.cpp
+++ b/reactos/tools/rbuild/backend/backend.cpp
@@ -1,6 +1,5 @@
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
+\r
+#include "../pch.h"\r
 \r
 #include "../Rbuild.h"\r
 #include "backend.h"\r

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index f72f780..1734c1e 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -1,8 +1,6 @@
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
 \r
-//#include <stdlib.h> // mingw proves it's insanity once again\r
+#include "../../pch.h"\r
+\r
 #include "mingw.h"\r
 \r
 MingwBackend::MingwBackend(Project& project)\r

diff --git a/reactos/tools/rbuild/exception.cpp b/reactos/tools/rbuild/exception.cpp
index 3ac9418..8895f0d 100644 (file)
--- a/reactos/tools/rbuild/exception.cpp
+++ b/reactos/tools/rbuild/exception.cpp
@@ -1,8 +1,6 @@
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
 \r
-#include <stdarg.h>\r
+#include "pch.h"\r
+\r
 #include "rbuild.h"\r
 \r
 using std::string;\r

diff --git a/reactos/tools/rbuild/exception.h b/reactos/tools/rbuild/exception.h
index 8adec17..bd6525d 100644 (file)
--- a/reactos/tools/rbuild/exception.h
+++ b/reactos/tools/rbuild/exception.h
@@ -1,7 +1,7 @@
 #ifndef __EXCEPTION_H\r
 #define __EXCEPTION_H\r
 \r
-#include <string>\r
+#include "pch.h"\r
 \r
 class Exception\r
 {\r

diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 29cb0e8..7364314 100644 (file)
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1,8 +1,6 @@
 // module.cpp\r
 \r
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
+#include "pch.h"\r
 \r
 #include "rbuild.h"\r
 \r

diff --git a/reactos/tools/rbuild/pch.h b/reactos/tools/rbuild/pch.h
new file mode 100644 (file)
index 0000000..1274c06
--- /dev/null
+++ b/reactos/tools/rbuild/pch.h
@@ -0,0 +1,15 @@
+// pre-compiled header stuff\r
+\r
+#ifndef PCH_H\r
+#define PCH_H\r
+\r
+#ifdef _MSC_VER\r
+#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
+#endif//_MSC_VER\r
+\r
+#include <string>\r
+#include <vector>\r
+\r
+#include <stdarg.h>\r
+\r
+#endif//PCH_H\r

diff --git a/reactos/tools/rbuild/project.cpp b/reactos/tools/rbuild/project.cpp
index dc56ee9..dfa1a29 100644 (file)
--- a/reactos/tools/rbuild/project.cpp
+++ b/reactos/tools/rbuild/project.cpp
@@ -1,6 +1,5 @@
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
+\r
+#include "pch.h"\r
 \r
 #include "rbuild.h"\r
 \r

diff --git a/reactos/tools/rbuild/rbuild.cpp b/reactos/tools/rbuild/rbuild.cpp
index 722289f..f860498 100644 (file)
--- a/reactos/tools/rbuild/rbuild.cpp
+++ b/reactos/tools/rbuild/rbuild.cpp
@@ -1,12 +1,11 @@
 // rbuild.cpp\r
 \r
-#ifdef _MSC_VER\r
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information\r
-#endif//_MSC_VER\r
+#include "pch.h"\r
 \r
 #include <stdio.h>\r
 #include <io.h>\r
 #include <assert.h>\r
+\r
 #include "rbuild.h"\r
 \r
 using std::string;\r
@@ -15,8 +14,6 @@ using std::vector;
 int\r
 main ( int argc, char** argv )\r
 {\r
-       InitWorkingDirectory();\r
-\r
        try\r
        {\r
                string projectFilename ( "ReactOS.xml" );\r
@@ -31,7 +28,8 @@ main ( int argc, char** argv )
                        printf ( "\t%s in folder: %s\n",\r
                                 m.name.c_str(),\r
                                 m.path.c_str() );\r
-                       printf ( "\txml dependencies:\n\t\tReactOS.xml\n" );\r
+                       printf ( "\txml dependencies:\n\t\t%s\n",\r
+                                projectFilename.c_str() );\r
                        const XMLElement* e = &m.node;\r
                        while ( e )\r
                        {\r

diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index d1d5b93..af0314a 100644 (file)
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -1,8 +1,8 @@
 #ifndef __RBUILD_H\r
 #define __RBUILD_H\r
 \r
-#include <string>\r
-#include <vector>\r
+#include "pch.h"\r
+\r
 #include "ssprintf.h"\r
 #include "exception.h"\r
 #include "XML.h"\r

diff --git a/reactos/tools/rbuild/tests/alltests.cpp b/reactos/tools/rbuild/tests/alltests.cpp
index e4bd899..4698a4c 100644 (file)
--- a/reactos/tools/rbuild/tests/alltests.cpp
+++ b/reactos/tools/rbuild/tests/alltests.cpp
@@ -1,4 +1,6 @@
-#include <stdarg.h>\r
+\r
+#include "pch.h"\r
+\r
 #include "rbuild.h"\r
 #include "test.h"\r
 \r