From 8ebc3f17961ef6a0cf708cc6bdca948d77817ee0 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Mon, 21 Dec 2009 18:59:32 +0000
Subject: Wow, it's much more general now, I like that.

---
 default.bld                         | 16 ++------
 share/autoinclude/general-rules.bld | 80 ++++++++++++++++++++++++++++++++-----
 src/action.cpp                      | 25 ++++++++++++
 src/action.h                        |  1 +
 src/context.cpp                     |  4 ++
 5 files changed, 103 insertions(+), 23 deletions(-)

diff --git a/default.bld b/default.bld
index de31b78..19b66bf 100644
--- a/default.bld
+++ b/default.bld
@@ -5,6 +5,8 @@
 
 CXXFLAGS += "-ggdb -W -Wall";
 
+CC = CXX; // We actually want to use c++ to compile our c files.
+
 action "default"
 {
 	build: "build";
@@ -49,6 +51,7 @@ target "build"
 	rule "exe";
 	LDFLAGS += "-Llibbu++ -lbu++ -ldl";
 	CXXFLAGS += "-Ilibbu++";
+	CFLAGS = CXXFLAGS;
 	tag "tools";
 }
 
@@ -74,19 +77,6 @@ target "build-r$(svnversion "-n").tar.bz2"
 	tag "pkg";
 }
 
-// We want to override the c rule, and just use c++ for it
-rule "c"
-{
-	input "*.c";
-	output replace(".c", ".o");
-	tag "auto-source";
-	requires getMakeDeps("g++ ${CXXFLAGS} -M ${INPUT}");	
-	profile "build"
-	{
-		execute("g++ ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}");
-	}
-}
-
 rule "tarball"
 {
 	input matches("*.cpp", "*.h", "*.c", "*.y", "*.l", "*.conf", "Doxyfile",
diff --git a/share/autoinclude/general-rules.bld b/share/autoinclude/general-rules.bld
index 16217e0..46720c6 100644
--- a/share/autoinclude/general-rules.bld
+++ b/share/autoinclude/general-rules.bld
@@ -1,10 +1,68 @@
+//
+// Really, variables here should default to something that's platform dependant,
+// but for now, we use linux, I'll default them to gnu/linux
+//
+
+
+if CXX == null then
+{
+	CXX = "g++";
+}
+
+if AR == null then
+{
+	AR = "ar";
+}
+
+if CC == null then
+{
+	CC = "cc";
+}
+
+if BISON == null then
+{
+	BISON = "bison";
+}
+
+if FLEX == null then
+{
+	FLEX = "flex";
+}
+
+function cppToObj()
+{
+	if OBJ_DIR == null then
+	{
+		DIR = INPUT.dirName();
+	}
+	else
+	{
+		DIR = OBJ_DIR;
+	}
+
+	return DIR + "/" + INPUT.fileName().replace(".cpp", ".o");
+}
+
+function cToObj()
+{
+	if OBJ_DIR == null then
+	{
+		DIR = INPUT.dirName();
+	}
+	else
+	{
+		DIR = OBJ_DIR;
+	}
+
+	return DIR + "/" + INPUT.fileName().replace(".c", ".o");
+}
 
 rule "exe"
 {
 	input "*.o";
 	profile "build"
 	{
-		execute("g++ -o ${OUTPUT} ${INPUT} ${LDFLAGS}");
+		execute("${CXX} -o ${OUTPUT} ${INPUT} ${LDFLAGS}");
 	}
 }
 
@@ -13,18 +71,19 @@ rule "lib"
 	input "*.o";
 	profile "build"
 	{
-		execute("ar cr ${OUTPUT} ${INPUT}");
+		execute("${AR} cr ${OUTPUT} ${INPUT}");
 	}
 }
 
 rule "cpp"
 {
 	input "*.cpp";
-	output replace(".cpp", ".o");
-	requires getMakeDeps("g++ ${CXXFLAGS} -M ${INPUT}");
+	output cppToObj();
+//	output replace(".cpp", ".o");
+	requires getMakeDeps("${CXX} ${CXXFLAGS} -M ${INPUT}");
 	profile "build"
 	{
-		execute("g++ ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}", "g++");
+		execute("${CXX} ${CXXFLAGS} -c -o ${OUTPUT} ${INPUT}", "g++");
 	}
 }
 
@@ -32,11 +91,12 @@ rule "cpp"
 rule "c"
 {
 	input "*.c";
-	output replace(".c", ".o");
-	requires getMakeDeps("gcc ${CXXFLAGS} -M ${INPUT}");
+	output cToObj();
+//	output replace(".c", ".o");
+	requires getMakeDeps("${CC} ${CFLAGS} -M ${INPUT}");
 	profile "build"
 	{
-		execute("gcc ${CFLAGS} -c -o ${OUTPUT} ${INPUT}");
+		execute("${CC} ${CFLAGS} -c -o ${OUTPUT} ${INPUT}");
 	}
 }
 
@@ -47,7 +107,7 @@ rule "bison"
 	profile "build"
 	{
 		BASE = INPUT.replace(".y", "");
-		execute("bison -b${BASE} ${INPUT}");
+		execute("${BISON} -b${BASE} ${INPUT}");
 		// if you add a -v bison will produce a .output file
 	}
 }
@@ -59,6 +119,6 @@ rule "flex"
 	output replace(".l", ".yy.h");
 	profile "build"
 	{
-		execute("flex ${FLEXFLAGS} ${INPUT}");
+		execute("${FLEX} ${FLEXFLAGS} ${INPUT}");
 	}
 }
diff --git a/src/action.cpp b/src/action.cpp
index 23c24cd..8b10641 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -80,6 +80,31 @@ Action *Action::genDefaultClean()
 	return pRet;
 }
 
+Action *Action::genDefaultCleanAll()
+{
+	Ast *pAst = new Ast();
+	pAst->addNode( AstNode::typeActionDef );
+		pAst->openBranch();
+			pAst->addNode( AstNode::typeString, "clean-all" );
+		pAst->openBranch();
+			pAst->addNode( AstNode::typeProcessTarget );
+				pAst->openBranch();
+					pAst->addNode( AstNode::typeString, "clean" );
+				pAst->openBranch();
+					pAst->addNode( AstNode::typeFunction );
+						pAst->openBranch();
+							pAst->addNode( AstNode::typeString, "targets" );
+					pAst->closeNode();
+			pAst->closeNode();
+	pAst->closeNode();
+	Action *pRet = new Action(
+		dynamic_cast<const AstBranch *>( *pAst->getNodeBegin() )
+		);
+	pRet->pAst = pAst;
+
+	return pRet;
+}
+
 Action *Action::genDefaultDefault()
 {
 	Ast *pAst = new Ast();
diff --git a/src/action.h b/src/action.h
index 520f2f1..7f60095 100644
--- a/src/action.h
+++ b/src/action.h
@@ -15,6 +15,7 @@ public:
 
 	static Action *genDefaultAll();
 	static Action *genDefaultClean();
+	static Action *genDefaultCleanAll();
 	static Action *genDefaultDefault();
 
 private:
diff --git a/src/context.cpp b/src/context.cpp
index c257a75..bc48def 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -438,6 +438,10 @@ void Context::genDefaultActions()
 	{
 		addAction( Action::genDefaultClean() );
 	}
+	if( !hAction.has("clean-all") )
+	{
+		addAction( Action::genDefaultCleanAll() );
+	}
 	if( !hAction.has("default") )
 	{
 		addAction( Action::genDefaultDefault() );
-- 
cgit v1.2.3