[ros-diffs] [hpoussin] 32592: Use a .rbuild file instead of a .make file to describe cdmake compilation

Author: hpoussin
Date: Fri Mar  7 09:15:23 2008
New Revision: 32592

URL: http://svn.reactos.org/svn/reactos?rev=3D32592&view=3Drev
Log:
Use a .rbuild file instead of a .make file to describe cdmake compilation

Added:
    trunk/reactos/tools/cdmake/cdmake.rbuild   (with props)
    trunk/reactos/tools/tools.rbuild   (with props)
Removed:
    trunk/reactos/tools/cdmake/cdmake.mak
Modified:
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/tools/rbuild/directory.cpp
    trunk/reactos/tools/tools.mak

Modified: trunk/reactos/ReactOS-generic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuil=
d?rev=3D32592&r1=3D32591&r2=3D32592&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/ReactOS-generic.rbuild (original)
+++ trunk/reactos/ReactOS-generic.rbuild Fri Mar  7 09:15:23 2008
@@ -63,5 +63,8 @@
 	<directory name=3D"subsystems">
 		<xi:include href=3D"subsystems/subsystems.rbuild" />
 	</directory>
+	<directory name=3D"tools">
+		<xi:include href=3D"tools/tools.rbuild" />
+	</directory>
 =

 </group>

Removed: trunk/reactos/tools/cdmake/cdmake.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.m=
ak?rev=3D32591&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/cdmake/cdmake.mak (original)
+++ trunk/reactos/tools/cdmake/cdmake.mak (removed)
@@ -1,51 +1,0 @@
-CDMAKE_BASE =3D $(TOOLS_BASE_)cdmake
-CDMAKE_BASE_ =3D $(CDMAKE_BASE)$(SEP)
-CDMAKE_INT =3D $(INTERMEDIATE_)$(CDMAKE_BASE)
-CDMAKE_INT_ =3D $(CDMAKE_INT)$(SEP)
-CDMAKE_OUT =3D $(OUTPUT_)$(CDMAKE_BASE)
-CDMAKE_OUT_ =3D $(CDMAKE_OUT)$(SEP)
-
-$(CDMAKE_INT): | $(TOOLS_INT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-
-ifneq ($(INTERMEDIATE),$(OUTPUT))
-$(CDMAKE_OUT): | $(TOOLS_OUT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-endif
-
-CDMAKE_TARGET =3D \
-	$(CDMAKE_OUT_)cdmake$(EXEPOSTFIX)
-
-CDMAKE_SOURCES =3D $(addprefix $(CDMAKE_BASE_), \
-	cdmake.c \
-	llmosrt.c \
-	)
-
-CDMAKE_OBJECTS =3D \
-	$(addprefix $(INTERMEDIATE_), $(CDMAKE_SOURCES:.c=3D.o))
-
-CDMAKE_HOST_CFLAGS =3D -Iinclude $(TOOLS_CFLAGS)
-
-CDMAKE_HOST_LFLAGS =3D $(TOOLS_LFLAGS)
-
-.PHONY: cdmake
-cdmake: $(CDMAKE_TARGET)
-
-$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) | $(CDMAKE_OUT)
-	$(ECHO_LD)
-	${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $@
-
-$(CDMAKE_INT_)cdmake.o: $(CDMAKE_BASE_)cdmake.c | $(CDMAKE_INT)
-	$(ECHO_CC)
-	${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@
-
-$(CDMAKE_INT_)llmosrt.o: $(CDMAKE_BASE_)llmosrt.c | $(CDMAKE_INT)
-	$(ECHO_CC)
-	${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@
-
-.PHONY: cdmake_clean
-cdmake_clean:
-	-@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL)
-clean: cdmake_clean

Added: trunk/reactos/tools/cdmake/cdmake.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.r=
build?rev=3D32592&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/cdmake/cdmake.rbuild (added)
+++ trunk/reactos/tools/cdmake/cdmake.rbuild Fri Mar  7 09:15:23 2008
@@ -1,0 +1,6 @@
+<?xml version=3D"1.0"?>
+<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
+<module name=3D"cdmake" type=3D"buildtool">
+	<file>cdmake.c</file>
+	<file>llmosrt.c</file>
+</module>

Propchange: trunk/reactos/tools/cdmake/cdmake.rbuild
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Modified: trunk/reactos/tools/rbuild/directory.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/director=
y.cpp?rev=3D32592&r1=3D32591&r2=3D32592&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/rbuild/directory.cpp (original)
+++ trunk/reactos/tools/rbuild/directory.cpp Fri Mar  7 09:15:23 2008
@@ -211,18 +211,22 @@
 =

 	if ( escapedName.size() > 0 )
 	{
-		fprintf ( f,
-			"%s%c%s: | %s\n",
-			parent.c_str (),
-			cSep,
-			escapedName.c_str (),
-			parent.c_str () );
-
-		fprintf ( f,
-			"\t$(ECHO_MKDIR)\n" );
-
-		fprintf ( f,
-			"\t${mkdir} $@\n" );
+		if ( ! (escapedName =3D=3D "tools" &&
+		     ( parent =3D=3D "$(OUTPUT)" || parent =3D=3D "$(INTERMEDIATE)"
) ) )
+		{
+			fprintf ( f,
+				"%s%c%s: | %s\n",
+				parent.c_str (),
+				cSep,
+				escapedName.c_str (),
+				parent.c_str () );
+
+			fprintf ( f,
+				"\t$(ECHO_MKDIR)\n" );
+
+			fprintf ( f,
+				"\t${mkdir} $@\n" );
+		}
 =

 		path =3D parent + sSep + escapedName;
 	}

Modified: trunk/reactos/tools/tools.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=
=3D32592&r1=3D32591&r2=3D32592&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/tools.mak (original)
+++ trunk/reactos/tools/tools.mak Fri Mar  7 09:15:23 2008
@@ -43,7 +43,6 @@
 include tools/bin2c.mak
 include tools/buildno/buildno.mak
 include tools/cabman/cabman.mak
-include tools/cdmake/cdmake.mak
 include tools/gendib/gendib.mak
 ifeq ($(ARCH),powerpc)
 include tools/ofw_interface/ofw_interface.mak

Added: trunk/reactos/tools/tools.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re=
v=3D32592&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/tools.rbuild (added)
+++ trunk/reactos/tools/tools.rbuild Fri Mar  7 09:15:23 2008
@@ -1,0 +1,7 @@
+<?xml version=3D"1.0"?>
+<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
+<group xmlns:xi=3D"http://www.w3.org/2001/XInclude">
+<directory name=3D"cdmake">
+	<xi:include href=3D"cdmake/cdmake.rbuild" />
+</directory>
+</group>

Propchange: trunk/reactos/tools/tools.rbuild
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native