Split compiler code away from runtime code

8 files changed, 26 insertions, 11 deletions

diff --git a/slicer/slicer/Jamfile.jam b/slicer/slicer/Jamfile.jam
index 3d5fa77..7def868 100644
--- a/slicer/slicer/Jamfile.jam
+++ b/slicer/slicer/Jamfile.jam
@@ -1,20 +1,15 @@
-lib Slice ;
 lib IceUtil ;
 lib boost_system ;
-lib boost_filesystem ;
 lib adhocutil : : : : <include>/usr/include/adhocutil ;
 
 lib slicer :
 	[ glob *.cpp ]
 	:
-	<library>Slice
 	<library>IceUtil
 	<library>boost_system
-	<library>boost_filesystem
 	<library>adhocutil
 	<include>..
 	: :
 	<include>..
 	<library>boost_system
-	<library>boost_filesystem
 	;
diff --git a/slicer/test/Jamfile.jam b/slicer/test/Jamfile.jam
index e679a76..b6e2834 100644
--- a/slicer/test/Jamfile.jam
+++ b/slicer/test/Jamfile.jam
@@ -59,6 +59,7 @@ run preprocessor.cpp
 	<library>adhocutil
 	<include>..
 	<library>../slicer//slicer
+	<library>../tool//slicer-compiler
 	<dependency>../tool//slicer
 	:
 	preprocess
diff --git a/slicer/test/preprocessor.cpp b/slicer/test/preprocessor.cpp
index e34632b..ae4f1b7 100644
--- a/slicer/test/preprocessor.cpp
+++ b/slicer/test/preprocessor.cpp
@@ -1,7 +1,7 @@
 #define BOOST_TEST_MODULE preprocess
 #include <boost/test/unit_test.hpp>
 
-#include <slicer/parser.h>
+#include <tool/parser.h>
 #include <boost/filesystem/convenience.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/format.hpp>
diff --git a/slicer/test/serializers.cpp b/slicer/test/serializers.cpp
index 7c5f252..8f569d8 100644
--- a/slicer/test/serializers.cpp
+++ b/slicer/test/serializers.cpp
@@ -1,7 +1,7 @@
 #define BOOST_TEST_MODULE execute_serializers
 #include <boost/test/unit_test.hpp>
 
-#include <slicer/parser.h>
+#include <tool/parser.h>
 #include <slicer/slicer.h>
 #include <slicer/modelParts.h>
 #include <xml/serializer.h>
diff --git a/slicer/tool/Jamfile.jam b/slicer/tool/Jamfile.jam
index 16942a0..d34828c 100644
--- a/slicer/tool/Jamfile.jam
+++ b/slicer/tool/Jamfile.jam
@@ -1,8 +1,27 @@
+lib Slice ;
+lib IceUtil ;
 lib po : : <name>boost_program_options ;
+lib adhocutil : : : : <include>/usr/include/adhocutil ;
+lib boost_system ;
+lib boost_filesystem ;
 
-exe slicer :
-	[ glob *.cpp ]
+lib slicer-compiler :
+	parser.cpp
 	:
+	<library>Slice
+	<library>IceUtil
+	<library>boost_system
+	<library>boost_filesystem
+	<library>adhocutil
 	<library>../slicer//slicer
+	<include>..
+	: :
+	<include>..
+	;
+
+exe slicer :
+	slicer.cpp
+	:
+	<library>slicer-compiler
 	<library>po
 	;
diff --git a/slicer/slicer/parser.cpp b/slicer/tool/parser.cpp
index 3d1c735..6d89719 100644
--- a/slicer/slicer/parser.cpp
+++ b/slicer/tool/parser.cpp
@@ -1,5 +1,5 @@
 #include "parser.h"
-#include "metadata.h"
+#include <slicer/metadata.h>
 #include <Slice/Parser.h>
 #include <Slice/Preprocessor.h>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/slicer/slicer/parser.h b/slicer/tool/parser.h
index 1193664..1193664 100644
--- a/slicer/slicer/parser.h
+++ b/slicer/tool/parser.h
diff --git a/slicer/tool/slicer.cpp b/slicer/tool/slicer.cpp
index 632ae03..8a4e764 100644
--- a/slicer/tool/slicer.cpp
+++ b/slicer/tool/slicer.cpp
@@ -1,4 +1,4 @@
-#include <slicer/parser.h>
+#include <tool/parser.h>
 #include <boost/program_options.hpp>
 
 namespace po = boost::program_options;