skip 1 shuffle of code out of common

17 files changed, 82 insertions, 31 deletions

diff --git a/project2/Jamfile.jam b/project2/Jamfile.jam
index ed25f40..441c47c 100644
--- a/project2/Jamfile.jam
+++ b/project2/Jamfile.jam
@@ -17,6 +17,7 @@ alias p2parts : : : :
 	<library>json//p2json
 	<library>compression//p2compression
 	<library>streams//p2streams
+	<library>basics//p2basics
 	;
 
 build-project console ;
diff --git a/project2/basics/Jamfile.jam b/project2/basics/Jamfile.jam
new file mode 100644
index 0000000..66ec12c
--- /dev/null
+++ b/project2/basics/Jamfile.jam
@@ -0,0 +1,21 @@
+alias glibmm : : : :
+	<cflags>"`pkg-config --cflags glibmm-2.4`"
+	<linkflags>"`pkg-config --libs glibmm-2.4`"
+	;
+lib boost_filesystem : : <name>boost_filesystem ;
+
+cpp-pch pch : pch.hpp :
+	<include>../../libmisc
+	<library>glibmm 
+	<library>../common//p2common
+	;
+
+lib p2basics :
+	[ glob-tree *.cpp ]
+	:
+	<include>../../libmisc
+	<library>glibmm
+	<library>boost_filesystem
+	<library>../common//p2common
+	;
+
diff --git a/project2/common/aggregates/count.cpp b/project2/basics/aggregates/count.cpp
index 9bdb47c..fb3b899 100644
--- a/project2/common/aggregates/count.cpp
+++ b/project2/basics/aggregates/count.cpp
@@ -1,4 +1,4 @@
-#include "../aggregate.h"
+#include <aggregate.h>
 
 class Count : public ValueAggregate {
 	public:
diff --git a/project2/common/aggregates/countDistinct.cpp b/project2/basics/aggregates/countDistinct.cpp
index 4a2c540..b471911 100644
--- a/project2/common/aggregates/countDistinct.cpp
+++ b/project2/basics/aggregates/countDistinct.cpp
@@ -1,4 +1,4 @@
-#include "../aggregate.h"
+#include <aggregate.h>
 
 class CountDistinct : public ValueAggregate {
 	public:
diff --git a/project2/common/aggregates/distinct.cpp b/project2/basics/aggregates/distinct.cpp
index 85e69c2..ebac934 100644
--- a/project2/common/aggregates/distinct.cpp
+++ b/project2/basics/aggregates/distinct.cpp
@@ -1,4 +1,4 @@
-#include "../aggregate.h"
+#include <aggregate.h>
 #include <boost/foreach.hpp>
 
 class Distinct : public SetAggregate {
diff --git a/project2/common/aggregates/max.cpp b/project2/basics/aggregates/max.cpp
index a6e528a..ef904ed 100644
--- a/project2/common/aggregates/max.cpp
+++ b/project2/basics/aggregates/max.cpp
@@ -1,4 +1,4 @@
-#include "../aggregate.h"
+#include <aggregate.h>
 
 class Max : public ValueAggregate {
 	public:
diff --git a/project2/common/aggregates/min.cpp b/project2/basics/aggregates/min.cpp
index 14c63ae..ee0bf3d 100644
--- a/project2/common/aggregates/min.cpp
+++ b/project2/basics/aggregates/min.cpp
@@ -1,4 +1,4 @@
-#include "../aggregate.h"
+#include <aggregate.h>
 
 class Min : public ValueAggregate {
 	public:
diff --git a/project2/common/functions/dates.cpp b/project2/basics/functions/dates.cpp
index 43878c6..f2dcb20 100644
--- a/project2/common/functions/dates.cpp
+++ b/project2/basics/functions/dates.cpp
@@ -1,8 +1,8 @@
 #include <pch.hpp>
-#include "../variables.h"
-#include "../scriptLoader.h"
-#include "../scriptStorage.h"
-#include "../logger.h"
+#include <variables.h>
+#include <scriptLoader.h>
+#include <scriptStorage.h>
+#include <logger.h>
 #include <locale>
 #include <iostream>
 #include <boost/date_time.hpp>
diff --git a/project2/common/functions/strings.cpp b/project2/basics/functions/strings.cpp
index 6616bba..d4ba7b7 100644
--- a/project2/common/functions/strings.cpp
+++ b/project2/basics/functions/strings.cpp
@@ -1,7 +1,7 @@
 #include <pch.hpp>
-#include "../variables.h"
-#include "../scriptLoader.h"
-#include "../scriptStorage.h"
+#include <variables.h>
+#include <scriptLoader.h>
+#include <scriptStorage.h>
 
 /// Variable implementation to access platform configuration values
 class Trim : public VariableImpl {
diff --git a/project2/basics/pch.hpp b/project2/basics/pch.hpp
new file mode 100644
index 0000000..d52b275
--- /dev/null
+++ b/project2/basics/pch.hpp
@@ -0,0 +1,28 @@
+#ifdef BOOST_BUILD_PCH_ENABLED
+#ifndef COMMON_PCH
+#define COMMON_PCH
+
+#include <aggregate.h>
+#include <algorithm>
+#include <appEngine.h>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind.hpp>
+#include <boost/date_time.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/foreach.hpp>
+#include <commonObjects.h>
+#include <iHaveParameters.h>
+#include <iostream>
+#include <list>
+#include <logger.h>
+#include <rowProcessor.h>
+#include <rowSet.h>
+#include <safeMapFind.h>
+#include <scriptLoader.h>
+#include <scripts.h>
+#include <scriptStorage.h>
+#include <test.h>
+#include <variables.h>
+
+#endif
+#endif
diff --git a/project2/common/tests/compoundTest.cpp b/project2/basics/tests/compoundTest.cpp
index c3babf7..b361db5 100644
--- a/project2/common/tests/compoundTest.cpp
+++ b/project2/basics/tests/compoundTest.cpp
@@ -1,6 +1,6 @@
 #include <pch.hpp>
 #include "compoundTest.h"
-#include "../scriptLoader.h"
+#include <scriptLoader.h>
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 #include <algorithm>
diff --git a/project2/common/tests/compoundTest.h b/project2/basics/tests/compoundTest.h
index 38aadea..f65e954 100644
--- a/project2/common/tests/compoundTest.h
+++ b/project2/basics/tests/compoundTest.h
@@ -1,7 +1,7 @@
 #ifndef IF_H
 #define IF_H
 
-#include "../test.h"
+#include <test.h>
 
 class CompoundTest : public Test {
 	public:
diff --git a/project2/common/tests/equals.cpp b/project2/basics/tests/equals.cpp
index b2a1bf4..ba8c695 100644
--- a/project2/common/tests/equals.cpp
+++ b/project2/basics/tests/equals.cpp
@@ -1,7 +1,7 @@
 #include <pch.hpp>
-#include "../test.h"
-#include "../scriptLoader.h"
-#include "../rowProcessor.h"
+#include <test.h>
+#include <scriptLoader.h>
+#include <rowProcessor.h>
 
 class Equals : public Test {
 	public:
diff --git a/project2/common/tests/isdistinct.cpp b/project2/basics/tests/isdistinct.cpp
index b754d2d..06d887e 100644
--- a/project2/common/tests/isdistinct.cpp
+++ b/project2/basics/tests/isdistinct.cpp
@@ -1,8 +1,8 @@
 #include <pch.hpp>
-#include "../test.h"
-#include "../scriptLoader.h"
-#include "../iHaveParameters.h"
-#include "../rowProcessor.h"
+#include <test.h>
+#include <scriptLoader.h>
+#include <iHaveParameters.h>
+#include <rowProcessor.h>
 
 class IsDistinct : public Test, IHaveParameters {
 	public:
diff --git a/project2/common/tests/isuniq.cpp b/project2/basics/tests/isuniq.cpp
index 6966985..548be14 100644
--- a/project2/common/tests/isuniq.cpp
+++ b/project2/basics/tests/isuniq.cpp
@@ -1,8 +1,8 @@
 #include <pch.hpp>
-#include "../test.h"
-#include "../scriptLoader.h"
-#include "../iHaveParameters.h"
-#include "../rowProcessor.h"
+#include <test.h>
+#include <scriptLoader.h>
+#include <iHaveParameters.h>
+#include <rowProcessor.h>
 
 class IsUniq : public Test, IHaveParameters {
 	public:
diff --git a/project2/common/tests/validDateCheck.cpp b/project2/basics/tests/validDateCheck.cpp
index dabbdaa..8dffd9d 100644
--- a/project2/common/tests/validDateCheck.cpp
+++ b/project2/basics/tests/validDateCheck.cpp
@@ -1,10 +1,10 @@
 #include <pch.hpp>
-#include "../logger.h"
-#include "../scriptLoader.h"
-#include "../commonObjects.h"
-#include "../test.h"
-#include "../variables.h"
-#include "../scripts.h"
+#include <logger.h>
+#include <scriptLoader.h>
+#include <commonObjects.h>
+#include <test.h>
+#include <variables.h>
+#include <scripts.h>
 
 class ValidDateTest : public Test {
 	public:
diff --git a/project2/common/Jamfile.jam b/project2/common/Jamfile.jam
index 7e00700..1559f25 100644
--- a/project2/common/Jamfile.jam
+++ b/project2/common/Jamfile.jam
@@ -11,6 +11,7 @@ cpp-pch pch : pch.hpp :
 	<include>../../libmisc
 	<library>glibmm 
 	;
+
 lib p2common :
 	pch
 	[ glob-tree *.cpp ]