[ros-diffs] [gadamopoulos] 49097: really fix the branch now

Author: gadamopoulos
Date: Sun Oct 10 14:49:45 2010
New Revision: 49097

URL: http://svn.reactos.org/svn/reactos?rev=49097&view=rev
Log:
really fix the branch now

Added:
    branches/Tree-restructure-test/sdk/include/crt/
      - copied from r48976, trunk/reactos/include/crt/
    branches/Tree-restructure-test/sdk/include/host/
      - copied from r48976, trunk/reactos/include/host/
    branches/Tree-restructure-test/sdk/include/psdk/
      - copied from r48976, trunk/reactos/include/psdk/
    branches/Tree-restructure-test/sdk/include/reactos/
      - copied from r48976, trunk/reactos/include/reactos/
    branches/Tree-restructure-test/sdk/libs/atl/
      - copied from r48976, trunk/reactos/lib/atl/
    branches/Tree-restructure-test/sdk/libs/cmlib/
      - copied from r48976, trunk/reactos/lib/cmlib/
    branches/Tree-restructure-test/sdk/libs/debugsup/
      - copied from r48976, trunk/reactos/lib/debugsup/
    branches/Tree-restructure-test/sdk/libs/libxml2/
      - copied from r48976, trunk/reactos/lib/3rdparty/libxml2/
    branches/Tree-restructure-test/sdk/libs/mingw/
      - copied from r48976, trunk/reactos/lib/3rdparty/mingw/
    branches/Tree-restructure-test/sdk/libs/pseh/
      - copied from r48976, trunk/reactos/lib/pseh/
    branches/Tree-restructure-test/sdk/libs/rossym/
      - copied from r48976, trunk/reactos/lib/rossym/
    branches/Tree-restructure-test/sdk/libs/wcsfuncs/
      - copied from r48976, trunk/reactos/lib/host/wcsfuncs/
    branches/Tree-restructure-test/sdk/libs/zlib/
      - copied from r48976, trunk/reactos/lib/3rdparty/zlib/
    branches/Tree-restructure-test/sdk/tools/buildno/
      - copied from r48976, trunk/reactos/tools/buildno/
    branches/Tree-restructure-test/sdk/tools/cabman/
      - copied from r48976, trunk/reactos/tools/cabman/
    branches/Tree-restructure-test/sdk/tools/cdmake/
      - copied from r48976, trunk/reactos/tools/cdmake/
    branches/Tree-restructure-test/sdk/tools/create_nls/
      - copied from r48976, trunk/reactos/tools/create_nls/
    branches/Tree-restructure-test/sdk/tools/gendib/
      - copied from r48976, trunk/reactos/tools/gendib/
    branches/Tree-restructure-test/sdk/tools/geninc/
      - copied from r48976, trunk/reactos/tools/geninc/
    branches/Tree-restructure-test/sdk/tools/hpp/
      - copied from r48976, trunk/reactos/tools/hpp/
    branches/Tree-restructure-test/sdk/tools/kbdtool/
      - copied from r48976, trunk/reactos/tools/kbdtool/
    branches/Tree-restructure-test/sdk/tools/log2lines/
      - copied from r48976, trunk/reactos/tools/log2lines/
    branches/Tree-restructure-test/sdk/tools/mkhive/
      - copied from r48976, trunk/reactos/tools/mkhive/
    branches/Tree-restructure-test/sdk/tools/ms2ps/
      - copied from r48976, trunk/reactos/tools/ms2ps/
    branches/Tree-restructure-test/sdk/tools/nandflash/
      - copied from r48976, trunk/reactos/tools/nandflash/
    branches/Tree-restructure-test/sdk/tools/nci/
      - copied from r48976, trunk/reactos/tools/nci/
    branches/Tree-restructure-test/sdk/tools/ofw_interface/
      - copied from r48976, trunk/reactos/tools/ofw_interface/
    branches/Tree-restructure-test/sdk/tools/pipetools/
      - copied from r48976, trunk/reactos/tools/pipetools/
    branches/Tree-restructure-test/sdk/tools/rbuild/
      - copied from r48976, trunk/reactos/tools/rbuild/
    branches/Tree-restructure-test/sdk/tools/rbuild_helper/
      - copied from r48976, trunk/reactos/tools/rbuild_helper/
    branches/Tree-restructure-test/sdk/tools/regtests2xml/
      - copied from r48976, trunk/reactos/tools/regtests2xml/
    branches/Tree-restructure-test/sdk/tools/rgenstat/
      - copied from r48976, trunk/reactos/tools/rgenstat/
    branches/Tree-restructure-test/sdk/tools/rsym/
      - copied from r48976, trunk/reactos/tools/rsym/
    branches/Tree-restructure-test/sdk/tools/sysgen/
      - copied from r48976, trunk/reactos/tools/sysgen/
    branches/Tree-restructure-test/sdk/tools/unicode/
      - copied from r48976, trunk/reactos/tools/unicode/
    branches/Tree-restructure-test/sdk/tools/utf16le/
      - copied from r48976, trunk/reactos/tools/utf16le/
    branches/Tree-restructure-test/sdk/tools/widl/
      - copied from r48976, trunk/reactos/tools/widl/
    branches/Tree-restructure-test/sdk/tools/winebuild/
      - copied from r48976, trunk/reactos/tools/winebuild/
    branches/Tree-restructure-test/sdk/tools/wmc/
      - copied from r48976, trunk/reactos/tools/wmc/
    branches/Tree-restructure-test/sdk/tools/wpp/
      - copied from r48976, trunk/reactos/tools/wpp/
    branches/Tree-restructure-test/sdk/tools/wrc/
      - copied from r48976, trunk/reactos/tools/wrc/
Modified:
    branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak
    branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp
    branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h
    branches/Tree-restructure-test/sdk/tools/rbuild/test.h

Modified: branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools…
==============================================================================
--- branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] (original)
+++ branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] Sun Oct 10
14:49:45 2010
@@ -25,11 +25,11 @@
 BUILDNO_OBJECTS = \
 	$(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o))
 
-BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS)
+BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Isdk/include/reactos $(TOOLS_CPPFLAGS)
 
 BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS)
 
-BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h
+BUILDNO_VERSION = sdk$(SEP)include$(SEP)reactos$(SEP)version.h
 
 .PHONY: buildno
 buildno: $(BUILDNO_TARGET)
@@ -52,6 +52,6 @@
 #.PHONY: $(BUILDNO_TARGET)
 
 $(BUILDNO_H): $(BUILDNO_TARGET)
-	${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL)
+	${mkdir} $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos 2>$(NUL)
 	$(ECHO_BUILDNO)
 	$(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H)

Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools…
==============================================================================
--- branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1]
(original)
+++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1]
Sun Oct 10 14:49:45 2010
@@ -358,13 +358,13 @@
 	GenerateGlobalVariables ();
 	GenerateXmlBuildFilesMacro ();
 	ProcessModules ();
-	GenerateInstallTarget ();
-	GenerateTestTarget ();
+//	GenerateInstallTarget ();
+//	GenerateTestTarget ();
 	GenerateDirectoryTargets ();
 	GenerateDirectories ();
-	GenerateTestSupportCode ();
+//	GenerateTestSupportCode ();
 	GenerateCompilationUnitSupportCode ();
-	GenerateSysSetup ();
+//	GenerateSysSetup ();
 	GenerateProxyMakefiles ();
 	CheckAutomaticDependencies ();
 	CloseMakefile ();
@@ -429,9 +429,9 @@
 void
 MingwBackend::GenerateGlobalVariables () const
 {
-	fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n",
fMakefile );
-	fprintf ( fMakefile, "include
tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n",
ProjectNode.GetLinkerSet ().c_str () );
-	fprintf ( fMakefile, "include
tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n",
ProjectNode.GetCompilerSet ().c_str () );
+	fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)rules.mak\n",
RBUILD_BASE );
+	fprintf ( fMakefile, "include
%sbackend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", RBUILD_BASE,
ProjectNode.GetLinkerSet ().c_str () );
+	fprintf ( fMakefile, "include
%sbackend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", RBUILD_BASE,
ProjectNode.GetCompilerSet ().c_str () );
 
 	if ( mscPath.length() )
 		fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () );
@@ -1092,8 +1092,8 @@
 	if ( ProjectNode.configuration.Compiler == GnuGcc )
 	{
 		printf ( "Detecting compiler -pipe support..." );
-
-		string pipe_detection = "tools" + sSep + "rbuild" + sSep +
"backend" + sSep + "mingw" + sSep + "pipe_detection.c";
+		string rbuild_base = RBUILD_BASE;
+		string pipe_detection = rbuild_base + "backend" + sSep + "mingw" +
sSep + "pipe_detection.c";
 		string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection,
 																 ".o" );
 		string command = ssprintf (
@@ -1130,7 +1130,8 @@
 
 	if ( configuration.PrecompiledHeadersEnabled &&
ProjectNode.configuration.Compiler == GnuGcc )
 	{
-		string path = "tools" + sSep + "rbuild" + sSep +
"backend" + sSep + "mingw" + sSep + "pch_detection.h";
+		string rbuild_base = RBUILD_BASE;
+		string path = rbuild_base + "backend" + sSep + "mingw" + sSep +
"pch_detection.h";
 		string cmd = ssprintf (
 			"%s -c %s 1>%s 2>%s",
 			FixSeparatorForSystemCommand(compilerCommand).c_str (),

Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools…
==============================================================================
--- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] (original)
+++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 10
14:49:45 2010
@@ -67,6 +67,10 @@
 #define DEF_SSEP "/"
 #define DEF_SBAD_SEP "\\"
 #endif
+
+#define SSEP DEF_SSEP
+#define TOOLS_BASE "sdk" SSEP "tools" SSEP
+#define RBUILD_BASE TOOLS_BASE "rbuild" SSEP
 
 #define MS_VS_DEF_VERSION "9.00"
 

Modified: branches/Tree-restructure-test/sdk/tools/rbuild/test.h
URL:
http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools…
==============================================================================
--- branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] (original)
+++ branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] Sun Oct 10
14:49:45 2010
@@ -20,10 +20,6 @@
 
 #include "rbuild.h"
 #include "backend/mingw/mingw.h"
-
-#define SSEP DEF_SSEP
-
-#define RBUILD_BASE "tools" SSEP "rbuild" SSEP
 
 class BaseTest
 {