Splits projects into multiple libs

psde · Jan 17, 2013 · a69be28 · a69be28
1 parent b25ae8d
commit a69be28
Show file tree

Hide file tree

Showing 30 changed files with 345 additions and 246 deletions.
diff --git a/Makefile b/Makefile
@@ -1,36 +1,20 @@
-# Configuration
-BIN = codepeiler
-BINDIR = bin
-SOURCEDIR = src
+NAME = codepeiler
+LIBRARIES = Buffer
 
-# Generic makefile
-SRCS = $(wildcard $(SOURCEDIR)/*.cpp)
-OBJS = $(patsubst $(SOURCEDIR)/%.cpp, $(BINDIR)/%.o, $(SRCS))
-DEPS = $(OBJS:.o=.d)
-CXXFLAGS := #-MM
-RELEASEFLAGS := -O3 -DNDEBUG $(CXXFLAGS)
-DEBUGFLAGS := -O0 -g -DDEBUG -Wall -Wextra -pedantic -ansi $(CXXFLAGS)
-LIBS := 
+BINARIES = $(LIBARIES:%=lib%.a) $(NAME)
+BINPATHS = $(BINARIES:%=bin/%)
+SRCPATHS = $(LIBRARIES:%=src/lib%/) src/$(NAME)/
 
 all: release
 
+.PHONY: release
 release:
- $(MAKE) CXXFLAGS="$(RELEASEFLAGS)" $(BIN)
+ $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) release;)
 
+.PHONY: debug
 debug:
- $(MAKE) CXXFLAGS="$(DEBUGFLAGS)" $(BIN)
-
-#depend: .depend
-#.depend: $(SRCS)
-# $(CXX) $(CXXFLAGS) -MM $^ -MF ./.depend;
-#include .depend
-
-$(BINDIR)/%.o: $(SOURCEDIR)/%.cpp $(INCS)
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(BIN): $(OBJS)
- $(CXX) -o $@ $(OBJS) $(LIBS)
+ $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) release;)
 
 .PHONY: clean
 clean:
- $(RM) $(BIN) $(OBJS) $(DEPS)
+ $(foreach project, $(SRCPATHS), $(MAKE) -C $(project) clean;)
diff --git a/Makefile.old b/Makefile.old
@@ -0,0 +1,36 @@
+# Configuration
+BIN = codepeiler
+BINDIR = bin
+SOURCEDIR = src
+
+# Generic makefile
+SRCS = $(wildcard $(SOURCEDIR)/*.cpp)
+OBJS = $(patsubst $(SOURCEDIR)/%.cpp, $(BINDIR)/%.o, $(SRCS))
+DEPS = $(OBJS:.o=.d)
+CXXFLAGS := #-MM
+RELEASEFLAGS := -O3 -DNDEBUG $(CXXFLAGS)
+DEBUGFLAGS := -O0 -g -DDEBUG -Wall -Wextra -pedantic -ansi $(CXXFLAGS)
+LIBS := 
+
+all: release
+
+release:
+ $(MAKE) CXXFLAGS="$(RELEASEFLAGS)" $(BIN)
+
+debug:
+ $(MAKE) CXXFLAGS="$(DEBUGFLAGS)" $(BIN)
+
+#depend: .depend
+#.depend: $(SRCS)
+# $(CXX) $(CXXFLAGS) -MM $^ -MF ./.depend;
+#include .depend
+
+$(BINDIR)/%.o: $(SOURCEDIR)/%.cpp $(INCS)
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(BIN): $(OBJS)
+ $(CXX) -o $@ $(OBJS) $(LIBS)
+
+.PHONY: clean
+clean:
+ $(RM) $(BIN) $(OBJS) $(DEPS)
diff --git a/codepeiler.sublime-project b/codepeiler.sublime-project
@@ -13,8 +13,15 @@
  "build_systems":
  [
  {
- "name": "Codepeiler - make",
- "cmd": ["make clean", "make", ""],
+ "name": "Codepeiler - make release",
+ "cmd": ["make clean && make release && ./codepeiler"],
+ "working_dir": "$project_path",
+ "path": "/usr/local/bin:/usr/bin/:/bin/",
+ "shell": true
+ },
+ {
+ "name": "Codepeiler - make debug",
+ "cmd": ["make clean && make debug && ./codepeiler"],
  "working_dir": "$project_path",
  "path": "/usr/local/bin:/usr/bin/:/bin/",
  "shell": true

diff --git a/src/BufferReader.hpp b/src/BufferReader.hpp
diff --git a/src/BufferWriter.hpp b/src/BufferWriter.hpp
diff --git a/src/Lexer.cpp → src/codepeiler/Lexer.cpp b/src/Lexer.cpp → src/codepeiler/Lexer.cpp
@@ -1,7 +1,3 @@
-#include "BufferReader.hpp"
-#include "Symtable.hpp"
-#include "String.hpp"
-
 #include "Lexer.hpp"
 
 #ifdef DEBUG

diff --git a/src/Lexer.hpp → src/codepeiler/Lexer.hpp b/src/Lexer.hpp → src/codepeiler/Lexer.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
 #include <ctype.h>
+
+#include <libStd/String.hpp>
+#include <libBuffer/BufferReader.hpp>
+
+#include "Symtable.hpp"
 #include "Token.hpp"
 
 class BufferReader;

diff --git a/src/ParseTree.cpp → src/codepeiler/ParseTree.cpp b/src/ParseTree.cpp → src/codepeiler/ParseTree.cpp
diff --git a/src/ParseTree.hpp → src/codepeiler/ParseTree.hpp b/src/ParseTree.hpp → src/codepeiler/ParseTree.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
+#include <libStd/String.hpp>
+#include <libStd/Vector.hpp>
+
 #include "ParserRule.hpp"
 #include "Token.hpp"
-#include "String.hpp"
-#include "Vector.hpp"
 
 class ParseTree
 {

diff --git a/src/ParseTreeDump.cpp → src/codepeiler/ParseTreeDump.cpp b/src/ParseTreeDump.cpp → src/codepeiler/ParseTreeDump.cpp
diff --git a/src/ParseTreeMakeCode.cpp → src/codepeiler/ParseTreeMakeCode.cpp b/src/ParseTreeMakeCode.cpp → src/codepeiler/ParseTreeMakeCode.cpp
diff --git a/src/ParseTreeTypeCheck.cpp → src/codepeiler/ParseTreeTypeCheck.cpp b/src/ParseTreeTypeCheck.cpp → src/codepeiler/ParseTreeTypeCheck.cpp
diff --git a/src/Parser.cpp → src/codepeiler/Parser.cpp b/src/Parser.cpp → src/codepeiler/Parser.cpp
diff --git a/src/Parser.hpp → src/codepeiler/Parser.hpp b/src/Parser.hpp → src/codepeiler/Parser.hpp
@@ -1,13 +1,15 @@
 #pragma once
 
 #include <exception>
+
+#include <libStd/String.hpp>
+#include <libStd/List.hpp>
+
 #include "ParserRule.hpp"
 #include "Token.hpp"
 #include "Lexer.hpp"
 #include "ParseTree.hpp"
-#include "List.hpp"
 #include "Token.hpp"
-#include "String.hpp"
 
 class ParserError : public std::exception
 {

diff --git a/src/ParserRule.cpp → src/codepeiler/ParserRule.cpp b/src/ParserRule.cpp → src/codepeiler/ParserRule.cpp
diff --git a/src/ParserRule.hpp → src/codepeiler/ParserRule.hpp b/src/ParserRule.hpp → src/codepeiler/ParserRule.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "String.hpp"
+#include <libStd/String.hpp>
 #include "Token.hpp"
 
 struct ParserRule {

diff --git a/src/Symtable.hpp → src/codepeiler/Symtable.hpp b/src/Symtable.hpp → src/codepeiler/Symtable.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Hashtable.hpp"
+#include <libStd/Hashtable.hpp>
 #include "Token.hpp"
 
 class Symtable : public Hashtable<Entry*>

diff --git a/src/Token.cpp → src/codepeiler/Token.cpp b/src/Token.cpp → src/codepeiler/Token.cpp
diff --git a/src/Token.hpp → src/codepeiler/Token.hpp b/src/Token.hpp → src/codepeiler/Token.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <iostream>
-#include "String.hpp"
+
+#include <libStd/String.hpp>
 
 class Entry;
 

diff --git a/src/main.cpp → src/codepeiler/main.cpp b/src/main.cpp → src/codepeiler/main.cpp
@@ -9,9 +9,10 @@
 #include <iostream>
 #include <iomanip>
 
-#include "String.hpp"
-#include "BufferReader.hpp"
-#include "BufferWriter.hpp"
+#include <libStd/String.hpp>
+#include <libBuffer/BufferReader.hpp>
+#include <libBuffer/BufferWriter.hpp>
+
 #include "Token.hpp"
 #include "Lexer.hpp"
 #include "Symtable.hpp"